diff --git a/.nvmrc b/.nvmrc
index a2f28f4..486db33 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-8.4.0
+8.9.1
diff --git a/README.md b/README.md
index 8341688..7f55bec 100644
--- a/README.md
+++ b/README.md
@@ -60,8 +60,8 @@ $ yarn add @hapiness/core @hapiness/swag rxjs
     
 ```javascript
 "dependencies": {
-    "@hapiness/core": "^1.1.1",
-    "@hapiness/swag": "^1.0.0",
+    "@hapiness/core": "^1.2.2",
+    "@hapiness/swag": "^1.1.0",
     //...
 }
 //...
@@ -80,7 +80,8 @@ import { SwagModule } from '@hapiness/swag';
         'hapi-swagger': {
             'x-custom-values': {
               'scope': 'todo.read',
-            }
+            },
+            'x-toto': 'tata'
         }
     },
     description: 'Get todo',
@@ -140,6 +141,10 @@ To set up your development environment:
 
 ## Change History
 
+* v1.1.0 (2017-11-20)
+    * Latest packages' versions.
+    * Documentation.
+    * Change packaging process.
 * v1.0.0 (2017-10-27)
     * Add possibility to have `x-*` as values
     * Documentation
diff --git a/package-lock.json b/package-lock.json
index 0a11299..b562a31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,22 +1,23 @@
 {
     "name": "@hapiness/swag",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
         "@hapiness/core": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@hapiness/core/-/core-1.1.1.tgz",
-            "integrity": "sha512-zuYlf9AYtkBPwZRBE7PNBv09r76itqJGpRbTxPSynQgL52RWAjDjpzJcxSLSYXi6MiCLIefFbe/b7vsbIqlsDg==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/@hapiness/core/-/core-1.2.2.tgz",
+            "integrity": "sha512-qMkka72goycKY+JT2X0rbktvfS6aY3plS+c/YifncDBSPFNjSnHYsLN7+kvgrtzCTpiAjh8qT5xGqdcFDMuHCw==",
             "dev": true,
             "requires": {
-                "@types/hapi": "16.1.10",
+                "@types/hapi": "16.1.11",
                 "@types/hoek": "4.1.3",
-                "@types/joi": "10.4.4",
-                "@types/node": "8.0.47",
+                "@types/joi": "13.0.0",
+                "@types/node": "8.0.53",
                 "@types/websocket": "0.0.34",
                 "debug": "3.1.0",
                 "hapi": "16.6.2",
+                "injection-js": "2.2.1",
                 "reflect-metadata": "0.1.10",
                 "websocket": "1.0.25"
             }
@@ -27,7 +28,7 @@
             "integrity": "sha512-QoYnjN7H/GGrjvsj0/owTo0xx3WTjPIBrcWsjroBouicL8PRMBGIIArqqYrVDny2GQT2z45unctcNHxP+dsSJA==",
             "requires": {
                 "boom": "5.2.0",
-                "fast-safe-stringify": "1.2.0",
+                "fast-safe-stringify": "1.2.1",
                 "handlebars": "4.0.11",
                 "hoek": "4.2.0",
                 "http-status": "1.0.1",
@@ -37,40 +38,40 @@
             }
         },
         "@types/boom": {
-            "version": "4.3.7",
-            "resolved": "https://registry.npmjs.org/@types/boom/-/boom-4.3.7.tgz",
-            "integrity": "sha512-z6CT5iHAtBUib2JQwwiGVKHESAk5Elfwn0HFlpLC4rwpTtgCa1P5OCFzfCmF3vSpgYoZKm+3fh6sgFWJwwb8fw==",
+            "version": "4.3.8",
+            "resolved": "https://registry.npmjs.org/@types/boom/-/boom-4.3.8.tgz",
+            "integrity": "sha512-YACq3sVU3MIYXBEdqrRvQvSVgAHNyYdmrbWnEfrftmZXFcdQ1tY9Lv8AHqwdvYceblgRou++zhzUkJ3YOlWPSg==",
             "dev": true
         },
         "@types/catbox": {
-            "version": "7.1.3",
-            "resolved": "https://registry.npmjs.org/@types/catbox/-/catbox-7.1.3.tgz",
-            "integrity": "sha512-gpCXh6swH1/hUuWuozT70FJNgDj9Z0LV6P5sDW7/LPONolPiQYpq+XueImVQ9jyKips4k+Vi3Z7ooeHf8B8/qA==",
+            "version": "7.1.4",
+            "resolved": "https://registry.npmjs.org/@types/catbox/-/catbox-7.1.4.tgz",
+            "integrity": "sha512-0WHI0dG3QLPpRdA0hMNClTgyAOgFvN47/wtM/HnQ/zGds8FbWhjWqMUWotY7l5vjT0pjvzPAv8plSGTwPA6teQ==",
             "dev": true,
             "requires": {
-                "@types/boom": "4.3.7"
+                "@types/boom": "4.3.8"
             }
         },
         "@types/fs-extra": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.3.tgz",
-            "integrity": "sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg==",
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-4.0.5.tgz",
+            "integrity": "sha512-tIG0GpHum5IFb8Qze/cSv0w/0gNzHB+MUDftTQaxenx46z50g51/MPkNLssLz9+uZLzCDd35bT9qtWOTXZ21Gw==",
             "dev": true,
             "requires": {
-                "@types/node": "8.0.47"
+                "@types/node": "8.0.53"
             }
         },
         "@types/hapi": {
-            "version": "16.1.10",
-            "resolved": "https://registry.npmjs.org/@types/hapi/-/hapi-16.1.10.tgz",
-            "integrity": "sha512-BjFssIA6JCQreM9ZTQqGyfg/095FJIYlbktUXO6dAArrtCKpEzsNDyjzsfwZscSYzMDh/bgLV2L0ZFhc9gfdEQ==",
+            "version": "16.1.11",
+            "resolved": "https://registry.npmjs.org/@types/hapi/-/hapi-16.1.11.tgz",
+            "integrity": "sha512-2KU+sErWdRt2sTI82Ql1R3GJKReay9z7iSgeIPPKfY+9hbSRETQyHKVQ/8cFKHK5nU4KmDGg29CIVo+OsGUQjw==",
             "dev": true,
             "requires": {
-                "@types/boom": "4.3.7",
-                "@types/catbox": "7.1.3",
-                "@types/joi": "10.4.4",
+                "@types/boom": "4.3.8",
+                "@types/catbox": "7.1.4",
+                "@types/joi": "13.0.0",
                 "@types/mimos": "3.0.1",
-                "@types/node": "8.0.47",
+                "@types/node": "8.0.53",
                 "@types/podium": "1.0.0",
                 "@types/shot": "3.4.0"
             }
@@ -82,9 +83,9 @@
             "dev": true
         },
         "@types/joi": {
-            "version": "10.4.4",
-            "resolved": "https://registry.npmjs.org/@types/joi/-/joi-10.4.4.tgz",
-            "integrity": "sha512-0yKwgwcM06oGasfRIL0pq8lsa93D4HQzOlABkPlfPDjV3F3zC36ormJfbRg1jFcAkrRENVGeNiFtotym8zn+PA==",
+            "version": "13.0.0",
+            "resolved": "https://registry.npmjs.org/@types/joi/-/joi-13.0.0.tgz",
+            "integrity": "sha512-NME7RLjZDfOM9Ns7zAqRFcTQTNmi3Yg8cCfSAMOSGGlEii0Hyo6wQ8X8gYaytYAcjyRCuEBjG7NDC/yyLr5f5w==",
             "dev": true
         },
         "@types/mime-db": {
@@ -103,9 +104,9 @@
             }
         },
         "@types/node": {
-            "version": "8.0.47",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.47.tgz",
-            "integrity": "sha512-kOwL746WVvt/9Phf6/JgX/bsGQvbrK5iUgzyfwZNcKVFcjAUVSpF9HxevLTld2SG9aywYHOILj38arDdY1r/iQ=="
+            "version": "8.0.53",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.53.tgz",
+            "integrity": "sha512-54Dm6NwYeiSQmRB1BLXKr5GELi0wFapR1npi8bnZhEcu84d/yQKqnwwXQ56hZ0RUbTG6L5nqDZaN3dgByQXQRQ=="
         },
         "@types/podium": {
             "version": "1.0.0",
@@ -119,7 +120,7 @@
             "integrity": "sha1-RZR3xRh9Pr0wNmCrCZ5+ng87ZW8=",
             "dev": true,
             "requires": {
-                "@types/node": "8.0.47"
+                "@types/node": "8.0.53"
             }
         },
         "@types/websocket": {
@@ -128,7 +129,7 @@
             "integrity": "sha512-cvN32rSoC4aXpXHG2Gf8/f8/gtyA7PmE38E3ENsMymFPgoG8xD/kH/KAVhTINCZTPqmgaWN86c1MitMEsuHjnQ==",
             "dev": true,
             "requires": {
-                "@types/node": "8.0.47"
+                "@types/node": "8.0.53"
             }
         },
         "abbrev": {
@@ -546,9 +547,9 @@
             "dev": true
         },
         "color-convert": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-            "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+            "version": "1.9.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
+            "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
             "dev": true,
             "requires": {
                 "color-name": "1.1.3"
@@ -772,9 +773,9 @@
             "dev": true
         },
         "fast-safe-stringify": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.0.tgz",
-            "integrity": "sha1-69QmZv0Y/k8rpPDSlQZfP4XK3pY="
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.1.tgz",
+            "integrity": "sha512-g2UqeO0yyYjTSpiH4zJQk+IycRxyYRABjSf+TpmeMOn9uByzFIoX0y/HnweCFhKb+uuPwjIvqXuK/LTteEBhow=="
         },
         "fileset": {
             "version": "2.0.3",
@@ -1121,6 +1122,12 @@
             "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
             "dev": true
         },
+        "injection-js": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.2.1.tgz",
+            "integrity": "sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==",
+            "dev": true
+        },
         "invariant": {
             "version": "2.2.2",
             "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
@@ -1253,7 +1260,7 @@
             "integrity": "sha512-oFCwXvd65amgaPCzqrR+a2XjanS1MvpXN6l/MlMUTv6uiA1NOgGX+I0uyq8Lg3GDxsxPsaP1049krz3hIJ5+KA==",
             "dev": true,
             "requires": {
-                "async": "2.5.0",
+                "async": "2.6.0",
                 "fileset": "2.0.3",
                 "istanbul-lib-coverage": "1.1.1",
                 "istanbul-lib-hook": "1.1.0",
@@ -1267,9 +1274,9 @@
             },
             "dependencies": {
                 "async": {
-                    "version": "2.5.0",
-                    "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-                    "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+                    "version": "2.6.0",
+                    "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
+                    "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
                     "dev": true,
                     "requires": {
                         "lodash": "4.17.4"
@@ -1420,7 +1427,7 @@
                 "es6-promise": "4.1.1",
                 "js-yaml": "3.10.0",
                 "ono": "4.0.2",
-                "z-schema": "3.18.4"
+                "z-schema": "3.19.0"
             }
         },
         "json-schema-traverse": {
@@ -1738,9 +1745,9 @@
             }
         },
         "nan": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-            "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
+            "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
             "dev": true
         },
         "nigel": {
@@ -2487,9 +2494,9 @@
             "dev": true
         },
         "swagger-methods": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/swagger-methods/-/swagger-methods-1.0.0.tgz",
-            "integrity": "sha1-s5x3lX0wWmU1wKHgFQgRhbmdYfw="
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/swagger-methods/-/swagger-methods-1.0.4.tgz",
+            "integrity": "sha512-xrKFLbrZ6VxRsg+M3uJozJtsEpNI/aPfZsOkoEjXw8vhAqdMIqwTYGj1f4dmUgvJvCdZhV5iArgtqXgs403ltg=="
         },
         "swagger-parser": {
             "version": "3.4.2",
@@ -2501,9 +2508,9 @@
                 "es6-promise": "4.1.1",
                 "json-schema-ref-parser": "1.4.1",
                 "ono": "4.0.2",
-                "swagger-methods": "1.0.0",
+                "swagger-methods": "1.0.4",
                 "swagger-schema-official": "2.0.0-bab6bed",
-                "z-schema": "3.18.4"
+                "z-schema": "3.19.0"
             },
             "dependencies": {
                 "json-schema-ref-parser": {
@@ -2612,7 +2619,7 @@
                     "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
                     "dev": true,
                     "requires": {
-                        "color-convert": "1.9.0"
+                        "color-convert": "1.9.1"
                     }
                 },
                 "chalk": {
@@ -2689,7 +2696,7 @@
                 "resolve": "1.5.0",
                 "semver": "5.4.1",
                 "tslib": "1.8.0",
-                "tsutils": "2.12.1"
+                "tsutils": "2.12.2"
             },
             "dependencies": {
                 "ansi-styles": {
@@ -2698,7 +2705,7 @@
                     "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
                     "dev": true,
                     "requires": {
-                        "color-convert": "1.9.0"
+                        "color-convert": "1.9.1"
                     }
                 },
                 "chalk": {
@@ -2730,9 +2737,9 @@
             }
         },
         "tsutils": {
-            "version": "2.12.1",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.1.tgz",
-            "integrity": "sha1-9Nlc4zkciXHkblTEzw7bCiHdWyQ=",
+            "version": "2.12.2",
+            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz",
+            "integrity": "sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M=",
             "dev": true,
             "requires": {
                 "tslib": "1.8.0"
@@ -2764,9 +2771,9 @@
             }
         },
         "typescript": {
-            "version": "2.5.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
-            "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz",
+            "integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=",
             "dev": true
         },
         "uglify-js": {
@@ -2866,9 +2873,9 @@
             }
         },
         "validator": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz",
-            "integrity": "sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA=="
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/validator/-/validator-9.1.1.tgz",
+            "integrity": "sha512-1TGGX1GKilfmcEa9rm+9nI9AqIUQK8oj4jZI0DmTGLTPM5jmowBBhyBIHCks73+P1QPZk2i6oOYUq583uOetHQ=="
         },
         "verror": {
             "version": "1.10.0",
@@ -2934,7 +2941,7 @@
             "dev": true,
             "requires": {
                 "debug": "2.6.9",
-                "nan": "2.7.0",
+                "nan": "2.8.0",
                 "typedarray-to-buffer": "3.1.2",
                 "yaeti": "0.0.6"
             },
@@ -3055,14 +3062,14 @@
             "dev": true
         },
         "z-schema": {
-            "version": "3.18.4",
-            "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.18.4.tgz",
-            "integrity": "sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==",
+            "version": "3.19.0",
+            "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.19.0.tgz",
+            "integrity": "sha512-V94f3ODuluBS4kQLLjNhwoMek0dyIXCsvNu/A17dAyJ6sMhT5KkJQwSn07R0naByLIXJWMDk+ruMfI/3G3hS4Q==",
             "requires": {
                 "commander": "2.11.0",
                 "lodash.get": "4.4.2",
                 "lodash.isequal": "4.5.0",
-                "validator": "8.2.0"
+                "validator": "9.1.1"
             }
         }
     }
diff --git a/package.json b/package.json
index 0486bf4..b4d3e15 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
     "name": "@hapiness/swag",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "description": "Generate swag documentation for Hapiness' components",
-    "main": "index.js",
+    "main": "commonjs/index.js",
     "types": "index.d.ts",
     "private": false,
     "scripts": {
@@ -72,14 +72,14 @@
     "homepage": "https://github.com/hapinessjs/swag-module#readme",
     "dependencies": {
         "@reptilbud/hapi-swagger": "^2.0.0",
-        "@types/node": "^8.0.47",
+        "@types/node": "^8.0.53",
         "debug": "^3.1.0",
         "inert": "^4.2.1",
         "vision": "^4.1.1"
     },
     "devDependencies": {
-        "@hapiness/core": "^1.1.1",
-        "@types/fs-extra": "^4.0.3",
+        "@hapiness/core": "^1.2.2",
+        "@types/fs-extra": "^4.0.5",
         "coveralls": "^3.0.0",
         "fs-extra": "^4.0.2",
         "istanbul": "^1.1.0-alpha.1",
@@ -89,11 +89,11 @@
         "rxjs": "^5.5.2",
         "ts-node": "^3.3.0",
         "tslint": "^5.8.0",
-        "typescript": "^2.5.3",
+        "typescript": "^2.6.1",
         "unit.js": "^2.0.0"
     },
     "peerDependencies": {
-        "@hapiness/core": "^1.1.1",
+        "@hapiness/core": "^1.2.2",
         "rxjs": "^5.5.2"
     },
     "engines": {
diff --git a/src/module/swag.module.ts b/src/module/swag.module.ts
index 22bd436..3252509 100644
--- a/src/module/swag.module.ts
+++ b/src/module/swag.module.ts
@@ -16,7 +16,7 @@ import {
 const SWAG_MODULE_CONFIG = new InjectionToken('swag_module_config');
 
 @HapinessModule({
-    version: '1.0.0'
+    version: '1.1.0'
 })
 export class SwagModule implements OnRegister {
 
diff --git a/tools/files.json b/tools/files.json
index df131bf..841ca5a 100644
--- a/tools/files.json
+++ b/tools/files.json
@@ -1,10 +1,5 @@
 [
     { "name":"README.md" },
     { "name":"LICENSE.md" },
-    { "name":"package.json" },
-    { "name":"src" },
-    { "name":"index.js", "remove":true },
-    { "name":"index.js.map", "remove":true },
-    { "name":"index.d.ts", "remove":true },
-    { "name":"module", "remove":true }
+    { "name":"package.json" }
 ]
\ No newline at end of file
diff --git a/tools/packaging.ts b/tools/packaging.ts
index ac657d5..e76daab 100644
--- a/tools/packaging.ts
+++ b/tools/packaging.ts
@@ -9,8 +9,6 @@ import * as fs from 'fs-extra';
  */
 interface FileObject {
     name: string;
-    remove?: boolean;
-    externals?: boolean;
 }
 
 /**
@@ -41,11 +39,10 @@ class Packaging {
      * Function to copy one file
      *
      * @param file {string}
-     * @param externals {boolean}
      *
-     * @return {Observable<R>}
+     * @return {Observable<any>}
      */
-    private _copy(file: string, externals?: boolean): Observable<any> {
+    private _copy(file: string): Observable<any> {
         // copy package.json
         if (file.indexOf('package.json') !== -1) {
             return this._copyAndCleanupPackageJson(file);
@@ -53,16 +50,12 @@ class Packaging {
 
         // copy other files
         return <Observable<any>> Observable.create((observer) => {
-            let fileDest = file;
-            if (externals && file.indexOf('src/') !== -1) {
-                fileDest = file.split('src/').pop();
-            }
             fs.stat(`${this._srcPath}${file}`, (error, stats) => {
                 if (error) {
                     console.error('doesn\'t exist on copy =>', error.message);
                 }
                 if (stats && (stats.isFile() || stats.isDirectory())) {
-                    fs.copy(`${this._srcPath}${file}`, `${this._destPath}${fileDest}`, (err) => {
+                    fs.copy(`${this._srcPath}${file}`, `${this._destPath}${file}`, (err) => {
                         if (err) {
                             console.error('copy failed =>', err.message);
                         }
@@ -78,52 +71,12 @@ class Packaging {
         });
     }
 
-    /**
-     * Function to remove original file
-     *
-     * @param file {string}
-     * @param remove {boolean}
-     *
-     * @return {Observable<any>}
-     *
-     * @private
-     */
-    private _remove(file: string, remove?: boolean): Observable<any> {
-        // remove original files
-        return <Observable<any>> Observable.create((observer) => {
-            if (remove) {
-                fs.stat(`${this._srcPath}${file}`, (error, stats) => {
-                    if (error) {
-                        console.error('doesn\'t exist on remove =>', error.message);
-                    }
-
-                    if (stats && (stats.isFile() || stats.isDirectory())) {
-                        fs.remove(`${this._srcPath}${file}`, (err) => {
-                            if (err) {
-                                console.error('remove failed =>', err.message);
-                            }
-
-                            observer.next();
-                            observer.complete();
-                        });
-                    } else {
-                        observer.next();
-                        observer.complete();
-                    }
-                });
-            } else {
-                observer.next();
-                observer.complete();
-            }
-        });
-    }
-
     /**
      * Function to cleanup package.json and _copy it to dist directory
      *
      * @param file {string}
      *
-     * @return {Observable<R>}
+     * @return {Observable<any>}
      *
      * @private
      */
@@ -171,8 +124,12 @@ class Packaging {
      * Function that _copy all files in dist directory
      */
     process() {
-        Observable.forkJoin(this._files.map((fileObject: FileObject) => this._copy(fileObject.name, fileObject.externals)
-            .flatMap(_ => this._remove(fileObject.name, fileObject.remove)))).subscribe(null, error => console.error(error));
+        Observable.forkJoin(
+            this._files.map(
+                (fileObject: FileObject) => this._copy(fileObject.name)
+            )
+        )
+            .subscribe(null, error => console.error(error));
     }
 }
 
diff --git a/tsconfig.build.json b/tsconfig.build.json
index 7d02fdc..ae2206e 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -1,9 +1,9 @@
 {
     "extends": "./tsconfig.json",
     "compilerOptions": {
-        "module": "commonjs",
-        "outDir": ".",
+        "outDir": "./dist/commonjs",
         "rootDir": "./src",
+        "declarationDir": "./dist",
         "types": [
             "node"
         ]
diff --git a/tsconfig.json b/tsconfig.json
index c90f385..926ce0b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,12 @@
 {
     "compilerOptions": {
         "target": "es2015",
-        "module": "umd",
+        "module": "commonjs",
         "moduleResolution": "node",
         "declaration": true,
         "noImplicitAny": false,
         "sourceMap": true,
+        "inlineSources": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "outDir": "./tmp",
diff --git a/yarn.lock b/yarn.lock
index b544101..b5a12ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,17 +2,18 @@
 # yarn lockfile v1
 
 
-"@hapiness/core@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@hapiness/core/-/core-1.1.1.tgz#6657e29bf7a8cdcba04912c62da26b8a6e8b6221"
+"@hapiness/core@^1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@hapiness/core/-/core-1.2.2.tgz#3fbc377aacdafa43be871485e983707b75e72155"
   dependencies:
-    "@types/hapi" "^16.1.10"
+    "@types/hapi" "^16.1.11"
     "@types/hoek" "^4.1.3"
-    "@types/joi" "^10.4.4"
-    "@types/node" "^8.0.46"
+    "@types/joi" "^13.0.0"
+    "@types/node" "^8.0.53"
     "@types/websocket" "^0.0.34"
     debug "^3.1.0"
     hapi "^16.6.2"
+    injection-js "^2.2.0"
     reflect-metadata "^0.1.10"
     websocket "^1.0.25"
 
@@ -30,24 +31,24 @@
     swagger-parser "^3.4.2"
 
 "@types/boom@*":
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/@types/boom/-/boom-4.3.7.tgz#2771d7b1fd7df70c6860ed30ec6752feaca9f3de"
+  version "4.3.8"
+  resolved "https://registry.yarnpkg.com/@types/boom/-/boom-4.3.8.tgz#73acac4aa33d78b030a7797f4a74b4dfb058d418"
 
 "@types/catbox@*":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/catbox/-/catbox-7.1.3.tgz#895ee7d335fda7e5af688b21e8b9b5e84e30dd39"
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@types/catbox/-/catbox-7.1.4.tgz#03f6a1631d698b6f0fed7edbd0c690f8600904bc"
   dependencies:
     "@types/boom" "*"
 
-"@types/fs-extra@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.3.tgz#87343b1ab99415b61817ac894ed622355a0ebf67"
+"@types/fs-extra@^4.0.5":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.5.tgz#8aa6033c0e87c653b09a6711686916864b48ec9e"
   dependencies:
     "@types/node" "*"
 
-"@types/hapi@^16.1.10":
-  version "16.1.10"
-  resolved "https://registry.yarnpkg.com/@types/hapi/-/hapi-16.1.10.tgz#7fab660b199aeebc5f5393b4aeb1b6e926162734"
+"@types/hapi@^16.1.11":
+  version "16.1.11"
+  resolved "https://registry.yarnpkg.com/@types/hapi/-/hapi-16.1.11.tgz#a9b8fe6eee2f8cefb94f4f447d3c23a2b2c308cf"
   dependencies:
     "@types/boom" "*"
     "@types/catbox" "*"
@@ -61,9 +62,9 @@
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/@types/hoek/-/hoek-4.1.3.tgz#d1982d48fb0d2a0e5d7e9d91838264d8e428d337"
 
-"@types/joi@*", "@types/joi@^10.4.4":
-  version "10.4.4"
-  resolved "https://registry.yarnpkg.com/@types/joi/-/joi-10.4.4.tgz#f437d223269ea46ce3313e32bc3d34d01ec74421"
+"@types/joi@*", "@types/joi@^13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@types/joi/-/joi-13.0.0.tgz#63c066d901e87f464fa075d02bf2f390344241fc"
 
 "@types/mime-db@*":
   version "1.27.0"
@@ -75,9 +76,9 @@
   dependencies:
     "@types/mime-db" "*"
 
-"@types/node@*", "@types/node@^8.0.46", "@types/node@^8.0.47":
-  version "8.0.47"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.47.tgz#968e596f91acd59069054558a00708c445ca30c2"
+"@types/node@*", "@types/node@^8.0.53":
+  version "8.0.53"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
 
 "@types/podium@*":
   version "1.0.0"
@@ -181,8 +182,8 @@ async@1.x, async@^1.4.0:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
 async@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
     lodash "^4.14.0"
 
@@ -405,8 +406,8 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
 color-convert@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
   dependencies:
     color-name "^1.1.1"
 
@@ -583,8 +584,8 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
 
 fast-safe-stringify@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-1.2.0.tgz#ebd42666fd18fe4f2ba4f0d295065f3f85cade96"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-1.2.1.tgz#c4b2477dd585de4488aa6665d4acfae41462d999"
 
 fileset@^2.0.2:
   version "2.0.3"
@@ -810,6 +811,10 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
+injection-js@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
+
 invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
@@ -1227,8 +1232,8 @@ must@^0.12.0:
     kindof ">= 1.0.0 < 2"
 
 nan@^2.3.3:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
 nigel@2.x.x:
   version "2.0.2"
@@ -1713,8 +1718,8 @@ supports-color@^4.0.0:
     has-flag "^2.0.0"
 
 swagger-methods@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/swagger-methods/-/swagger-methods-1.0.0.tgz#b39c77957d305a6535c0a1e015081185b99d61fc"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/swagger-methods/-/swagger-methods-1.0.4.tgz#2c5b844f4a22ab2f5e773f98193c28e386b1c37e"
 
 swagger-parser@^3.4.2:
   version "3.4.2"
@@ -1800,8 +1805,8 @@ tslint@^5.8.0:
     tsutils "^2.12.1"
 
 tsutils@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.1.tgz#f4d95ce3391c8971e46e54c4cf0edb0a21dd5b24"
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.12.2.tgz#ad58a4865d17ec3ddb6631b6ca53be14a5656ff3"
   dependencies:
     tslib "^1.7.1"
 
@@ -1821,9 +1826,9 @@ typedarray-to-buffer@^3.1.2:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"
+typescript@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631"
 
 uglify-js@^2.6:
   version "2.8.29"
@@ -1877,9 +1882,9 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-validator@^8.0.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9"
+validator@^9.0.0:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-9.1.1.tgz#3bdd1065cbd28f9d96ac806dee01030d32fd97ef"
 
 verror@1.10.0:
   version "1.10.0"
@@ -2007,11 +2012,11 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
 
 z-schema@^3.16.1, z-schema@^3.18.2:
-  version "3.18.4"
-  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-3.18.4.tgz#ea8132b279533ee60be2485a02f7e3e42541a9a2"
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-3.19.0.tgz#d86e90e5d02113c7b8824ae477dd57208d17a5a8"
   dependencies:
     lodash.get "^4.0.0"
     lodash.isequal "^4.0.0"
-    validator "^8.0.0"
+    validator "^9.0.0"
   optionalDependencies:
     commander "^2.7.1"