diff --git a/bin/remix-tests b/bin/remix-tests
index 9d3d91885b..3c14572035 100755
--- a/bin/remix-tests
+++ b/bin/remix-tests
@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-require('../run.js');
+require('../src/run.js');
 
diff --git a/package.json b/package.json
index 99fbdfee70..8a62a15cac 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "remix-tests",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "./src/index.js",
   "contributors": [
     {
       "name": "Iuri Matias",
diff --git a/index.js b/src/index.js
similarity index 95%
rename from index.js
rename to src/index.js
index 9b1d66dc92..a904ad0860 100644
--- a/index.js
+++ b/src/index.js
@@ -3,9 +3,9 @@ const path = require('path')
 const fs = require('fs')
 require('colors')
 
-let Compiler = require('./src/compiler.js')
-let Deployer = require('./src/deployer.js')
-let TestRunner = require('./src/testRunner.js')
+let Compiler = require('./compiler.js')
+let Deployer = require('./deployer.js')
+let TestRunner = require('./testRunner.js')
 
 var runTestFiles = function (filepath, isDirectory, web3) {
   async.waterfall([
diff --git a/run.js b/src/run.js
similarity index 92%
rename from run.js
rename to src/run.js
index 11dfdf3e50..6eb4aa2655 100644
--- a/run.js
+++ b/src/run.js
@@ -3,7 +3,7 @@ const Web3 = require('web3')
 const RemixTests = require('./index.js')
 const fs = require('fs')
 
-const Provider = require('remix-simulator').Provider;
+const Provider = require('remix-simulator').Provider
 
 commander.action(function (filename) {
   let web3 = new Web3()