diff --git a/core/src/core.ts b/core/src/browser/core.ts
similarity index 99%
rename from core/src/core.ts
rename to core/src/browser/core.ts
index 32244e784..6bbae7c85 100644
--- a/core/src/core.ts
+++ b/core/src/browser/core.ts
@@ -1,4 +1,4 @@
-import { DownloadRequest, FileStat, NetworkConfig, SystemInformation } from './types'
+import { DownloadRequest, FileStat, NetworkConfig, SystemInformation } from '../types'
 
 /**
  * Execute a extension module function in main process
diff --git a/core/src/events.ts b/core/src/browser/events.ts
similarity index 100%
rename from core/src/events.ts
rename to core/src/browser/events.ts
diff --git a/core/src/extension.ts b/core/src/browser/extension.ts
similarity index 100%
rename from core/src/extension.ts
rename to core/src/browser/extension.ts
diff --git a/core/src/extensions/assistant.ts b/core/src/browser/extensions/assistant.ts
similarity index 90%
rename from core/src/extensions/assistant.ts
rename to core/src/browser/extensions/assistant.ts
index 5c3114f41..d025c6786 100644
--- a/core/src/extensions/assistant.ts
+++ b/core/src/browser/extensions/assistant.ts
@@ -1,4 +1,4 @@
-import { Assistant, AssistantInterface } from '../index'
+import { Assistant, AssistantInterface } from '../../types'
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
 
 /**
diff --git a/core/src/extensions/conversational.ts b/core/src/browser/extensions/conversational.ts
similarity index 97%
rename from core/src/extensions/conversational.ts
rename to core/src/browser/extensions/conversational.ts
index a49a4e689..ec53fbbbf 100644
--- a/core/src/extensions/conversational.ts
+++ b/core/src/browser/extensions/conversational.ts
@@ -1,4 +1,4 @@
-import { Thread, ThreadInterface, ThreadMessage, MessageInterface } from '../index'
+import { Thread, ThreadInterface, ThreadMessage, MessageInterface } from '../../types'
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
 
 /**
diff --git a/core/src/extensions/engines/AIEngine.ts b/core/src/browser/extensions/engines/AIEngine.ts
similarity index 97%
rename from core/src/extensions/engines/AIEngine.ts
rename to core/src/browser/extensions/engines/AIEngine.ts
index 2323c07ef..3e63e67cb 100644
--- a/core/src/extensions/engines/AIEngine.ts
+++ b/core/src/browser/extensions/engines/AIEngine.ts
@@ -2,7 +2,7 @@ import { getJanDataFolderPath, joinPath } from '../../core'
 import { events } from '../../events'
 import { BaseExtension } from '../../extension'
 import { fs } from '../../fs'
-import { MessageRequest, Model, ModelEvent } from '../../types'
+import { MessageRequest, Model, ModelEvent } from '../../../types'
 import { EngineManager } from './EngineManager'
 
 /**
diff --git a/core/src/extensions/engines/EngineManager.ts b/core/src/browser/extensions/engines/EngineManager.ts
similarity index 88%
rename from core/src/extensions/engines/EngineManager.ts
rename to core/src/browser/extensions/engines/EngineManager.ts
index 6931e605e..1de31ab8d 100644
--- a/core/src/extensions/engines/EngineManager.ts
+++ b/core/src/browser/extensions/engines/EngineManager.ts
@@ -1,4 +1,3 @@
-import { log } from '../../core'
 import { AIEngine } from './AIEngine'
 
 /**
@@ -28,7 +27,3 @@ export class EngineManager {
     return window.core?.engineManager as EngineManager
   }
 }
-
-/**
- * The singleton instance of the ExtensionManager.
- */
diff --git a/core/src/extensions/engines/LocalOAIEngine.ts b/core/src/browser/extensions/engines/LocalOAIEngine.ts
similarity index 97%
rename from core/src/extensions/engines/LocalOAIEngine.ts
rename to core/src/browser/extensions/engines/LocalOAIEngine.ts
index ce92ac804..ab5a2622c 100644
--- a/core/src/extensions/engines/LocalOAIEngine.ts
+++ b/core/src/browser/extensions/engines/LocalOAIEngine.ts
@@ -1,6 +1,6 @@
 import { executeOnMain, getJanDataFolderPath, joinPath, systemInformation } from '../../core'
 import { events } from '../../events'
-import { Model, ModelEvent } from '../../types'
+import { Model, ModelEvent } from '../../../types'
 import { OAIEngine } from './OAIEngine'
 
 /**
diff --git a/core/src/extensions/engines/OAIEngine.ts b/core/src/browser/extensions/engines/OAIEngine.ts
similarity index 99%
rename from core/src/extensions/engines/OAIEngine.ts
rename to core/src/browser/extensions/engines/OAIEngine.ts
index 772f6504f..53baaae2a 100644
--- a/core/src/extensions/engines/OAIEngine.ts
+++ b/core/src/browser/extensions/engines/OAIEngine.ts
@@ -13,7 +13,7 @@ import {
   ModelInfo,
   ThreadContent,
   ThreadMessage,
-} from '../../types'
+} from '../../../types'
 import { events } from '../../events'
 
 /**
diff --git a/core/src/extensions/engines/RemoteOAIEngine.ts b/core/src/browser/extensions/engines/RemoteOAIEngine.ts
similarity index 100%
rename from core/src/extensions/engines/RemoteOAIEngine.ts
rename to core/src/browser/extensions/engines/RemoteOAIEngine.ts
diff --git a/core/src/extensions/engines/helpers/sse.ts b/core/src/browser/extensions/engines/helpers/sse.ts
similarity index 97%
rename from core/src/extensions/engines/helpers/sse.ts
rename to core/src/browser/extensions/engines/helpers/sse.ts
index 723d0dc13..28d24ee47 100644
--- a/core/src/extensions/engines/helpers/sse.ts
+++ b/core/src/browser/extensions/engines/helpers/sse.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs'
-import { ModelRuntimeParams } from '../../../types'
+import { ModelRuntimeParams } from '../../../../types'
 /**
  * Sends a request to the inference server to generate a response based on the recent messages.
  * @param recentMessages - An array of recent messages to use as context for the inference.
diff --git a/core/src/extensions/engines/index.ts b/core/src/browser/extensions/engines/index.ts
similarity index 100%
rename from core/src/extensions/engines/index.ts
rename to core/src/browser/extensions/engines/index.ts
diff --git a/core/src/extensions/huggingface.ts b/core/src/browser/extensions/huggingface.ts
similarity index 92%
rename from core/src/extensions/huggingface.ts
rename to core/src/browser/extensions/huggingface.ts
index 16a1d9b8a..b9c9626a0 100644
--- a/core/src/extensions/huggingface.ts
+++ b/core/src/browser/extensions/huggingface.ts
@@ -1,6 +1,6 @@
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
-import { HuggingFaceInterface, HuggingFaceRepoData, Quantization } from '../types/huggingface'
-import { Model } from '../types/model'
+import { HuggingFaceInterface, HuggingFaceRepoData, Quantization } from '../../types/huggingface'
+import { Model } from '../../types/model'
 
 /**
  * Hugging Face extension for converting HF models to GGUF.
diff --git a/core/src/extensions/index.ts b/core/src/browser/extensions/index.ts
similarity index 100%
rename from core/src/extensions/index.ts
rename to core/src/browser/extensions/index.ts
diff --git a/core/src/extensions/inference.ts b/core/src/browser/extensions/inference.ts
similarity index 96%
rename from core/src/extensions/inference.ts
rename to core/src/browser/extensions/inference.ts
index e8e51f9eb..44c50f7f8 100644
--- a/core/src/extensions/inference.ts
+++ b/core/src/browser/extensions/inference.ts
@@ -1,4 +1,4 @@
-import { InferenceInterface, MessageRequest, ThreadMessage } from '../index'
+import { InferenceInterface, MessageRequest, ThreadMessage } from '../../types'
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
 
 /**
diff --git a/core/src/extensions/model.ts b/core/src/browser/extensions/model.ts
similarity index 97%
rename from core/src/extensions/model.ts
rename to core/src/browser/extensions/model.ts
index 33eec0afc..6dd52f192 100644
--- a/core/src/extensions/model.ts
+++ b/core/src/browser/extensions/model.ts
@@ -1,5 +1,5 @@
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
-import { GpuSetting, ImportingModel, Model, ModelInterface, OptionType } from '../index'
+import { GpuSetting, ImportingModel, Model, ModelInterface, OptionType } from '../../types'
 
 /**
  * Model extension for managing models.
diff --git a/core/src/extensions/monitoring.ts b/core/src/browser/extensions/monitoring.ts
similarity index 97%
rename from core/src/extensions/monitoring.ts
rename to core/src/browser/extensions/monitoring.ts
index 2d75e0218..c30766f6e 100644
--- a/core/src/extensions/monitoring.ts
+++ b/core/src/browser/extensions/monitoring.ts
@@ -1,5 +1,5 @@
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
-import { GpuSetting, MonitoringInterface, OperatingSystemInfo } from '../index'
+import { GpuSetting, MonitoringInterface, OperatingSystemInfo } from '../../types'
 
 /**
  * Monitoring extension for system monitoring.
diff --git a/core/src/fs.ts b/core/src/browser/fs.ts
similarity index 98%
rename from core/src/fs.ts
rename to core/src/browser/fs.ts
index 3a9a20afb..164e3b647 100644
--- a/core/src/fs.ts
+++ b/core/src/browser/fs.ts
@@ -1,4 +1,4 @@
-import { FileStat } from './types'
+import { FileStat } from '../types'
 
 /**
  * Writes data to a file at the specified path.
diff --git a/core/src/browser/index.ts b/core/src/browser/index.ts
new file mode 100644
index 000000000..631baf06c
--- /dev/null
+++ b/core/src/browser/index.ts
@@ -0,0 +1,29 @@
+/**
+ * Export Core module
+ * @module
+ */
+export * from './core'
+
+/**
+ * Export Event module.
+ * @module
+ */
+export * from './events'
+
+/**
+ * Export Filesystem module.
+ * @module
+ */
+export * from './fs'
+
+/**
+ * Export Extension module.
+ * @module
+ */
+export * from './extension'
+
+/**
+ * Export all base extensions.
+ * @module
+ */
+export * from './extensions'
diff --git a/core/src/index.ts b/core/src/index.ts
index 3505797b1..cfd69f93d 100644
--- a/core/src/index.ts
+++ b/core/src/index.ts
@@ -2,42 +2,13 @@
  * Export all types.
  * @module
  */
-export * from './types/index'
+export * from './types'
 
 /**
- * Export all routes
- */
-export * from './api'
-
-/**
- * Export Core module
+ * Export browser module
  * @module
  */
-export * from './core'
-
-/**
- * Export Event module.
- * @module
- */
-export * from './events'
-
-/**
- * Export Filesystem module.
- * @module
- */
-export * from './fs'
-
-/**
- * Export Extension module.
- * @module
- */
-export * from './extension'
-
-/**
- * Export all base extensions.
- * @module
- */
-export * from './extensions/index'
+export * from './browser'
 
 /**
  * Declare global object
diff --git a/core/src/node/api/common/adapter.ts b/core/src/node/api/common/adapter.ts
index 56f4cedb3..2beacf325 100644
--- a/core/src/node/api/common/adapter.ts
+++ b/core/src/node/api/common/adapter.ts
@@ -4,7 +4,7 @@ import {
   ExtensionRoute,
   FileManagerRoute,
   FileSystemRoute,
-} from '../../../api'
+} from '../../../types/api'
 import { Downloader } from '../processors/download'
 import { FileSystem } from '../processors/fs'
 import { Extension } from '../processors/extension'
diff --git a/core/src/node/api/common/handler.ts b/core/src/node/api/common/handler.ts
index 4a39ae52a..fb958dbd1 100644
--- a/core/src/node/api/common/handler.ts
+++ b/core/src/node/api/common/handler.ts
@@ -1,4 +1,4 @@
-import { CoreRoutes } from '../../../api'
+import { CoreRoutes } from '../../../types/api'
 import { RequestAdapter } from './adapter'
 
 export type Handler = (route: string, args: any) => any
diff --git a/core/src/node/api/processors/download.ts b/core/src/node/api/processors/download.ts
index 8e8e08f2f..98464dd52 100644
--- a/core/src/node/api/processors/download.ts
+++ b/core/src/node/api/processors/download.ts
@@ -1,5 +1,5 @@
 import { resolve, sep } from 'path'
-import { DownloadEvent } from '../../../api'
+import { DownloadEvent } from '../../../types/api'
 import { normalizeFilePath } from '../../helper/path'
 import { getJanDataFolderPath } from '../../helper'
 import { DownloadManager } from '../../helper/download'
diff --git a/core/src/node/api/restful/app/download.ts b/core/src/node/api/restful/app/download.ts
index b5919659b..5e0c83d01 100644
--- a/core/src/node/api/restful/app/download.ts
+++ b/core/src/node/api/restful/app/download.ts
@@ -1,4 +1,4 @@
-import { DownloadRoute } from '../../../../api'
+import { DownloadRoute } from '../../../../types/api'
 import { DownloadManager } from '../../../helper/download'
 import { HttpServer } from '../../HttpServer'
 
diff --git a/core/src/node/index.ts b/core/src/node/index.ts
index 02d921fd6..eb6027075 100644
--- a/core/src/node/index.ts
+++ b/core/src/node/index.ts
@@ -5,4 +5,4 @@ export * from './extension/store'
 export * from './api'
 export * from './helper'
 export * from './../types'
-export * from './../api'
+export * from '../types/api'
diff --git a/core/src/api/index.ts b/core/src/types/api/index.ts
similarity index 100%
rename from core/src/api/index.ts
rename to core/src/types/api/index.ts
diff --git a/core/src/types/index.ts b/core/src/types/index.ts
index 295d054e7..291c73524 100644
--- a/core/src/types/index.ts
+++ b/core/src/types/index.ts
@@ -8,3 +8,4 @@ export * from './file'
 export * from './config'
 export * from './huggingface'
 export * from './miscellaneous'
+export * from './api'
diff --git a/web/hooks/useActiveModel.ts b/web/hooks/useActiveModel.ts
index c2e11d182..e7cd4888d 100644
--- a/web/hooks/useActiveModel.ts
+++ b/web/hooks/useActiveModel.ts
@@ -7,7 +7,6 @@ import { toaster } from '@/containers/Toast'
 
 import { LAST_USED_MODEL_ID } from './useRecommendedModel'
 
-import { extensionManager } from '@/extension'
 import { downloadedModelsAtom } from '@/helpers/atoms/Model.atom'
 import { activeThreadAtom } from '@/helpers/atoms/Thread.atom'