diff --git a/statusbar-sample/tsconfig.json b/statusbar-sample/tsconfig.json
index 11282c9a..c79b0fa0 100644
--- a/statusbar-sample/tsconfig.json
+++ b/statusbar-sample/tsconfig.json
@@ -1,16 +1,15 @@
 {
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "outDir": "out",
-        "lib": [
-            "es6"
-        ],
-        "sourceMap": true,
-        "rootDir": "."
-    },
-    "exclude": [
-        "node_modules",
-        ".vscode-test"
-    ]
-}
\ No newline at end of file
+	"compilerOptions": {
+		"module": "commonjs",
+		"target": "es5",
+		"outDir": "out",
+		"lib": [
+			"es6"
+		],
+		"sourceMap": true,
+		"rootDir": "src"
+	},
+	"exclude": [
+		"node_modules"
+	]
+}
diff --git a/terminal-example/package.json b/terminal-example/package.json
index 568ade6f..272e0b40 100644
--- a/terminal-example/package.json
+++ b/terminal-example/package.json
@@ -1,61 +1,73 @@
 {
-    "name": "vscode-terminal-api-example",
-    "displayName": "vscode-terminal-api-example",
-    "description": "abc",
-    "version": "0.0.1",
-    "publisher": "Tyriar",
-    "engines": {
-        "vscode": "^1.5.0"
-    },
-    "categories": [
-        "Other"
-    ],
-    "activationEvents": [
-        "onCommand:terminalTest.createTerminal",
-        "onCommand:terminalTest.createAndSend",
-        "onCommand:terminalTest.createZshLoginShell"
-    ],
-    "main": "./out/src/extension",
-    "contributes": {
-        "commands": [{
-            "command": "terminalTest.createTerminal",
-            "title": "Terminal API: Create Terminal"
-        }, {
-            "command": "terminalTest.hide",
-            "title": "Terminal API: Hide"
-        }, {
-            "command": "terminalTest.show",
-            "title": "Terminal API: Show"
-        }, {
-            "command": "terminalTest.showPreserveFocus",
-            "title": "Terminal API: Show (preserving focus)"
-        }, {
-            "command": "terminalTest.sendText",
-            "title": "Terminal API: Send Text"
-        }, {
-            "command": "terminalTest.sendTextNoNewLine",
-            "title": "Terminal API: Send Text (no implied \\n)"
-        }, {
-            "command": "terminalTest.dispose",
-            "title": "Terminal API: Dispose"
-        }, {
-            "command": "terminalTest.createAndSend",
-            "title": "Terminal API: Create Terminal and Immediately Send"
-        }, {
-            "command": "terminalTest.createZshLoginShell",
-            "title": "Terminal API: Create Terminal (zsh login shell) [v1.6+]"
-        }, {
-            "command": "terminalTest.processId",
-            "title": "Terminal API: Write process ID to console [v1.6+]"
-        }]
-    },
-    "scripts": {
-        "vscode:prepublish": "node ./node_modules/vscode/bin/compile",
-        "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
-        "postinstall": "node ./node_modules/vscode/bin/install"
-    },
-    "devDependencies": {
-        "typescript": "^1.8.5",
-        "vscode": "^0.11.0"
-    }
-}
\ No newline at end of file
+	"name": "vscode-terminal-api-example",
+	"displayName": "vscode-terminal-api-example",
+	"description": "abc",
+	"version": "0.0.1",
+	"publisher": "Tyriar",
+	"engines": {
+		"vscode": "^1.5.0"
+	},
+	"categories": [
+		"Other"
+	],
+	"activationEvents": [
+		"onCommand:terminalTest.createTerminal",
+		"onCommand:terminalTest.createAndSend",
+		"onCommand:terminalTest.createZshLoginShell"
+	],
+	"main": "./out/src/extension",
+	"contributes": {
+		"commands": [
+			{
+				"command": "terminalTest.createTerminal",
+				"title": "Terminal API: Create Terminal"
+			},
+			{
+				"command": "terminalTest.hide",
+				"title": "Terminal API: Hide"
+			},
+			{
+				"command": "terminalTest.show",
+				"title": "Terminal API: Show"
+			},
+			{
+				"command": "terminalTest.showPreserveFocus",
+				"title": "Terminal API: Show (preserving focus)"
+			},
+			{
+				"command": "terminalTest.sendText",
+				"title": "Terminal API: Send Text"
+			},
+			{
+				"command": "terminalTest.sendTextNoNewLine",
+				"title": "Terminal API: Send Text (no implied \\n)"
+			},
+			{
+				"command": "terminalTest.dispose",
+				"title": "Terminal API: Dispose"
+			},
+			{
+				"command": "terminalTest.createAndSend",
+				"title": "Terminal API: Create Terminal and Immediately Send"
+			},
+			{
+				"command": "terminalTest.createZshLoginShell",
+				"title": "Terminal API: Create Terminal (zsh login shell) [v1.6+]"
+			},
+			{
+				"command": "terminalTest.processId",
+				"title": "Terminal API: Write process ID to console [v1.6+]"
+			}
+		]
+	},
+	"scripts": {
+		"vscode:prepublish": "node ./node_modules/vscode/bin/compile",
+		"compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
+		"postinstall": "node ./node_modules/vscode/bin/install"
+	},
+	"devDependencies": {
+		"typescript": "^1.8.5",
+		"vscode": "^1.0.0",
+		"@types/node": "*"
+	}
+}
diff --git a/terminal-example/tsconfig.json b/terminal-example/tsconfig.json
index eea16221..724656a5 100644
--- a/terminal-example/tsconfig.json
+++ b/terminal-example/tsconfig.json
@@ -3,12 +3,13 @@
         "module": "commonjs",
         "target": "es5",
         "outDir": "out",
-        "noLib": true,
+        "lib": [
+            "es6"
+        ],
         "sourceMap": true,
-        "rootDir": "."
+        "rootDir": "src"
     },
     "exclude": [
-        "node_modules",
-        ".vscode-test"
+        "node_modules"
     ]
-}
\ No newline at end of file
+}
diff --git a/terminal-example/typings/node.d.ts b/terminal-example/typings/node.d.ts
deleted file mode 100644
index 5ed7730b..00000000
--- a/terminal-example/typings/node.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference path="../node_modules/vscode/typings/node.d.ts" />
\ No newline at end of file
diff --git a/terminal-example/typings/vscode-typings.d.ts b/terminal-example/typings/vscode-typings.d.ts
deleted file mode 100644
index 5590dc8c..00000000
--- a/terminal-example/typings/vscode-typings.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference path="../node_modules/vscode/typings/index.d.ts" />