diff --git a/data/loader.js b/data/loader.js
index 2603446..18bee61 100644
--- a/data/loader.js
+++ b/data/loader.js
@@ -1,4 +1,15 @@
 (async function() {
+    const scripts = [
+        "emulator.js",
+        "nipplejs.js",
+        "shaders.js",
+        "storage.js",
+        "gamepad.js",
+        "GameManager.js",
+        "socket.io.min.js"
+    ];
+
+
     const folderPath = (path) => path.substring(0, path.length - path.split('/').pop().length);
     let scriptPath = (typeof window.EJS_pathtodata === "string") ? window.EJS_pathtodata : folderPath((new URL(document.currentScript.src)).pathname);
     if (!scriptPath.endsWith('/')) scriptPath+='/';
@@ -9,8 +20,10 @@
             script.src = function() {
                 if ('undefined' != typeof EJS_paths && typeof EJS_paths[file] === 'string') {
                     return EJS_paths[file];
+                } else if (file.endsWith(".min.js")) {
+                    return scriptPath + file;
                 } else {
-                    return scriptPath+file;
+                    return scriptPath + "src/" + file;
                 }
             }();
             script.onload = resolve;
@@ -46,13 +59,9 @@
         if (minifiedFailed) {
             console.log("Attempting to load non-minified files");
             if (file === "emulator.min.js") {
-                await loadScript('emulator.js');
-                await loadScript('nipplejs.js');
-                await loadScript('shaders.js');
-                await loadScript('storage.js');
-                await loadScript('gamepad.js');
-                await loadScript('GameManager.js');
-                await loadScript('socket.io.min.js');
+                for (let i=0; i<scripts.length; i++) {
+                    await loadScript(scripts[i]);
+                }
             } else {
                 await loadStyle('emulator.css');
             }
@@ -60,13 +69,9 @@
     }
     
     if (('undefined' != typeof EJS_DEBUG_XX && true === EJS_DEBUG_XX)) {
-        await loadScript('emulator.js');
-        await loadScript('nipplejs.js');
-        await loadScript('shaders.js');
-        await loadScript('storage.js');
-        await loadScript('gamepad.js');
-        await loadScript('GameManager.js');
-        await loadScript('socket.io.min.js');
+        for (let i=0; i<scripts.length; i++) {
+            await loadScript(scripts[i]);
+        }
         await loadStyle('emulator.css');
     } else {
         await loadScript('emulator.min.js');
diff --git a/data/minify/README.md b/data/minify/README.md
index 1daab78..e08e24f 100644
--- a/data/minify/README.md
+++ b/data/minify/README.md
@@ -32,4 +32,4 @@ load times as well as bandwidth.
 
 <!----------------------------------------------------------------------------->
 
-[NodeJS]: https://nodejs.org/en/download/
\ No newline at end of file
+[NodeJS]: https://nodejs.org/en/download/
diff --git a/data/minify/index.js b/data/minify/index.js
index 8432fa4..f27567a 100644
--- a/data/minify/index.js
+++ b/data/minify/index.js
@@ -2,18 +2,18 @@ const UglifyJS = require("uglify-js");
 const fs = require('fs');
 const uglifycss = require('uglifycss');
 
-let files = [
-    'nipplejs.js',
-    'shaders.js',
-    'storage.js',
-    'gamepad.js',
-    'GameManager.js',
-    'socket.io.min.js',
-    'emulator.js'
-]
+const scripts = [
+    "emulator.js",
+    "nipplejs.js",
+    "shaders.js",
+    "storage.js",
+    "gamepad.js",
+    "GameManager.js",
+    "socket.io.min.js"
+];
 let code = "(function() {\n";
-for (let i=0; i<files.length; i++) {
-    code += fs.readFileSync('../'+files[i], 'utf8') + "\n";
+for (let i=0; i<scripts.length; i++) {
+    code += fs.readFileSync('../src/'+scripts[i], 'utf8') + "\n";
 }
 code += "\n})();"
 
diff --git a/data/GameManager.js b/data/src/GameManager.js
similarity index 100%
rename from data/GameManager.js
rename to data/src/GameManager.js
diff --git a/data/emulator.js b/data/src/emulator.js
similarity index 100%
rename from data/emulator.js
rename to data/src/emulator.js
diff --git a/data/gamepad.js b/data/src/gamepad.js
similarity index 100%
rename from data/gamepad.js
rename to data/src/gamepad.js
diff --git a/data/nipplejs.js b/data/src/nipplejs.js
similarity index 100%
rename from data/nipplejs.js
rename to data/src/nipplejs.js
diff --git a/data/shaders.js b/data/src/shaders.js
similarity index 100%
rename from data/shaders.js
rename to data/src/shaders.js
diff --git a/data/socket.io.min.js b/data/src/socket.io.min.js
similarity index 100%
rename from data/socket.io.min.js
rename to data/src/socket.io.min.js
diff --git a/data/storage.js b/data/src/storage.js
similarity index 100%
rename from data/storage.js
rename to data/src/storage.js