diff --git a/packages/atomic/package.json b/packages/atomic/package.json
index 13c3c0fa635..c4f591daeb6 100644
--- a/packages/atomic/package.json
+++ b/packages/atomic/package.json
@@ -36,8 +36,8 @@
       "require": "./dist/atomic/lang/*"
     },
     "./components": {
-      "types": "./dist/components/components/index.d.ts",
-      "import": "./dist/components/components/index.js"
+      "types": "./dist/atomic/components/components/index.d.ts",
+      "import": "./dist/atomic/components/components/index.js"
     },
     "./custom-elements-manifest": "./custom-elements.json"
   },
diff --git a/packages/atomic/src/autoloader/index.ts b/packages/atomic/src/autoloader/index.ts
index 0e93c0fbf98..1be54354b32 100644
--- a/packages/atomic/src/autoloader/index.ts
+++ b/packages/atomic/src/autoloader/index.ts
@@ -1,6 +1,6 @@
 //@ts-ignore
 //TODO: Simplify path to target some kind of index file?
-import searchElementMap from '../../components/components/search/lazy-index.js';
+import searchElementMap from '../components/components/search/lazy-index.js';
 
 if (typeof window !== 'undefined') {
   /**
diff --git a/packages/atomic/src/components/commerce/atomic-commerce-query-error/e2e/fixture.ts b/packages/atomic/src/components/commerce/atomic-commerce-query-error/e2e/fixture.ts
index 424a8190fa5..f406e37e970 100644
--- a/packages/atomic/src/components/commerce/atomic-commerce-query-error/e2e/fixture.ts
+++ b/packages/atomic/src/components/commerce/atomic-commerce-query-error/e2e/fixture.ts
@@ -1,9 +1,9 @@
 import {Page, test as base} from '@playwright/test';
-import {KnownErrorType} from '../../../../../dist/types/components/common/query-error/known-error-types';
 import {
   AxeFixture,
   makeAxeBuilder,
 } from '../../../../../playwright-utils/base-fixture';
+import type {KnownErrorType} from '../../../common/query-error/known-error-types';
 import {SearchBoxPageObject as SearchBox} from '../../atomic-commerce-search-box/e2e/page-object';
 import {QueryErrorPageObject as QueryError} from './page-object';
 
diff --git a/packages/atomic/stencil-proxy/atomic/atomic.esm.js b/packages/atomic/stencil-proxy/atomic/atomic.esm.js
index 0e3caa82a6c..9398ad23f7b 100644
--- a/packages/atomic/stencil-proxy/atomic/atomic.esm.js
+++ b/packages/atomic/stencil-proxy/atomic/atomic.esm.js
@@ -1,4 +1,4 @@
 import './autoloader/index.esm.js';
 
 export * from './_atomic.esm.js';
-export * from '../components/components/lazy-index.js';
+export * from './components/components/lazy-index.js';
diff --git a/packages/atomic/stencil-proxy/components/index.js b/packages/atomic/stencil-proxy/atomic/components/index.js
similarity index 100%
rename from packages/atomic/stencil-proxy/components/index.js
rename to packages/atomic/stencil-proxy/atomic/components/index.js
diff --git a/packages/atomic/stencil-proxy/cjs/loader.cjs.js b/packages/atomic/stencil-proxy/cjs/loader.cjs.js
index c5fe0650a5a..52a475e8647 100644
--- a/packages/atomic/stencil-proxy/cjs/loader.cjs.js
+++ b/packages/atomic/stencil-proxy/cjs/loader.cjs.js
@@ -1,6 +1,6 @@
 const exportModule = require('./_loader.cjs.js');
 const searchComponents = import(
-  '../components/components/search/lazy-index.js'
+  '../atomic/components/components/search/lazy-index.js'
 );
 
 const originalDefineCustomElements = exportModule.defineCustomElements;
diff --git a/packages/atomic/stencil-proxy/esm/index.js b/packages/atomic/stencil-proxy/esm/index.js
index 0fc33407359..44a5dc8abbb 100644
--- a/packages/atomic/stencil-proxy/esm/index.js
+++ b/packages/atomic/stencil-proxy/esm/index.js
@@ -1,4 +1,4 @@
 import '../atomic/autoloader/index.esm.js';
 
 export * from './_index.js';
-export * as SearchComponentMap from '../components/components/search/lazy-index.js';
+export * as SearchComponentMap from '../atomic/components/components/search/lazy-index.js';
diff --git a/packages/atomic/stencil-proxy/esm/loader.js b/packages/atomic/stencil-proxy/esm/loader.js
index c217f8ee0b0..5bdd475b776 100644
--- a/packages/atomic/stencil-proxy/esm/loader.js
+++ b/packages/atomic/stencil-proxy/esm/loader.js
@@ -1,4 +1,4 @@
-import searchComponents from '../components/components/search/lazy-index.js';
+import searchComponents from '../atomic/components/components/search/lazy-index.js';
 import {defineCustomElements as originalDefineCustomElements} from './_loader.js';
 
 const defineCustomElements = function (...args) {
diff --git a/packages/atomic/stencil.config.ts b/packages/atomic/stencil.config.ts
index 6f39f7ee2a7..f85efc45cd8 100644
--- a/packages/atomic/stencil.config.ts
+++ b/packages/atomic/stencil.config.ts
@@ -126,6 +126,7 @@ export const config: Config = {
     {
       type: 'dist-custom-elements',
       generateTypeDeclarations: false,
+      dir: 'dist/atomic/components',
       customElementsExportBehavior: 'single-export-module',
     },
     {
diff --git a/packages/atomic/tsconfig.lit.json b/packages/atomic/tsconfig.lit.json
index f43f2b31a30..4eb289dc815 100644
--- a/packages/atomic/tsconfig.lit.json
+++ b/packages/atomic/tsconfig.lit.json
@@ -9,7 +9,7 @@
     "declarationMap": true,
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
-    "outDir": "dist/components"
+    "outDir": "dist/atomic/components"
   },
   "files": [
     "src/components/index.ts",