diff --git a/.npmignore b/.npmignore
index 5b923b978..d0e70134f 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,9 +1,8 @@
 src/
-typings/
 coverage/
 .idea/
 tslint.json
-typings.json
 *.iml
 .editorconfig
 .jshintrc
+test/
diff --git a/gulpfile.js b/gulpfile.js
index 8886c6fed..31ac49c14 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,32 +15,10 @@ var tslint = require('gulp-tslint');
 var debug = require('gulp-debug');
 var rimraf = require('rimraf');
 
-var typeDefsPath = (function (typings) {
-    return typings.path || 'typings';
-})(require('./typings.json'));
-
 var tsFilesGlob = (function (c) {
     return c.filesGlob || c.files || '**/*.ts';
 })(require('./tsconfig.json'));
 
-gulp.task('gen_tsrefs', 'Generates the main.d.ts references file dynamically for all application *.ts files', function () {
-    var target = gulp.src(path.join('.', typeDefsPath, 'typings/main.d.ts'));
-    var sources = gulp.src([path.join('.', 'src', '**', '*.ts')], {read: false});
-    // sources.pipe(debug());
-    // target.pipe(debug());
-    var transformation = inject(sources, {
-        starttag: '//{',
-        endtag: '//}',
-        transform: function (filepath) {
-            console.log(filepath);
-            return '/// <reference path="..' + filepath + '" />';
-        }
-    });
-    return target
-        .pipe(transformation)
-        .pipe(gulp.dest(path.join('.', typeDefsPath)));
-});
-
 gulp.task('typings install', function(cb) {
     exec('typings install', function(err, stdout, stderr) {
         console.log(stdout);
@@ -63,7 +41,7 @@ gulp.task('tslint', 'Lints all TypeScript source files', function () {
         .pipe(tslint.report('verbose'));
 });
 
-gulp.task('tsBuild', 'Compiles all TypeScript source files and updates module references', gulpSequence('tslint', 'typings install', 'gen_tsrefs', '_build'));
+gulp.task('tsBuild', 'Compiles all TypeScript source files and updates module references', gulpSequence('tslint', 'typings install', '_build'));
 
 
 gulp.task('nsp', function (cb) {
diff --git a/index.js b/index.js
deleted file mode 100644
index ce9fe9cf4..000000000
--- a/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./lib/.');
diff --git a/package.json b/package.json
index 9756d7a3f..7892655b9 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,7 @@
     "name": "hazelcast-nodejs-client",
     "version": "0.1.0",
     "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS",
-    "main": "index.js",
-    "files": [
-        "lib"
-    ],
+    "main": "lib/index.js",
     "dependencies": {
         "long": "3.0.1",
         "q": "1.4.1"
@@ -54,5 +51,5 @@
         "url": "https://github.com/hazelcast/hazelcast-nodejs-client/issues"
     },
     "homepage": "https://github.com/hazelcast/hazelcast-nodejs-client#readme",
-    "typings": "./lib/index.d.ts"
+    "typings": "./lib/index"
 }