diff --git a/package.json b/package.json
index d7e05415..d249f690 100644
--- a/package.json
+++ b/package.json
@@ -34,16 +34,13 @@
     ],
     "main": "dist/index.js",
     "module": "dist/index.js",
-    "types": "dist/index.d.ts",
     "bin": {
         "openapi": "bin/index.js"
     },
     "files": [
         "bin/index.js",
         "dist/index.js",
-        "dist/index.d.ts",
         "dist/**/*.js",
-        "dist/**/*.d.ts",
         "src/templates/**/*.hbs",
         "src/templates/**/*.ts"
     ],
diff --git a/src/openApi/v2/interfaces/Extensions/WithEnumExtension.ts b/src/openApi/v2/interfaces/Extensions/WithEnumExtension.d.ts
similarity index 100%
rename from src/openApi/v2/interfaces/Extensions/WithEnumExtension.ts
rename to src/openApi/v2/interfaces/Extensions/WithEnumExtension.d.ts
diff --git a/src/openApi/v3/interfaces/Extensions/WithEnumExtension.ts b/src/openApi/v3/interfaces/Extensions/WithEnumExtension.d.ts
similarity index 100%
rename from src/openApi/v3/interfaces/Extensions/WithEnumExtension.ts
rename to src/openApi/v3/interfaces/Extensions/WithEnumExtension.d.ts
diff --git a/test/index.js b/test/index.js
index 60347e14..aae2374d 100644
--- a/test/index.js
+++ b/test/index.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const path = require('path');
 const ts = require('typescript');
 const OpenAPI = require('../dist');
@@ -18,6 +20,8 @@ function compile(dir) {
     compiler.emit();
 }
 
+console.time('generate');
+
 OpenAPI.generate({
     input: './test/mock/v2/spec.json',
     output: './test/result/v2/',
@@ -38,5 +42,7 @@ OpenAPI.generate({
     exportServices: true,
 });
 
+console.timeEnd('generate');
+
 compile('./test/result/v2/');
 compile('./test/result/v3/');
diff --git a/test/index.spec.js b/test/index.spec.js
index 318825de..ab237b7f 100644
--- a/test/index.spec.js
+++ b/test/index.spec.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const OpenAPI = require('../dist');
 const glob = require('glob');
 const fs = require('fs');
diff --git a/tsconfig.json b/tsconfig.json
index 6952baaf..37e94ab4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,13 +3,13 @@
 
     "compilerOptions": {
         "outDir": "./dist",
-        "target": "esnext",
-        "module": "commonjs",
+        "target": "es6",
+        "module": "es6",
         "moduleResolution": "node",
-        "lib": ["esnext", "dom"],
+        "lib": ["es6", "dom"],
         "types": ["node", "jest"],
         "typeRoots": ["node_modules/@types"],
-        "declaration": true,
+        "declaration": false,
         "declarationMap": false,
         "sourceMap": false,
         "noImplicitReturns": true,
@@ -20,7 +20,7 @@
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "importHelpers": false,
-        "removeComments": false,
+        "removeComments": true,
         "forceConsistentCasingInFileNames": true
     },