diff --git a/src/hivesql/hivesql.worker.ts b/src/hivesql/hivesql.worker.ts
index 00b73faa..70bd8d68 100644
--- a/src/hivesql/hivesql.worker.ts
+++ b/src/hivesql/hivesql.worker.ts
@@ -1,6 +1,6 @@
 import { worker } from 'monaco-editor';
 import * as EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js';
-import { ICreateData } from '../_.contribution';
+import { ICreateData } from '../common/_.contribution';
 import { HiveSQLWorker } from './hiveSQLWorker';
 
 self.onmessage = (e: any) => {
diff --git a/src/index.d.ts b/src/index.d.ts
index e69de29b..66e7efb5 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -0,0 +1 @@
+declare module 'monaco-editor/esm/vs/editor/editor.worker.js';
diff --git a/src/mysql/mysql.worker.ts b/src/mysql/mysql.worker.ts
index 1d81e826..2f6bfa70 100644
--- a/src/mysql/mysql.worker.ts
+++ b/src/mysql/mysql.worker.ts
@@ -1,6 +1,6 @@
 import { worker } from 'monaco-editor';
 import * as EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js';
-import { ICreateData } from '../_.contribution';
+import { ICreateData } from '../common/_.contribution';
 import { MySQLWorker } from './mySQLWorker';
 
 self.onmessage = (e: any) => {
diff --git a/src/pgsql/pgsql.worker.ts b/src/pgsql/pgsql.worker.ts
index 71572143..4339b10f 100644
--- a/src/pgsql/pgsql.worker.ts
+++ b/src/pgsql/pgsql.worker.ts
@@ -1,6 +1,6 @@
 import { worker } from 'monaco-editor';
 import * as EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js';
-import { ICreateData } from '../_.contribution';
+import { ICreateData } from '../common/_.contribution';
 import { PgSQLWorker } from './PgSQLWorker';
 
 self.onmessage = (e: any) => {
diff --git a/src/plsql/plsql.worker.ts b/src/plsql/plsql.worker.ts
index 91f37171..7d87be0d 100644
--- a/src/plsql/plsql.worker.ts
+++ b/src/plsql/plsql.worker.ts
@@ -1,6 +1,6 @@
 import { worker } from 'monaco-editor';
 import * as EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js';
-import { ICreateData } from '../_.contribution';
+import { ICreateData } from '../common/_.contribution';
 import { PLSQLWorker } from './plSQLWorker';
 
 self.onmessage = (e: any) => {
diff --git a/src/sparksql/sparksql.worker.ts b/src/sparksql/sparksql.worker.ts
index ec7568e0..c1284548 100644
--- a/src/sparksql/sparksql.worker.ts
+++ b/src/sparksql/sparksql.worker.ts
@@ -1,6 +1,6 @@
 import { worker } from 'monaco-editor';
 import * as EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js';
-import { ICreateData } from '../_.contribution';
+import { ICreateData } from '../common/_.contribution';
 import { SparkSQLWorker } from './sparkSQLWorker';
 
 self.onmessage = (e: any) => {
diff --git a/src/sql.contribution.ts b/src/sql.contribution.ts
index a7ff3d71..74c2022f 100644
--- a/src/sql.contribution.ts
+++ b/src/sql.contribution.ts
@@ -6,8 +6,8 @@ import './plsql/plsql.contribution';
 import './pgsql/pgsql.contribution';
 import './sparksql/sparksql.contribution';
 
-export * from './_.contribution';
-export * from './languageService';
-export * from './languageFeatures';
-export * from './setupLanguageMode';
-export * from './workerManager';
+export * from './common/_.contribution';
+export * from './common/languageService';
+export * from './common/languageFeatures';
+export * from './common/setupLanguageMode';
+export * from './common/workerManager';
diff --git a/src/sql/sql.worker.ts b/src/sql/sql.worker.ts
index 17efd641..6d85ad8b 100644
--- a/src/sql/sql.worker.ts
+++ b/src/sql/sql.worker.ts
@@ -1,6 +1,6 @@
 import { worker } from 'monaco-editor';
 import * as EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js';
-import { ICreateData } from '../_.contribution';
+import { ICreateData } from '../common/_.contribution';
 import { SQLWorker } from './sqlWorker';
 
 self.onmessage = (e: any) => {
diff --git a/src/test/testRunner.ts b/src/test/testRunner.ts
index 1d73dd11..905c7551 100644
--- a/src/test/testRunner.ts
+++ b/src/test/testRunner.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import '../monaco.contribution';
-import { loadLanguage } from '../_.contribution';
+import { loadLanguage } from '../common/_.contribution';
 import * as test from 'tape';
 import { editor } from '../fillers/monaco-editor-core';