diff --git a/example/package-lock.json b/example/package-lock.json
index 85a24e41a..fdd906c74 100644
--- a/example/package-lock.json
+++ b/example/package-lock.json
@@ -386,7 +386,7 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
-        "fsevents": "1.1.2",
+        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -882,14 +882,14 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
+      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "2.6.2",
-        "node-pre-gyp": "0.6.36"
+        "nan": "2.8.0",
+        "node-pre-gyp": "0.6.39"
       },
       "dependencies": {
         "abbrev": {
@@ -1047,7 +1047,6 @@
           "version": "2.0.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "boom": "2.10.1"
           }
@@ -1095,6 +1094,12 @@
           "dev": true,
           "optional": true
         },
+        "detect-libc": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
         "ecc-jsbn": {
           "version": "0.1.1",
           "bundled": true,
@@ -1236,7 +1241,6 @@
           "version": "3.1.3",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "boom": "2.10.1",
             "cryptiles": "2.0.5",
@@ -1408,11 +1412,13 @@
           "optional": true
         },
         "node-pre-gyp": {
-          "version": "0.6.36",
+          "version": "0.6.39",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
+            "detect-libc": "1.0.2",
+            "hawk": "3.1.3",
             "mkdirp": "0.5.1",
             "nopt": "4.0.1",
             "npmlog": "4.1.0",
@@ -1620,7 +1626,6 @@
           "version": "1.0.9",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "hoek": "2.16.3"
           }
@@ -2373,7 +2378,7 @@
       "version": "file:..",
       "requires": {
         "glob-to-regexp": "0.3.0",
-        "monaco-editor": "0.9.0",
+        "monaco-editor-core": "0.10.1",
         "vscode-base-languageclient": "0.0.1-alpha.3"
       },
       "dependencies": {
@@ -2436,12 +2441,8 @@
             "brace-expansion": "1.1.8"
           }
         },
-        "monaco-editor": {
-          "version": "0.9.0",
-          "bundled": true
-        },
         "monaco-editor-core": {
-          "version": "0.9.0",
+          "version": "0.10.1",
           "bundled": true
         },
         "once": {
@@ -2499,9 +2500,9 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "nan": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
+      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
       "dev": true,
       "optional": true
     },
diff --git a/example/tsconfig.json b/example/tsconfig.json
index f38f240b1..45ffab91b 100644
--- a/example/tsconfig.json
+++ b/example/tsconfig.json
@@ -18,8 +18,5 @@
     },
     "include": [
         "src"
-    ],
-    "files": [
-        "../node_modules/monaco-editor/monaco.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/example/webpack.config.js b/example/webpack.config.js
index bd863eb25..6b17d0540 100644
--- a/example/webpack.config.js
+++ b/example/webpack.config.js
@@ -2,7 +2,7 @@ const path = require('path');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 const buildRoot = path.resolve(__dirname, "lib");
-const monacoEditorPath = '../node_modules/monaco-editor/dev/vs';
+const monacoEditorPath = '../node_modules/monaco-editor-core/dev/vs';
 
 module.exports = {
     entry: path.resolve(buildRoot, "main.js"),
diff --git a/package-lock.json b/package-lock.json
index e80f43390..bfe2bf5e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -82,10 +82,10 @@
         "brace-expansion": "1.1.8"
       }
     },
-    "monaco-editor": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.10.0.tgz",
-      "integrity": "sha1-ZgSTJYX+nB+ZPwAKUD0NIPvliWo="
+    "monaco-editor-core": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.10.1.tgz",
+      "integrity": "sha1-FRIdnijlHwlNnFVr+FLcnBPcQqE="
     },
     "once": {
       "version": "1.4.0",
diff --git a/package.json b/package.json
index 6aeebc9c7..14421a3df 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "glob-to-regexp": "^0.3.0",
-    "monaco-editor": "^0.10.0",
+    "monaco-editor-core": "^0.10.1",
     "vscode-base-languageclient": "^0.0.1-alpha.2"
   },
   "scripts": {
diff --git a/typings/glob-to-regexp/index.d.ts b/src/typings/glob-to-regexp/index.d.ts
similarity index 100%
rename from typings/glob-to-regexp/index.d.ts
rename to src/typings/glob-to-regexp/index.d.ts
diff --git a/typings/monaco/index.d.ts b/src/typings/monaco/index.d.ts
similarity index 96%
rename from typings/monaco/index.d.ts
rename to src/typings/monaco/index.d.ts
index 281e434ad..6c5184853 100644
--- a/typings/monaco/index.d.ts
+++ b/src/typings/monaco/index.d.ts
@@ -1,4 +1,4 @@
-/// <reference path='../../node_modules/monaco-editor/monaco.d.ts'/>
+/// <reference types='monaco-editor-core/monaco'/>
 
 declare module monaco.editor {
     export interface IStandaloneCodeEditor {
diff --git a/tsconfig.json b/tsconfig.json
index fac04caa5..92593f470 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,10 +19,5 @@
     },
     "include": [
         "src"
-    ],
-    "files": [
-        "node_modules/monaco-editor/monaco.d.ts",
-        "typings/monaco/index.d.ts",
-        "typings/glob-to-regexp/index.d.ts"
     ]
 }
\ No newline at end of file