diff --git a/packages/docs/src/components/docsearch/doc-search-modal.tsx b/packages/docs/src/components/docsearch/doc-search-modal.tsx
index 60393c1c101..d80825b99fb 100644
--- a/packages/docs/src/components/docsearch/doc-search-modal.tsx
+++ b/packages/docs/src/components/docsearch/doc-search-modal.tsx
@@ -12,7 +12,7 @@ import type { DocSearchHit } from './types';
 import { identity } from './utils';
 import { clearStalled, setStalled } from './utils/stalledControl';
 import { AIButton } from './result';
-import { isBrowser } from '@builder.io/qwik/build';
+import { isBrowser } from '@builder.io/qwik';
 
 export type ModalTranslations = Partial<{
   searchBox: SearchBoxTranslations;
diff --git a/packages/docs/src/components/qwik-gpt/index.tsx b/packages/docs/src/components/qwik-gpt/index.tsx
index 2b6cbcff8ce..be0a8a590d9 100644
--- a/packages/docs/src/components/qwik-gpt/index.tsx
+++ b/packages/docs/src/components/qwik-gpt/index.tsx
@@ -1,7 +1,7 @@
 import { component$, useComputed$, useSignal } from '@builder.io/qwik';
 // import { qwikGPT, rateResponse } from './search';
 import { CodeBlock } from '../code-block/code-block';
-// import { isBrowser } from '@builder.io/qwik/build';
+// import { isBrowser } from '@builder.io/qwik';
 import snarkdown from 'snarkdown';
 
 const snarkdownEnhanced = (md: string) => {
diff --git a/packages/docs/src/repl/monaco.tsx b/packages/docs/src/repl/monaco.tsx
index 762ab5d0490..d4422c2889d 100644
--- a/packages/docs/src/repl/monaco.tsx
+++ b/packages/docs/src/repl/monaco.tsx
@@ -5,7 +5,7 @@ import type { EditorProps, EditorStore } from './editor';
 import type { ReplStore } from './types';
 import { getColorPreference } from '../components/theme-toggle/theme-toggle';
 import { bundled, getNpmCdnUrl } from './bundled';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 // We cannot use this, it causes the repl to use imports
 // import { QWIK_REPL_DEPS_CACHE } from './worker/repl-constants';
 const QWIK_REPL_DEPS_CACHE = 'QwikReplDeps';
diff --git a/packages/docs/src/repl/repl.tsx b/packages/docs/src/repl/repl.tsx
index b68ad72f894..aef5dfef6fc 100644
--- a/packages/docs/src/repl/repl.tsx
+++ b/packages/docs/src/repl/repl.tsx
@@ -16,7 +16,7 @@ import { ReplDetailPanel } from './repl-detail-panel';
 import { getReplVersion } from './repl-version';
 import { updateReplOutput } from './repl-output-update';
 import { QWIK_PKG_NAME, bundled, getNpmCdnUrl } from './bundled';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 
 export const Repl = component$((props: ReplProps) => {
   useStyles$(styles);
diff --git a/packages/docs/src/repl/worker/repl-service-worker.ts b/packages/docs/src/repl/worker/repl-service-worker.ts
index 1c53352dcc5..051bfae6083 100644
--- a/packages/docs/src/repl/worker/repl-service-worker.ts
+++ b/packages/docs/src/repl/worker/repl-service-worker.ts
@@ -16,7 +16,7 @@ self.oninstall = (ev) => {
 self.onactivate = () => self.clients.claim();
 
 export interface ReplGlobalApi {
-  qwikBuild?: typeof import('@builder.io/qwik/build');
+  qwikBuild?: typeof import('@builder.io/qwik');
   qwikCore?: typeof import('@builder.io/qwik');
   qwikOptimizer?: typeof import('@builder.io/qwik/optimizer');
   qwikServer?: typeof import('@builder.io/qwik/server');
diff --git a/packages/docs/src/routes/api/index.tsx b/packages/docs/src/routes/api/index.tsx
index 25378b72e53..c30d00f9404 100644
--- a/packages/docs/src/routes/api/index.tsx
+++ b/packages/docs/src/routes/api/index.tsx
@@ -1,5 +1,5 @@
 import { $, component$, useOn, useSignal, useStore, useTask$ } from '@builder.io/qwik';
-import { isBrowser } from '@builder.io/qwik/build';
+import { isBrowser } from '@builder.io/qwik';
 import { toSnakeCase } from '../../utils/utils';
 
 // TODO: load the content of these files using fs instead of importing them
diff --git a/packages/docs/src/routes/demo/cookbook/glob-import/index.tsx b/packages/docs/src/routes/demo/cookbook/glob-import/index.tsx
index fa90285ca31..8a0de656015 100644
--- a/packages/docs/src/routes/demo/cookbook/glob-import/index.tsx
+++ b/packages/docs/src/routes/demo/cookbook/glob-import/index.tsx
@@ -4,7 +4,7 @@ import {
   useSignal,
   useTask$,
 } from '@builder.io/qwik';
-import { isDev } from '@builder.io/qwik/build';
+import { isDev } from '@builder.io/qwik';
 
 const metaGlobComponents: Record<string, any> = import.meta.glob(
   '/src/routes/demo/cookbook/glob-import/examples/*',
diff --git a/packages/docs/src/routes/demo/tasks/track-fn/index.tsx b/packages/docs/src/routes/demo/tasks/track-fn/index.tsx
index 10c3adc25fb..52bfa0784fd 100644
--- a/packages/docs/src/routes/demo/tasks/track-fn/index.tsx
+++ b/packages/docs/src/routes/demo/tasks/track-fn/index.tsx
@@ -1,5 +1,5 @@
 import { component$, useSignal, useTask$ } from '@builder.io/qwik';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 
 export default component$(() => {
   const isUppercase = useSignal(false);
diff --git a/packages/docs/src/routes/demo/tasks/track-server-guard/index.tsx b/packages/docs/src/routes/demo/tasks/track-server-guard/index.tsx
index dbb62149563..588b8ebe0b3 100644
--- a/packages/docs/src/routes/demo/tasks/track-server-guard/index.tsx
+++ b/packages/docs/src/routes/demo/tasks/track-server-guard/index.tsx
@@ -1,5 +1,5 @@
 import { component$, useSignal, useTask$ } from '@builder.io/qwik';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 
 export default component$(() => {
   const text = useSignal('Initial text');
diff --git a/packages/docs/src/routes/demo/tasks/track/index.tsx b/packages/docs/src/routes/demo/tasks/track/index.tsx
index ef244733857..37fd9b4508b 100644
--- a/packages/docs/src/routes/demo/tasks/track/index.tsx
+++ b/packages/docs/src/routes/demo/tasks/track/index.tsx
@@ -1,5 +1,4 @@
-import { component$, useSignal, useTask$ } from '@builder.io/qwik';
-import { isServer } from '@builder.io/qwik/build';
+import { component$, useSignal, useTask$, isServer } from '@builder.io/qwik';
 
 export default component$(() => {
   const text = useSignal('Initial text');
diff --git a/packages/docs/src/routes/docs/(qwik)/components/tasks/index.mdx b/packages/docs/src/routes/docs/(qwik)/components/tasks/index.mdx
index bb97e550e87..400aa291c41 100644
--- a/packages/docs/src/routes/docs/(qwik)/components/tasks/index.mdx
+++ b/packages/docs/src/routes/docs/(qwik)/components/tasks/index.mdx
@@ -195,7 +195,7 @@ During SSR, each component will wait until all tasks are completed before output
 <CodeSandbox src="/src/routes/demo/tasks/track/index.tsx" style={{ height: '6em' }} >
 ```tsx
 import { component$, useSignal, useTask$ } from '@builder.io/qwik';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 
 export default component$(() => {
   const text = useSignal('Initial text');
@@ -237,7 +237,7 @@ const delay = (time: number) => new Promise((res) => setTimeout(res, time));
 >
 > - The `useTask$()` blocks rendering until it completes. If you don't want to block rendering, make sure that the task is resolved, and run the delay work on a separate unconnected promise. In this example, we don't await `delay()` because it would block rendering.
 
-> Sometimes it is required to only run code either in the server or in the client. This can be achieved by using the `isServer` and `isBrowser` booleans exported from `@builder.io/qwik/build` as shown above.
+> Sometimes it is required to only run code either in the server or in the client. This can be achieved by using the `isServer` and `isBrowser` booleans exported from `@builder.io/qwik` as shown above.
 
 
 ### `track()` as a function
@@ -247,7 +247,7 @@ In the above example, `track()` was used to track a specific signal. However, `t
 <CodeSandbox src="/src/routes/demo/tasks/track-fn/index.tsx" style={{ height: '6em' }} >
 ```tsx
 import { component$, useSignal, useTask$ } from '@builder.io/qwik';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 
 export default component$(() => {
   const isUppercase = useSignal(false);
@@ -338,7 +338,7 @@ Sometimes a task needs to run only on the browser and after rendering, in that c
 > <CodeSandbox src="/src/routes/demo/tasks/track-server-guard/index.tsx" style={{ height: '6em' }}>
 > ```tsx
 > import { component$, useSignal, useTask$ } from '@builder.io/qwik';
-> import { isServer } from '@builder.io/qwik/build';
+> import { isServer } from '@builder.io/qwik';
 >
 > export default component$(() => {
 >   const text = useSignal('Initial text');
diff --git a/packages/docs/src/routes/docs/(qwikcity)/advanced/content-security-policy/index.mdx b/packages/docs/src/routes/docs/(qwikcity)/advanced/content-security-policy/index.mdx
index 6db212704ac..e8062d4ee94 100644
--- a/packages/docs/src/routes/docs/(qwikcity)/advanced/content-security-policy/index.mdx
+++ b/packages/docs/src/routes/docs/(qwikcity)/advanced/content-security-policy/index.mdx
@@ -48,7 +48,7 @@ src/
 
 ```typescript title="src/routes/plugin@csp.ts"
 import type { RequestHandler } from "@builder.io/qwik-city";
-import { isDev } from "@builder.io/qwik/build";
+import { isDev } from "@builder.io/qwik";
 
 export const onRequest: RequestHandler = event => {
   if (isDev) return; // Will not return CSP headers in dev mode
@@ -79,7 +79,7 @@ import {
   ServiceWorkerRegister,
 } from "@builder.io/qwik-city";
 import { RouterHead } from "./components/router-head/router-head";
-import { isDev } from "@builder.io/qwik/build";
+import { isDev } from "@builder.io/qwik";
 
 import "./global.css";
 
diff --git a/packages/docs/src/routes/docs/(qwikcity)/guides/qwik-nutshell/index.mdx b/packages/docs/src/routes/docs/(qwikcity)/guides/qwik-nutshell/index.mdx
index 4c7bf406b90..da38ef1bd2a 100644
--- a/packages/docs/src/routes/docs/(qwikcity)/guides/qwik-nutshell/index.mdx
+++ b/packages/docs/src/routes/docs/(qwikcity)/guides/qwik-nutshell/index.mdx
@@ -616,7 +616,7 @@ If you want to access browser APIs, such as `window`, `document`, `localStorage`
 
 ```tsx
 import { component$, useTask$, useVisibleTask$, useSignal } from '@builder.io/qwik';
-import { isBrowser } from '@builder.io/qwik/build';
+import { isBrowser } from '@builder.io/qwik';
 
 export default component$(() => {
   const ref = useSignal<Element>();
@@ -667,7 +667,7 @@ Sometimes you need to run code only on the server, such as fetching data or acce
 ```tsx
 import { component$, useTask$ } from '@builder.io/qwik';
 import { server$, routeLoader$ } from '@builder.io/qwik/qwik-city';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 
 
 export const useGetProducts = routeLoader$((requestEvent) => {
@@ -729,7 +729,7 @@ The `server$()` is a special way to declare functions that only run on the serve
 
 ### `isServer` & `isBrowser` conditionals
 
-Instead of `if(typeof window !== 'undefined')`, it is recommended to use the `isServer` and `isBrowser` boolean helpers exported from `@builder.io/qwik/build` to ensure your code only runs in the browser. They contain slightly more robust checks to better detect the browser environment.
+Instead of `if(typeof window !== 'undefined')`, it is recommended to use the `isServer` and `isBrowser` boolean helpers exported from `@builder.io/qwik` to ensure your code only runs in the browser. They contain slightly more robust checks to better detect the browser environment.
 
 Here is the source code for reference:
 
@@ -746,7 +746,7 @@ export const isServer: boolean = !isBrowser;
 Here is how you import these for reference:
 
 ```tsx
-import {isServer, isBrowser} from '@builder.io/qwik/build';
+import {isServer, isBrowser} from '@builder.io/qwik';
 
 // inside component$
 
diff --git a/packages/docs/src/routes/docs/cookbook/glob-import/index.mdx b/packages/docs/src/routes/docs/cookbook/glob-import/index.mdx
index 427dc9e905d..7213cf1fb28 100644
--- a/packages/docs/src/routes/docs/cookbook/glob-import/index.mdx
+++ b/packages/docs/src/routes/docs/cookbook/glob-import/index.mdx
@@ -48,7 +48,7 @@ The problem with `import.meta.glob` in Qwik, is that it currently either works i
 
 The reason for this behavior, is that `import.meta.glob` with `eager.false` breaks the production bundle as it creates lazy-loadable chunks that Qwik doesn't know how to handle. On the other hand, `eager:true` seemingly fixes the issue as it allows Qwik to normally bundle the files, but it also slows down the development server - especially when you import a lot of heavy components with it.
 
-As a workaround for now, you can use the build time `isDev` boolean from `"@builder.io/qwik/build"`:
+As a workaround for now, you can use the build time `isDev` boolean from `"@builder.io/qwik"`:
 
 <CodeSandbox src="/src/routes/demo/cookbook/glob-import/">
 ```tsx
@@ -58,7 +58,7 @@ import {
   useSignal,
   useTask$,
 } from '@builder.io/qwik';
-import { isDev } from '@builder.io/qwik/build';
+import { isDev } from '@builder.io/qwik';
 
 const metaGlobComponents: Record<string, any> = import.meta.glob(
   '/src/examples/*',
diff --git a/packages/docs/src/routes/examples/[...id]/index!.tsx b/packages/docs/src/routes/examples/[...id]/index!.tsx
index 079fa750c54..fe48dfadb63 100644
--- a/packages/docs/src/routes/examples/[...id]/index!.tsx
+++ b/packages/docs/src/routes/examples/[...id]/index!.tsx
@@ -7,7 +7,7 @@ import exampleSections, { type ExampleApp } from '@examples-data';
 import type { ReplAppInput } from '../../../repl/types';
 import { type DocumentHead, useLocation } from '@builder.io/qwik-city';
 import { PanelToggle } from '../../../components/panel-toggle/panel-toggle';
-import { isBrowser } from '@builder.io/qwik/build';
+import { isBrowser } from '@builder.io/qwik';
 import { createPlaygroundShareUrl, parsePlaygroundShareUrl } from '../../../repl/repl-share-url';
 
 export default component$(() => {
diff --git a/packages/docs/src/routes/examples/apps/partial/hackernews-index/app.tsx b/packages/docs/src/routes/examples/apps/partial/hackernews-index/app.tsx
index 92a3091d15f..8dfc8e7ddc9 100644
--- a/packages/docs/src/routes/examples/apps/partial/hackernews-index/app.tsx
+++ b/packages/docs/src/routes/examples/apps/partial/hackernews-index/app.tsx
@@ -1,5 +1,5 @@
 import { component$, useTask$, useStore, useStyles$ } from '@builder.io/qwik';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 import HackerNewsCSS from './hacker-news.css?inline';
 
 export const HackerNews = component$(() => {
diff --git a/packages/docs/src/routes/playground/index!.tsx b/packages/docs/src/routes/playground/index!.tsx
index c9868aa659e..339f7bb4b0b 100644
--- a/packages/docs/src/routes/playground/index!.tsx
+++ b/packages/docs/src/routes/playground/index!.tsx
@@ -7,7 +7,7 @@ import playgroundApp from '@playground-data';
 import type { ReplAppInput } from '../../repl/types';
 import { createPlaygroundShareUrl, parsePlaygroundShareUrl } from '../../repl/repl-share-url';
 import { PanelToggle } from '../../components/panel-toggle/panel-toggle';
-import { isBrowser } from '@builder.io/qwik/build';
+import { isBrowser } from '@builder.io/qwik';
 
 export default component$(() => {
   useStyles$(styles);
diff --git a/packages/eslint-plugin-qwik/tests/use-method-usage/valid-inside-component.tsx b/packages/eslint-plugin-qwik/tests/use-method-usage/valid-inside-component.tsx
index c8aee4f6f03..ad44b5c7436 100644
--- a/packages/eslint-plugin-qwik/tests/use-method-usage/valid-inside-component.tsx
+++ b/packages/eslint-plugin-qwik/tests/use-method-usage/valid-inside-component.tsx
@@ -1,5 +1,5 @@
 import { component$, useSignal, useTask$ } from '@builder.io/qwik';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 
 export const InsideTask = component$(() => {
   const mySig = useSignal(0);
diff --git a/packages/insights/src/db/logging.ts b/packages/insights/src/db/logging.ts
index 40c37d2ffc6..6d53ca271bd 100644
--- a/packages/insights/src/db/logging.ts
+++ b/packages/insights/src/db/logging.ts
@@ -1,4 +1,4 @@
-import { isDev } from '@builder.io/qwik/build';
+import { isDev } from '@builder.io/qwik';
 
 const LOG_TIMING: boolean = isDev;
 
diff --git a/packages/qwik-auth/src/index.ts b/packages/qwik-auth/src/index.ts
index 43177823ebc..5fc42727f7e 100644
--- a/packages/qwik-auth/src/index.ts
+++ b/packages/qwik-auth/src/index.ts
@@ -10,7 +10,7 @@ import {
   type RequestEvent,
   type RequestEventCommon,
 } from '@builder.io/qwik-city';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 import { parseString, splitCookiesString } from 'set-cookie-parser';
 
 export type GetSessionResult = Promise<{ data: Session | null; cookie: any }>;
diff --git a/packages/qwik-city/src/runtime/src/client-navigate.ts b/packages/qwik-city/src/runtime/src/client-navigate.ts
index c4f3af0f500..20df78fc502 100644
--- a/packages/qwik-city/src/runtime/src/client-navigate.ts
+++ b/packages/qwik-city/src/runtime/src/client-navigate.ts
@@ -1,4 +1,4 @@
-import { isBrowser } from '@builder.io/qwik/build';
+import { isBrowser } from '@builder.io/qwik';
 import type { NavigationType, ScrollState } from './types';
 import { isSamePath, toPath } from './utils';
 import { PREFETCHED_NAVIGATE_PATHS } from './constants';
diff --git a/packages/qwik-city/src/runtime/src/link-component.tsx b/packages/qwik-city/src/runtime/src/link-component.tsx
index 9406e750d80..649b5025e58 100644
--- a/packages/qwik-city/src/runtime/src/link-component.tsx
+++ b/packages/qwik-city/src/runtime/src/link-component.tsx
@@ -3,7 +3,7 @@ import { getClientNavPath, shouldPrefetchData, shouldPrefetchSymbols } from './u
 import { loadClientData } from './use-endpoint';
 import { useLocation, useNavigate } from './use-functions';
 import { prefetchSymbols } from './client-navigate';
-import { isDev } from '@builder.io/qwik/build';
+import { isDev } from '@builder.io/qwik';
 
 /** @public */
 export const Link = component$<LinkProps>((props) => {
diff --git a/packages/qwik-city/src/runtime/src/qwik-city-component.tsx b/packages/qwik-city/src/runtime/src/qwik-city-component.tsx
index c14cd0f737f..49f801648d8 100644
--- a/packages/qwik-city/src/runtime/src/qwik-city-component.tsx
+++ b/packages/qwik-city/src/runtime/src/qwik-city-component.tsx
@@ -15,7 +15,7 @@ import {
   _waitUntilRendered,
   type QRL,
 } from '@builder.io/qwik';
-import { isBrowser, isDev, isServer } from '@builder.io/qwik/build';
+import { isBrowser, isDev, isServer } from '@builder.io/qwik';
 import * as qwikCity from '@qwik-city-plan';
 import { CLIENT_DATA_CACHE } from './constants';
 import {
diff --git a/packages/qwik-city/src/runtime/src/server-functions.ts b/packages/qwik-city/src/runtime/src/server-functions.ts
index fab407bee5c..6a40fcca57d 100644
--- a/packages/qwik-city/src/runtime/src/server-functions.ts
+++ b/packages/qwik-city/src/runtime/src/server-functions.ts
@@ -50,7 +50,7 @@ import type {
 } from './types';
 import { useAction, useLocation, useQwikCityEnv } from './use-functions';
 
-import { isDev, isServer } from '@builder.io/qwik/build';
+import { isDev, isServer } from '@builder.io/qwik';
 
 import type { FormSubmitCompletedDetail } from './form-component';
 
diff --git a/packages/qwik-city/src/runtime/src/spa-init.ts b/packages/qwik-city/src/runtime/src/spa-init.ts
index 4249420d45a..183e3345d33 100644
--- a/packages/qwik-city/src/runtime/src/spa-init.ts
+++ b/packages/qwik-city/src/runtime/src/spa-init.ts
@@ -2,7 +2,7 @@ import type { ClientSPAWindow } from './qwik-city-component';
 import type { ScrollHistoryState } from './scroll-restoration';
 import type { ScrollState } from './types';
 
-import { isDev } from '@builder.io/qwik/build';
+import { isDev } from '@builder.io/qwik';
 import { event$ } from '@builder.io/qwik';
 
 // TODO Dedupe handler code from here and QwikCityProvider?
diff --git a/packages/qwik-react/src/react/qwikify.tsx b/packages/qwik-react/src/react/qwikify.tsx
index 9f5457e171c..fb2add717a8 100644
--- a/packages/qwik-react/src/react/qwikify.tsx
+++ b/packages/qwik-react/src/react/qwikify.tsx
@@ -12,7 +12,7 @@ import {
   useStylesScoped$,
 } from '@builder.io/qwik';
 
-import { isBrowser, isServer } from '@builder.io/qwik/build';
+import { isBrowser, isServer } from '@builder.io/qwik';
 import type { Root } from 'react-dom/client';
 import type { FunctionComponent as ReactFC } from 'react';
 import * as client from './client';
diff --git a/packages/qwik-react/src/react/server-render.tsx b/packages/qwik-react/src/react/server-render.tsx
index e66cd0aeb82..6b14775a2c6 100644
--- a/packages/qwik-react/src/react/server-render.tsx
+++ b/packages/qwik-react/src/react/server-render.tsx
@@ -1,7 +1,7 @@
 import { type QRL, type Signal, Slot, SSRRaw, SSRStream } from '@builder.io/qwik';
 import { getHostProps, mainExactProps, getReactProps } from './slot';
 import { renderToString } from 'react-dom/server';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 
 export async function renderFromServer(
   Host: any,
diff --git a/packages/qwik-react/src/react/slot.ts b/packages/qwik-react/src/react/slot.ts
index 435d7d34882..c327eacfaa7 100644
--- a/packages/qwik-react/src/react/slot.ts
+++ b/packages/qwik-react/src/react/slot.ts
@@ -1,5 +1,5 @@
 import { $, useOn, useOnDocument, useSignal } from '@builder.io/qwik';
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 import { Component, createContext, createElement, createRef } from 'react';
 import type { QwikifyOptions, QwikifyProps } from './types';
 
diff --git a/packages/qwik/src/core/components/prefetch.ts b/packages/qwik/src/core/components/prefetch.ts
index 6e7f045a576..713197d290d 100644
--- a/packages/qwik/src/core/components/prefetch.ts
+++ b/packages/qwik/src/core/components/prefetch.ts
@@ -1,4 +1,4 @@
-import { isDev } from '@builder.io/qwik/build';
+import { isDev } from '@builder.io/qwik';
 import { _jsxC } from '../internal';
 import type { JSXNode } from '@builder.io/qwik/jsx-runtime';
 import { useServerData } from '../use/use-env-data';
diff --git a/packages/qwik/src/core/platform/platform.ts b/packages/qwik/src/core/platform/platform.ts
index 97f2dbb67af..c7f014c0b68 100644
--- a/packages/qwik/src/core/platform/platform.ts
+++ b/packages/qwik/src/core/platform/platform.ts
@@ -1,4 +1,4 @@
-import { isServer } from '@builder.io/qwik/build';
+import { isServer } from '@builder.io/qwik';
 import { qError, QError_qrlMissingChunk, QError_qrlMissingContainer } from '../error/error';
 import { getSymbolHash } from '../qrl/qrl-class';
 import type { QwikElement } from '../render/dom/virtual-element';
diff --git a/packages/qwik/src/core/render/dom/visitor.ts b/packages/qwik/src/core/render/dom/visitor.ts
index 21a2c8e3652..72ab39633dc 100644
--- a/packages/qwik/src/core/render/dom/visitor.ts
+++ b/packages/qwik/src/core/render/dom/visitor.ts
@@ -47,7 +47,7 @@ import {
   type VirtualElement,
 } from './virtual-element';
 
-import { isBrowser } from '@builder.io/qwik/build';
+import { isBrowser } from '@builder.io/qwik';
 import {
   getProxyTarget,
   getSubscriptionManager,
diff --git a/packages/qwik/src/core/render/jsx/jsx-runtime.ts b/packages/qwik/src/core/render/jsx/jsx-runtime.ts
index 12ee43c6461..43acc9ae483 100644
--- a/packages/qwik/src/core/render/jsx/jsx-runtime.ts
+++ b/packages/qwik/src/core/render/jsx/jsx-runtime.ts
@@ -12,7 +12,7 @@ import { isPromise } from '../../util/promises';
 import { SkipRender } from './utils.public';
 import { EMPTY_OBJ } from '../../util/flyweight';
 import { _IMMUTABLE } from '../../internal';
-import { isBrowser } from '@builder.io/qwik/build';
+import { isBrowser } from '@builder.io/qwik';
 import { assertString } from '../../error/assert';
 import { static_subtree } from '../execute-component';
 import type { JsxChild } from 'typescript';
diff --git a/packages/qwik/src/core/util/event.ts b/packages/qwik/src/core/util/event.ts
index b9caca4ab69..352db0ed0d0 100644
--- a/packages/qwik/src/core/util/event.ts
+++ b/packages/qwik/src/core/util/event.ts
@@ -1,4 +1,4 @@
-import { isBrowser } from '@builder.io/qwik/build';
+import { isBrowser } from '@builder.io/qwik';
 import { qTest } from './qdev';
 
 export const emitEvent = (
diff --git a/packages/qwik/src/server/render.ts b/packages/qwik/src/server/render.ts
index b890d51872e..d0f34d89127 100644
--- a/packages/qwik/src/server/render.ts
+++ b/packages/qwik/src/server/render.ts
@@ -1,6 +1,6 @@
 import type { SnapshotResult } from '@builder.io/qwik';
 import { _pauseFromContexts, _renderSSR, Fragment, jsx, type JSXNode } from '@builder.io/qwik';
-import { isDev } from '@builder.io/qwik/build';
+import { isDev } from '@builder.io/qwik';
 import type { QContext } from '../core/state/context';
 import { QInstance } from '../core/util/markers';
 import { getValidManifest } from '../optimizer/src/manifest';
diff --git a/starters/apps/e2e/src/components/build-variables/build.tsx b/starters/apps/e2e/src/components/build-variables/build.tsx
index fe381683ace..7c6eab6d19a 100644
--- a/starters/apps/e2e/src/components/build-variables/build.tsx
+++ b/starters/apps/e2e/src/components/build-variables/build.tsx
@@ -1,6 +1,6 @@
 import { component$, useSignal, useTask$ } from "@builder.io/qwik";
-import { isBrowser, isServer } from "@builder.io/qwik/build";
-import * as build from "@builder.io/qwik/build";
+import { isBrowser, isServer } from "@builder.io/qwik";
+import * as build from "@builder.io/qwik";
 
 export const BuildVariables = component$(() => {
   const json = useSignal("");
diff --git a/starters/apps/e2e/src/components/mount/mount.tsx b/starters/apps/e2e/src/components/mount/mount.tsx
index 521a3148826..6da6d215d09 100644
--- a/starters/apps/e2e/src/components/mount/mount.tsx
+++ b/starters/apps/e2e/src/components/mount/mount.tsx
@@ -1,6 +1,6 @@
 import { component$, useStore, useTask$ } from "@builder.io/qwik";
 import { delay } from "../async/async";
-import { isServer } from "@builder.io/qwik/build";
+import { isServer } from "@builder.io/qwik";
 
 export const MountRoot = component$(() => {
   const internal = useStore(
diff --git a/starters/apps/e2e/src/components/render/render.tsx b/starters/apps/e2e/src/components/render/render.tsx
index 6d829c6a000..08ea6ad2268 100644
--- a/starters/apps/e2e/src/components/render/render.tsx
+++ b/starters/apps/e2e/src/components/render/render.tsx
@@ -16,7 +16,7 @@ import {
   type JSXOutput,
 } from "@builder.io/qwik";
 import { delay } from "../streaming/demo";
-import { isServer } from "@builder.io/qwik/build";
+import { isServer } from "@builder.io/qwik";
 
 export const Render = component$(() => {
   const rerender = useSignal(0);
diff --git a/starters/apps/e2e/src/components/signals/signals.tsx b/starters/apps/e2e/src/components/signals/signals.tsx
index f241f384b88..4764d82aa1a 100644
--- a/starters/apps/e2e/src/components/signals/signals.tsx
+++ b/starters/apps/e2e/src/components/signals/signals.tsx
@@ -27,7 +27,7 @@ import {
   TestCStr,
   TestCWithFlag,
 } from "./utils/utils";
-import { isBrowser } from "@builder.io/qwik/build";
+import { isBrowser } from "@builder.io/qwik";
 
 export const Signals = component$(() => {
   const rerender = useSignal(0);
diff --git a/starters/apps/e2e/src/components/toggle/toggle.tsx b/starters/apps/e2e/src/components/toggle/toggle.tsx
index 33baf44caf0..178b9014fae 100644
--- a/starters/apps/e2e/src/components/toggle/toggle.tsx
+++ b/starters/apps/e2e/src/components/toggle/toggle.tsx
@@ -7,7 +7,7 @@ import {
   useContext,
   useTask$,
 } from "@builder.io/qwik";
-import { isBrowser, isServer } from "@builder.io/qwik/build";
+import { isBrowser, isServer } from "@builder.io/qwik";
 
 export const CTX = createContextId<{ message: string; count: number }>(
   "toggle",
diff --git a/starters/apps/e2e/src/components/watch/watch.tsx b/starters/apps/e2e/src/components/watch/watch.tsx
index 36f7e7bcf64..d18a690fb75 100644
--- a/starters/apps/e2e/src/components/watch/watch.tsx
+++ b/starters/apps/e2e/src/components/watch/watch.tsx
@@ -10,7 +10,7 @@ import {
   useContextProvider,
   $,
 } from "@builder.io/qwik";
-import { isServer } from "@builder.io/qwik/build";
+import { isServer } from "@builder.io/qwik";
 
 interface State {
   count: number;
diff --git a/starters/apps/empty/src/root.tsx b/starters/apps/empty/src/root.tsx
index 3e42ec38ac9..f87bd23766a 100644
--- a/starters/apps/empty/src/root.tsx
+++ b/starters/apps/empty/src/root.tsx
@@ -5,7 +5,7 @@ import {
   ServiceWorkerRegister,
 } from "@builder.io/qwik-city";
 import { RouterHead } from "./components/router-head/router-head";
-import { isDev } from "@builder.io/qwik/build";
+import { isDev } from "@builder.io/qwik";
 
 import "./global.css";
 
diff --git a/starters/apps/playground/src/root.tsx b/starters/apps/playground/src/root.tsx
index f6c88a89cea..b1cddd70d44 100644
--- a/starters/apps/playground/src/root.tsx
+++ b/starters/apps/playground/src/root.tsx
@@ -1,5 +1,5 @@
 import { component$ } from "@builder.io/qwik";
-import { isDev } from "@builder.io/qwik/build";
+import { isDev } from "@builder.io/qwik";
 import {
   QwikCityProvider,
   RouterOutlet,
diff --git a/starters/apps/qwikcity-test/src/routes/issue-loader-serialization/index.tsx b/starters/apps/qwikcity-test/src/routes/issue-loader-serialization/index.tsx
index 57383b3f763..a3cf8ace9c2 100644
--- a/starters/apps/qwikcity-test/src/routes/issue-loader-serialization/index.tsx
+++ b/starters/apps/qwikcity-test/src/routes/issue-loader-serialization/index.tsx
@@ -5,7 +5,7 @@ import {
   useTask$,
 } from "@builder.io/qwik";
 import { routeLoader$ } from "@builder.io/qwik-city";
-import { isBrowser } from "@builder.io/qwik/build";
+import { isBrowser } from "@builder.io/qwik";
 
 export const useCmp1 = routeLoader$(
   () => {