diff --git a/index.ts b/index.ts
new file mode 100644
index 00000000..9bdf81e0
--- /dev/null
+++ b/index.ts
@@ -0,0 +1,5 @@
+export * from './src/directives/ng-file-drop';
+export * from './src/directives/ng-file-select';
+export * from './src/services/ng2-uploader';
+
+export { Ng2UploaderModule } from './src/module/ng2-uploader.module';
\ No newline at end of file
diff --git a/ng2-uploader.ts b/ng2-uploader.ts
index 9bdf81e0..ea465c2a 100644
--- a/ng2-uploader.ts
+++ b/ng2-uploader.ts
@@ -1,5 +1 @@
-export * from './src/directives/ng-file-drop';
-export * from './src/directives/ng-file-select';
-export * from './src/services/ng2-uploader';
-
-export { Ng2UploaderModule } from './src/module/ng2-uploader.module';
\ No newline at end of file
+export * from './index';
diff --git a/package.json b/package.json
index 449fa6a9..f2a10ca1 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,16 @@
 {
   "name": "ng2-uploader",
   "description": "Angular2 File Uploader",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "license": "MIT",
-  "main": "ng2-uploader.js",
-  "typings": "ng2-uploader.d.ts",
+  "main": "index.js",
+  "typings": "index.d.ts",
   "author": "Jan Kuri <jkuri88@gmail.com>",
   "scripts": {
     "clean": "./scripts/clean.sh",
-    "dev": "ngc --watch",
-    "prepublish": "./node_modules/.bin/ngc -p tsconfig.json"
+    "dev": "tsc --watch",
+    "build": "./node_modules/.bin/ngc -p tsconfig.json",
+    "prepublish": "npm run build"
   },
   "repository": {
     "type": "git",
diff --git a/tsconfig.json b/tsconfig.json
index a4f555b7..072af121 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "module": "es2015",
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
@@ -26,6 +25,7 @@
     "dist"
   ],
   "files": [
+    "index.ts",
     "ng2-uploader.ts"
   ],
   "angularCompilerOptions": {