diff --git a/index.html b/index.html
deleted file mode 100644
index fb7260b..0000000
--- a/index.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Keras-js | Mocha Tests</title>
-  <link href="https://cdn.rawgit.com/mochajs/mocha/v3.0.2/mocha.css" rel="stylesheet" />
-</head>
-<body>
-  <div id="mocha"></div>
-
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.0.2/mocha.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/chai/3.5.0/chai.min.js"></script>
-
-  <script src="/lib/weblas.js"></script>
-  <script src="/dist/keras.js"></script>
-
-  <script>mocha.setup('bdd')</script>
-  <script src="/test/globals.js"></script>
-
-  <script src="/test/activations/data_activations.js"></script>
-  <script src="/test/activations/activations.js"></script>
-
-  <!-- advanced_activations -->
-  <script src="/test/advanced_activations/data_advanced_activations.js"></script>
-  <script src="/test/advanced_activations/advanced_activations.js"></script>
-
-  <!-- core -->
-  <script src="/test/core/data_Dense.js"></script>
-  <script src="/test/core/Dense.js"></script>
-  <script src="/test/core/data_Activation.js"></script>
-  <script src="/test/core/Activation.js"></script>
-  <script src="/test/core/data_Dropout.js"></script>
-  <script src="/test/core/Dropout.js"></script>
-  <script src="/test/core/data_Flatten.js"></script>
-  <script src="/test/core/Flatten.js"></script>
-  <script src="/test/core/data_Reshape.js"></script>
-  <script src="/test/core/Reshape.js"></script>
-  <script src="/test/core/data_Permute.js"></script>
-  <script src="/test/core/Permute.js"></script>
-  <script src="/test/core/data_RepeatVector.js"></script>
-  <script src="/test/core/RepeatVector.js"></script>
-  <script src="/test/core/data_Merge.js"></script>
-  <script src="/test/core/Merge.js"></script>
-  <script src="/test/core/data_Highway.js"></script>
-  <script src="/test/core/Highway.js"></script>
-  <script src="/test/core/data_MaxoutDense.js"></script>
-  <script src="/test/core/MaxoutDense.js"></script>
-
-  <!-- convolutional -->
-  <script src="/test/convolutional/data_Convolution1D.js"></script>
-  <script src="/test/convolutional/Convolution1D.js"></script>
-  <script src="/test/convolutional/data_Convolution2D.js"></script>
-  <script src="/test/convolutional/Convolution2D.js"></script>
-  <script src="/test/convolutional/data_AtrousConvolution2D.js"></script>
-  <script src="/test/convolutional/AtrousConvolution2D.js"></script>
-  <script src="/test/convolutional/data_SeparableConvolution2D.js"></script>
-  <script src="/test/convolutional/SeparableConvolution2D.js"></script>
-  <script src="/test/convolutional/data_Deconvolution2D.js"></script>
-  <script src="/test/convolutional/Deconvolution2D.js"></script>
-  <script src="/test/convolutional/data_Convolution3D.js"></script>
-  <script src="/test/convolutional/Convolution3D.js"></script>
-  <script src="/test/convolutional/data_UpSampling1D.js"></script>
-  <script src="/test/convolutional/UpSampling1D.js"></script>
-  <script src="/test/convolutional/data_UpSampling2D.js"></script>
-  <script src="/test/convolutional/UpSampling2D.js"></script>
-  <script src="/test/convolutional/data_UpSampling3D.js"></script>
-  <script src="/test/convolutional/UpSampling3D.js"></script>
-  <script src="/test/convolutional/data_ZeroPadding1D.js"></script>
-  <script src="/test/convolutional/ZeroPadding1D.js"></script>
-  <script src="/test/convolutional/data_ZeroPadding2D.js"></script>
-  <script src="/test/convolutional/ZeroPadding2D.js"></script>
-  <script src="/test/convolutional/data_ZeroPadding3D.js"></script>
-  <script src="/test/convolutional/ZeroPadding3D.js"></script>
-
-  <!-- pooling -->
-  <script src="/test/pooling/data_MaxPooling1D.js"></script>
-  <script src="/test/pooling/MaxPooling1D.js"></script>
-  <script src="/test/pooling/data_MaxPooling2D.js"></script>
-  <script src="/test/pooling/MaxPooling2D.js"></script>
-  <script src="/test/pooling/data_MaxPooling3D.js"></script>
-  <script src="/test/pooling/MaxPooling3D.js"></script>
-  <script src="/test/pooling/data_AveragePooling1D.js"></script>
-  <script src="/test/pooling/AveragePooling1D.js"></script>
-  <script src="/test/pooling/data_AveragePooling2D.js"></script>
-  <script src="/test/pooling/AveragePooling2D.js"></script>
-  <script src="/test/pooling/data_AveragePooling3D.js"></script>
-  <script src="/test/pooling/AveragePooling3D.js"></script>
-  <script src="/test/pooling/data_GlobalMaxPooling1D.js"></script>
-  <script src="/test/pooling/GlobalMaxPooling1D.js"></script>
-  <script src="/test/pooling/data_GlobalAveragePooling1D.js"></script>
-  <script src="/test/pooling/GlobalAveragePooling1D.js"></script>
-  <script src="/test/pooling/data_GlobalMaxPooling2D.js"></script>
-  <script src="/test/pooling/GlobalMaxPooling2D.js"></script>
-  <script src="/test/pooling/data_GlobalAveragePooling2D.js"></script>
-  <script src="/test/pooling/GlobalAveragePooling2D.js"></script>
-
-  <script src="/test/normalization/data_BatchNormalization.js"></script>
-  <script src="/test/normalization/BatchNormalization.js"></script>
-
-  <script src="/test/embeddings/data_Embedding.js"></script>
-  <script src="/test/embeddings/Embedding.js"></script>
-
-  <script>
-    // mocha.checkLeaks();
-    mocha.globals(['jQuery']);
-    mocha.run();
-  </script>
-</body>
-</html>
diff --git a/package.json b/package.json
index 2b8c073..e9665fd 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   "homepage": "https://github.com/transcranial/keras-js#readme",
   "dependencies": {
     "cwise": "1.0.9",
-    "lodash": "4.16.0",
+    "lodash": "4.16.1",
     "ndarray": "1.0.18",
     "ndarray-blas-level2": "1.1.0",
     "ndarray-concat-rows": "1.0.1",
diff --git a/test/index.html b/test/index.html
new file mode 100644
index 0000000..50891fb
--- /dev/null
+++ b/test/index.html
@@ -0,0 +1,109 @@
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Keras-js | Mocha Tests</title>
+  <link href="https://cdn.rawgit.com/mochajs/mocha/v3.0.2/mocha.css" rel="stylesheet" />
+</head>
+<body>
+  <div id="mocha"></div>
+
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/3.0.2/mocha.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/chai/3.5.0/chai.min.js"></script>
+
+  <script src="/lib/weblas.js"></script>
+  <script src="/dist/keras.js"></script>
+
+  <script>mocha.setup('bdd')</script>
+  <script src="globals.js"></script>
+
+  <script src="activations/data_activations.js"></script>
+  <script src="activations/activations.js"></script>
+
+  <!-- advanced_activations -->
+  <script src="advanced_activations/data_advanced_activations.js"></script>
+  <script src="advanced_activations/advanced_activations.js"></script>
+
+  <!-- core -->
+  <script src="core/data_Dense.js"></script>
+  <script src="core/Dense.js"></script>
+  <script src="core/data_Activation.js"></script>
+  <script src="core/Activation.js"></script>
+  <script src="core/data_Dropout.js"></script>
+  <script src="core/Dropout.js"></script>
+  <script src="core/data_Flatten.js"></script>
+  <script src="core/Flatten.js"></script>
+  <script src="core/data_Reshape.js"></script>
+  <script src="core/Reshape.js"></script>
+  <script src="core/data_Permute.js"></script>
+  <script src="core/Permute.js"></script>
+  <script src="core/data_RepeatVector.js"></script>
+  <script src="core/RepeatVector.js"></script>
+  <script src="core/data_Merge.js"></script>
+  <script src="core/Merge.js"></script>
+  <script src="core/data_Highway.js"></script>
+  <script src="core/Highway.js"></script>
+  <script src="core/data_MaxoutDense.js"></script>
+  <script src="core/MaxoutDense.js"></script>
+
+  <!-- convolutional -->
+  <script src="convolutional/data_Convolution1D.js"></script>
+  <script src="convolutional/Convolution1D.js"></script>
+  <script src="convolutional/data_Convolution2D.js"></script>
+  <script src="convolutional/Convolution2D.js"></script>
+  <script src="convolutional/data_AtrousConvolution2D.js"></script>
+  <script src="convolutional/AtrousConvolution2D.js"></script>
+  <script src="convolutional/data_SeparableConvolution2D.js"></script>
+  <script src="convolutional/SeparableConvolution2D.js"></script>
+  <script src="convolutional/data_Deconvolution2D.js"></script>
+  <script src="convolutional/Deconvolution2D.js"></script>
+  <script src="convolutional/data_Convolution3D.js"></script>
+  <script src="convolutional/Convolution3D.js"></script>
+  <script src="convolutional/data_UpSampling1D.js"></script>
+  <script src="convolutional/UpSampling1D.js"></script>
+  <script src="convolutional/data_UpSampling2D.js"></script>
+  <script src="convolutional/UpSampling2D.js"></script>
+  <script src="convolutional/data_UpSampling3D.js"></script>
+  <script src="convolutional/UpSampling3D.js"></script>
+  <script src="convolutional/data_ZeroPadding1D.js"></script>
+  <script src="convolutional/ZeroPadding1D.js"></script>
+  <script src="convolutional/data_ZeroPadding2D.js"></script>
+  <script src="convolutional/ZeroPadding2D.js"></script>
+  <script src="convolutional/data_ZeroPadding3D.js"></script>
+  <script src="convolutional/ZeroPadding3D.js"></script>
+
+  <!-- pooling -->
+  <script src="pooling/data_MaxPooling1D.js"></script>
+  <script src="pooling/MaxPooling1D.js"></script>
+  <script src="pooling/data_MaxPooling2D.js"></script>
+  <script src="pooling/MaxPooling2D.js"></script>
+  <script src="pooling/data_MaxPooling3D.js"></script>
+  <script src="pooling/MaxPooling3D.js"></script>
+  <script src="pooling/data_AveragePooling1D.js"></script>
+  <script src="pooling/AveragePooling1D.js"></script>
+  <script src="pooling/data_AveragePooling2D.js"></script>
+  <script src="pooling/AveragePooling2D.js"></script>
+  <script src="pooling/data_AveragePooling3D.js"></script>
+  <script src="pooling/AveragePooling3D.js"></script>
+  <script src="pooling/data_GlobalMaxPooling1D.js"></script>
+  <script src="pooling/GlobalMaxPooling1D.js"></script>
+  <script src="pooling/data_GlobalAveragePooling1D.js"></script>
+  <script src="pooling/GlobalAveragePooling1D.js"></script>
+  <script src="pooling/data_GlobalMaxPooling2D.js"></script>
+  <script src="pooling/GlobalMaxPooling2D.js"></script>
+  <script src="pooling/data_GlobalAveragePooling2D.js"></script>
+  <script src="pooling/GlobalAveragePooling2D.js"></script>
+
+  <script src="normalization/data_BatchNormalization.js"></script>
+  <script src="normalization/BatchNormalization.js"></script>
+
+  <script src="embeddings/data_Embedding.js"></script>
+  <script src="embeddings/Embedding.js"></script>
+
+  <script>
+    // mocha.checkLeaks();
+    mocha.globals(['jQuery']);
+    mocha.run();
+  </script>
+</body>
+</html>
