diff --git a/extension/src/browser/extension/window/remote.tsx b/extension/src/remote/index.tsx
similarity index 96%
rename from extension/src/browser/extension/window/remote.tsx
rename to extension/src/remote/index.tsx
index f91c372a..af100aca 100644
--- a/extension/src/browser/extension/window/remote.tsx
+++ b/extension/src/remote/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { createRoot } from 'react-dom/client';
 import { Root } from '@redux-devtools/app';
 
-import '../../views/remote.pug';
+import './remote.pug';
 
 chrome.storage.local.get(
   {
diff --git a/extension/src/browser/views/remote.pug b/extension/src/remote/remote.pug
similarity index 77%
rename from extension/src/browser/views/remote.pug
rename to extension/src/remote/remote.pug
index c3e59689..259bd8f4 100644
--- a/extension/src/browser/views/remote.pug
+++ b/extension/src/remote/remote.pug
@@ -4,7 +4,7 @@ html
   head
     meta(charset='UTF-8')
   title RemoteDev
-  include ../../style.pug
+  include ../style.pug
 
   body
     #root
diff --git a/extension/src/browser/extension/window/index.tsx b/extension/src/window/index.tsx
similarity index 83%
rename from extension/src/browser/extension/window/index.tsx
rename to extension/src/window/index.tsx
index d8d41323..ea87aad8 100644
--- a/extension/src/browser/extension/window/index.tsx
+++ b/extension/src/window/index.tsx
@@ -3,11 +3,11 @@ import { createRoot } from 'react-dom/client';
 import { Provider } from 'react-redux';
 import { PersistGate } from 'redux-persist/integration/react';
 import { UPDATE_STATE } from '@redux-devtools/app';
-import App from '../../../app/containers/App';
-import configureStore from '../../../app/stores/windowStore';
-import type { MonitorMessage } from '../../../background/store/apiMiddleware';
+import App from '../app/containers/App';
+import configureStore from './store/windowStore';
+import type { MonitorMessage } from '../background/store/apiMiddleware';
 
-import '../../views/window.pug';
+import './window.pug';
 
 const position = location.hash;
 
diff --git a/extension/src/app/middlewares/instanceSelector.ts b/extension/src/window/store/instanceSelectorMiddleware.ts
similarity index 100%
rename from extension/src/app/middlewares/instanceSelector.ts
rename to extension/src/window/store/instanceSelectorMiddleware.ts
diff --git a/extension/src/app/reducers/window/instances.ts b/extension/src/window/store/instancesReducer.ts
similarity index 94%
rename from extension/src/app/reducers/window/instances.ts
rename to extension/src/window/store/instancesReducer.ts
index 6ef0cad3..cc39478b 100644
--- a/extension/src/app/reducers/window/instances.ts
+++ b/extension/src/window/store/instancesReducer.ts
@@ -6,10 +6,10 @@ import {
   LIFTED_ACTION,
   SET_PERSIST,
 } from '@redux-devtools/app';
-import {
+import type {
   ExpandedUpdateStateAction,
   WindowStoreAction,
-} from '../../stores/windowStore';
+} from './windowStore';
 
 export default function instances(
   state = instancesInitialState,
diff --git a/extension/src/app/reducers/window/index.ts b/extension/src/window/store/windowReducer.ts
similarity index 80%
rename from extension/src/app/reducers/window/index.ts
rename to extension/src/window/store/windowReducer.ts
index 3ec4ddf3..9a14cd3b 100644
--- a/extension/src/app/reducers/window/index.ts
+++ b/extension/src/window/store/windowReducer.ts
@@ -9,8 +9,8 @@ import {
   theme,
   StoreState,
 } from '@redux-devtools/app';
-import instances from './instances';
-import { WindowStoreAction } from '../../stores/windowStore';
+import instances from './instancesReducer';
+import type { WindowStoreAction } from './windowStore';
 
 const rootReducer: Reducer<StoreState, WindowStoreAction> =
   combineReducers<StoreState>({
diff --git a/extension/src/app/stores/windowStore.ts b/extension/src/window/store/windowStore.ts
similarity index 92%
rename from extension/src/app/stores/windowStore.ts
rename to extension/src/window/store/windowStore.ts
index e3622a23..f63002ae 100644
--- a/extension/src/app/stores/windowStore.ts
+++ b/extension/src/window/store/windowStore.ts
@@ -17,9 +17,9 @@ import {
   StoreState,
   UpdateStateAction,
 } from '@redux-devtools/app';
-import syncStores from '../middlewares/windowSync';
-import instanceSelector from '../middlewares/instanceSelector';
-import rootReducer from '../reducers/window';
+import syncStores from './windowSyncMiddleware';
+import instanceSelector from './instanceSelectorMiddleware';
+import rootReducer from './windowReducer';
 import type { BackgroundState } from '../../background/store/backgroundReducer';
 import type { BackgroundAction } from '../../background/store/backgroundStore';
 import type {
diff --git a/extension/src/app/middlewares/windowSync.ts b/extension/src/window/store/windowSyncMiddleware.ts
similarity index 94%
rename from extension/src/app/middlewares/windowSync.ts
rename to extension/src/window/store/windowSyncMiddleware.ts
index fbd4a719..6f9f9cf7 100644
--- a/extension/src/app/middlewares/windowSync.ts
+++ b/extension/src/window/store/windowSyncMiddleware.ts
@@ -8,7 +8,7 @@ import {
 } from '@redux-devtools/app';
 import { Dispatch, MiddlewareAPI, Store } from 'redux';
 import type { BackgroundState } from '../../background/store/backgroundReducer';
-import { WindowStoreAction } from '../stores/windowStore';
+import type { WindowStoreAction } from './windowStore';
 import type { BackgroundAction } from '../../background/store/backgroundStore';
 
 const syncStores =
diff --git a/extension/src/browser/views/window.pug b/extension/src/window/window.pug
similarity index 89%
rename from extension/src/browser/views/window.pug
rename to extension/src/window/window.pug
index 773d0449..630a3edf 100644
--- a/extension/src/browser/views/window.pug
+++ b/extension/src/window/window.pug
@@ -4,7 +4,7 @@ html
   head
     meta(charset='UTF-8')
   title Redux DevTools
-  include ../../style.pug
+  include ../style.pug
 
   body
     #root
diff --git a/extension/webpack/base.config.js b/extension/webpack/base.config.js
index a8f14022..40c029f7 100644
--- a/extension/webpack/base.config.js
+++ b/extension/webpack/base.config.js
@@ -12,8 +12,8 @@ const baseConfig = (params) => ({
   entry: params.input || {
     background: [mock, '../src/background/index'],
     options: [mock, '../src/options/index'],
-    window: [`${extpath}window/index`],
-    remote: [`${extpath}window/remote`],
+    window: ['../src/window/index'],
+    remote: ['../src/remote/index'],
     devpanel: [mock, '../src/devpanel/index'],
     devtools: ['../src/devtools/index'],
     content: [mock, `${extpath}inject/contentScript`],