diff --git a/demo/components/file-upload-section.ts b/demo/components/file-upload-section.ts
index 7ccdcfd..e508e97 100644
--- a/demo/components/file-upload-section.ts
+++ b/demo/components/file-upload-section.ts
@@ -2,7 +2,7 @@
 
 import {Component, View, CORE_DIRECTIVES} from 'angular2/angular2';
 
-import {tabs} from 'ng2-bootstrap';
+import {tabs} from 'ng2-bootstrap/ng2-bootstrap';
 import {SimpleDemo} from './file-upload/simple-demo';
 
 let name = 'File Upload';
@@ -76,7 +76,7 @@ tabDesc.forEach(desc => {
 export class FileUploadSection {
   private currentHeading:string = 'Simple';
 
-  private select(e) {
+  private select(e:any) {
     if (e.heading) {
       this.currentHeading = e.heading;
     }
diff --git a/demo/components/file-upload/simple-demo.ts b/demo/components/file-upload/simple-demo.ts
index 73fb439..7ce10a3 100644
--- a/demo/components/file-upload/simple-demo.ts
+++ b/demo/components/file-upload/simple-demo.ts
@@ -5,7 +5,9 @@ import {
   CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle
 } from 'angular2/angular2';
 
-import {FileSelect, FileDrop, FileUploader} from '../../../components/index';
+import {FileSelect} from '../../../components/file-upload/file-select';
+import {FileDrop} from '../../../components/file-upload/file-drop';
+import {FileUploader} from '../../../components/file-upload/file-uploader';
 
 // webpack html imports
 let template = require('./simple-demo.html');
diff --git a/package.json b/package.json
index eb52b3f..d54b5ca 100644
--- a/package.json
+++ b/package.json
@@ -28,27 +28,27 @@
     "url": "https://github.com/valor-software/ng2-file-upload/issues"
   },
   "homepage": "https://github.com/valor-software/ng2-file-upload#readme",
-  "peerDependencies": {
+  "dependencies": {
     "angular2": "2.0.0-alpha.46",
-    "ng2-bootstrap": "0.46.0",
     "reflect-metadata": "0.1.2",
     "@reactivex/rxjs": "5.0.0-alpha.7",
     "zone.js": "0.5.8"
   },
   "devDependencies": {
-    "bootstrap": "3.3.5",
-    "clean-webpack-plugin": "0.1.3",
+    "bootstrap": "3.3.6",
+    "ng2-bootstrap": "0.46.0",
+    "clean-webpack-plugin": "0.1.4",
     "compression-webpack-plugin": "0.2.0",
-    "eslint": "1.7.2",
+    "eslint": "1.10.3",
     "exports-loader": "0.6.2",
-    "file-loader": "0.8.4",
+    "file-loader": "0.8.5",
     "gulp": "3.9.0",
     "gulp-clean": "0.3.1",
-    "gulp-eslint": "1.0.0",
+    "gulp-eslint": "1.1.1",
     "gulp-size": "2.0.0",
-    "gulp-tsc": "1.1.1",
-    "gulp-tslint": "3.3.1",
-    "html-loader": "0.3.0",
+    "gulp-tsc": "1.1.4",
+    "gulp-tslint": "4.1.0",
+    "html-loader": "0.4.0",
     "markdown-loader": "0.1.7",
     "marked": "0.3.5",
     "moment": "2.10.6",
@@ -57,10 +57,10 @@
     "prismjs-loader": "0.0.2",
     "raw-loader": "0.5.1",
     "require-dir": "0.3.0",
-    "typescript": "1.6.2",
-    "ts-loader": "0.5.6",
-    "webpack": "1.12.2",
-    "webpack-dev-server": "1.12.1"
+    "typescript": "1.7.3",
+    "ts-loader": "0.7.2",
+    "webpack": "1.12.9",
+    "webpack-dev-server": "1.14.0"
   },
   "contributors": [
     {
diff --git a/webpack.config.js b/webpack.config.js
index 6b64ce5..5abad7c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -53,7 +53,7 @@ var config = {
       'angular2/angular2',
       'angular2/core'
     ],
-    'angular2-file-upload': ['components'],
+    'angular2-file-upload': ['ng2-file-upload'],
     'angular2-file-upload-demo': 'demo'
   },
 
@@ -126,8 +126,7 @@ var config = {
           /\.spec\.ts$/,
           /\.e2e\.ts$/,
           /web_modules/,
-          /test/,
-          /node_modules/
+          /test/
         ]
       }
     ],