diff --git a/apps/debugger/src/app/debugger.ts b/apps/debugger/src/app/debugger.ts
index fb8f769c19..28e9703470 100644
--- a/apps/debugger/src/app/debugger.ts
+++ b/apps/debugger/src/app/debugger.ts
@@ -2,7 +2,7 @@ import { PluginClient } from "@remixproject/plugin";
 import { createClient } from "@remixproject/plugin-webview";
 import { IDebuggerApi, LineColumnLocation, 
   onBreakpointClearedListener, onBreakpointAddedListener, onEditorContentChanged, onEnvChangedListener, TransactionReceipt } from '@remix-ui/debugger-ui'
-import { DebuggerApiMixin } from './debugger-api'
+import { DebuggerApiMixin } from '@remix-ui/debugger-ui'
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 
 export class DebuggerClientApi extends DebuggerApiMixin(PluginClient) {  
diff --git a/apps/debugger/src/index.ts b/apps/debugger/src/index.ts
deleted file mode 100644
index b38e3a7942..0000000000
--- a/apps/debugger/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './app/debugger-api';
diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 1c66b1db7a..a43e71ca4b 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -2,7 +2,7 @@
 import React from 'react' // eslint-disable-line
 import { SolidityCompiler } from '@remix-ui/solidity-compiler' // eslint-disable-line
 import { CompileTabLogic } from '@remix-ui/solidity-compiler' // eslint-disable-line
-import { CompilerApiMixin } from '@remixproject/solidity-compiler-plugin' // eslint-disable-line
+import { CompilerApiMixin } from '@remix-ui/solidity-compiler'
 import { ViewPlugin } from '@remixproject/engine-web'
 import { QueryParams } from '@remix-project/remix-lib'
 // import { ICompilerApi } from '@remix-project/remix-lib'
diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js
index 2d49dcc6c7..cd06ea4ffa 100644
--- a/apps/remix-ide/src/app/tabs/debugger-tab.js
+++ b/apps/remix-ide/src/app/tabs/debugger-tab.js
@@ -1,6 +1,6 @@
 import Web3 from 'web3'
 import { DebuggerUI } from '@remix-ui/debugger-ui' // eslint-disable-line
-import { DebuggerApiMixin } from '@remixproject/debugger-plugin' // eslint-disable-line
+import { DebuggerApiMixin } from '@remix-ui/debugger-ui'
 import { ViewPlugin } from '@remixproject/engine-web'
 import * as packageJson from '../../../../../package.json'
 import React from 'react' // eslint-disable-line
diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index aa04950e0c..01543be995 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -2,7 +2,7 @@
 /* eslint-disable no-unused-vars */
 import { PluginClient } from '@remixproject/plugin'
 import { createClient } from '@remixproject/plugin-webview'
-import { CompilerApiMixin } from './compiler-api'
+import { CompilerApiMixin } from '@remix-ui/solidity-compiler'
 import { ICompilerApi } from '@remix-project/remix-lib'
 import { CompileTabLogic } from '@remix-ui/solidity-compiler'
 
diff --git a/apps/solidity-compiler/src/index.ts b/apps/solidity-compiler/src/index.ts
deleted file mode 100644
index f92deb7aa4..0000000000
--- a/apps/solidity-compiler/src/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './app/compiler-api'
diff --git a/libs/remix-ui/debugger-ui/src/index.ts b/libs/remix-ui/debugger-ui/src/index.ts
index 840763d2ef..384ae40ad7 100644
--- a/libs/remix-ui/debugger-ui/src/index.ts
+++ b/libs/remix-ui/debugger-ui/src/index.ts
@@ -1,2 +1,3 @@
 export * from './lib/debugger-ui'
 export * from './lib/idebugger-api'
+export * from './lib/api/debugger-api'
diff --git a/apps/debugger/src/app/debugger-api.ts b/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts
similarity index 100%
rename from apps/debugger/src/app/debugger-api.ts
rename to libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts
diff --git a/libs/remix-ui/solidity-compiler/src/index.ts b/libs/remix-ui/solidity-compiler/src/index.ts
index fe6611e472..386d3792be 100644
--- a/libs/remix-ui/solidity-compiler/src/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/index.ts
@@ -1,3 +1,4 @@
 export * from './lib/solidity-compiler'
 export * from './lib/logic'
 export * from './lib/logic/flattenerUtilities'
+export * from './lib/api/compiler-api'
\ No newline at end of file
diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts
similarity index 100%
rename from apps/solidity-compiler/src/app/compiler-api.ts
rename to libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts