diff --git a/.gitignore b/.gitignore
index 20039f0..e057797 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,8 @@ package-lock.json
 .node_repl_history
 
 # Build folder
-dist
+# Update 2018-08-07: currently build is done to / (before: dist/) due to
+# backwards compatibility reasons, JS files from root and root test/ folder
+# are excluded
+/*.js
+/test
diff --git a/package.json b/package.json
index 0320784..0178e92 100644
--- a/package.json
+++ b/package.json
@@ -2,18 +2,19 @@
   "name": "ethereumjs-wallet",
   "version": "0.6.1",
   "description": "Utilities for handling Ethereum keys",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
-    "dist"
+    "/*.js",
+    "test/"
   ],
   "scripts": {
     "coverage": "istanbul cover _mocha",
-    "coveralls": "npm run coverage && coveralls <coverage/lcov.info",
+    "coveralls": "npm run build:dist && npm run coverage && coveralls <coverage/lcov.info",
     "lint": "standard",
     "prepublishOnly": "npm run lint && npm run test:build",
-    "test": "mocha ./test/*.js",
-    "test:build": "npm run build:dist && mocha ./dist/test/*.js",
-    "build:dist": "babel *.js test/*.js -d dist/"
+    "test": "mocha ./src/test/*.js",
+    "test:build": "npm run build:dist && mocha ./test/*.js",
+    "build:dist": "babel src/ -d ."
   },
   "repository": {
     "type": "git",
@@ -54,7 +55,7 @@
       "it"
     ],
     "ignore": [
-      "dist/**"
+      "./*.js"
     ]
   }
 }
diff --git a/hdkey.js b/src/hdkey.js
similarity index 100%
rename from hdkey.js
rename to src/hdkey.js
diff --git a/index.js b/src/index.js
similarity index 100%
rename from index.js
rename to src/index.js
diff --git a/provider-engine.js b/src/provider-engine.js
similarity index 100%
rename from provider-engine.js
rename to src/provider-engine.js
diff --git a/test/hdkey.js b/src/test/hdkey.js
similarity index 100%
rename from test/hdkey.js
rename to src/test/hdkey.js
diff --git a/test/index.js b/src/test/index.js
similarity index 100%
rename from test/index.js
rename to src/test/index.js
diff --git a/thirdparty.js b/src/thirdparty.js
similarity index 100%
rename from thirdparty.js
rename to src/thirdparty.js