diff --git a/newmodels_reborn/meta.xml b/newmodels_reborn/meta.xml
index 156bba5..f97f073 100644
--- a/newmodels_reborn/meta.xml
+++ b/newmodels_reborn/meta.xml
@@ -6,11 +6,11 @@
     <min_mta_version client="1.6.0-9.22505.0" server="1.6.0-9.22505.0"></min_mta_version>
 
     <!-- Main Scripts -->
-    <script src="core/shared_local.lua" type="shared"/>
-    <script src="core/shared_exported.lua" type="shared"/>
-    <script src="core/shared_importfunc.lua" type="shared"/>
-    <script src="core/client_logic.lua" type="client"/>
-    <script src="core/server_logic.lua" type="server"/>
+    <script src="scripts/core/shared_local.lua" type="shared"/>
+    <script src="scripts/core/shared_exported.lua" type="shared"/>
+    <script src="scripts/core/shared_importfunc.lua" type="shared"/>
+    <script src="scripts/core/client_logic.lua" type="client"/>
+    <script src="scripts/core/server_logic.lua" type="server"/>
     <!-- Exported functions -->
     <export function="getCustomModels" type="shared"/>
     <export function="isDefaultID" type="shared"/>
@@ -34,16 +34,16 @@
     <!-- OPTIONAL THINGS: .............................................................. -->
 
     <!-- Update Checker (RECOMMENDED, please keep this to be warned of new releases!) -->
-    <script src="optional/update_checker/s_update_checker.lua" type="server"/>
+    <script src="scripts/optional/update_checker/s_update_checker.lua" type="server"/>
 
     <!-- Debugging / Testing -->
-    <script src="optional/debug/c_debug.lua" type="client"/>
-    <script src="optional/debug/s_debug.lua" type="server"/>
+    <script src="scripts/optional/debug/c_debug.lua" type="client"/>
+    <script src="scripts/optional/debug/s_debug.lua" type="server"/>
 
     <!-- Backwards compatibility with newmodels 3.3.0 -->
-    <script src="optional/compatibility/shared_exported.lua" type="shared"/>
-    <script src="optional/compatibility/shared_importfunc.lua" type="shared"/>
-    <script src="optional/compatibility/server_funcs.lua" type="server"/>
+    <script src="scripts/optional/compatibility/shared_exported.lua" type="shared"/>
+    <script src="scripts/optional/compatibility/shared_importfunc.lua" type="shared"/>
+    <script src="scripts/optional/compatibility/server_funcs.lua" type="server"/>
     <!-- Exported functions (Client & Server) -->
     <export type="shared" function="getModList"/>
     <export type="shared" function="getDataNameFromType"/>
diff --git a/newmodels_reborn/core/client_logic.lua b/newmodels_reborn/scripts/core/client_logic.lua
similarity index 100%
rename from newmodels_reborn/core/client_logic.lua
rename to newmodels_reborn/scripts/core/client_logic.lua
diff --git a/newmodels_reborn/core/server_logic.lua b/newmodels_reborn/scripts/core/server_logic.lua
similarity index 100%
rename from newmodels_reborn/core/server_logic.lua
rename to newmodels_reborn/scripts/core/server_logic.lua
diff --git a/newmodels_reborn/core/shared_exported.lua b/newmodels_reborn/scripts/core/shared_exported.lua
similarity index 100%
rename from newmodels_reborn/core/shared_exported.lua
rename to newmodels_reborn/scripts/core/shared_exported.lua
diff --git a/newmodels_reborn/core/shared_importfunc.lua b/newmodels_reborn/scripts/core/shared_importfunc.lua
similarity index 89%
rename from newmodels_reborn/core/shared_importfunc.lua
rename to newmodels_reborn/scripts/core/shared_importfunc.lua
index 8a02604..d5ffe9e 100644
--- a/newmodels_reborn/core/shared_importfunc.lua
+++ b/newmodels_reborn/scripts/core/shared_importfunc.lua
@@ -6,7 +6,7 @@ function import()
         return error("This function can only be called from another resource.")
     end
     if not exportScriptString then
-        local f = fileOpen("core/shared_exported.lua", true)
+        local f = fileOpen("scripts/core/shared_exported.lua", true)
         if not f then
             return error("Failed to open file.")
         end
diff --git a/newmodels_reborn/core/shared_local.lua b/newmodels_reborn/scripts/core/shared_local.lua
similarity index 100%
rename from newmodels_reborn/core/shared_local.lua
rename to newmodels_reborn/scripts/core/shared_local.lua
diff --git a/newmodels_reborn/optional/README_OPTIONAL.txt b/newmodels_reborn/scripts/optional/README_OPTIONAL.txt
similarity index 100%
rename from newmodels_reborn/optional/README_OPTIONAL.txt
rename to newmodels_reborn/scripts/optional/README_OPTIONAL.txt
diff --git a/newmodels_reborn/optional/compatibility/server_funcs.lua b/newmodels_reborn/scripts/optional/compatibility/server_funcs.lua
similarity index 100%
rename from newmodels_reborn/optional/compatibility/server_funcs.lua
rename to newmodels_reborn/scripts/optional/compatibility/server_funcs.lua
diff --git a/newmodels_reborn/optional/compatibility/shared_exported.lua b/newmodels_reborn/scripts/optional/compatibility/shared_exported.lua
similarity index 95%
rename from newmodels_reborn/optional/compatibility/shared_exported.lua
rename to newmodels_reborn/scripts/optional/compatibility/shared_exported.lua
index 5bb0498..b9b134b 100644
--- a/newmodels_reborn/optional/compatibility/shared_exported.lua
+++ b/newmodels_reborn/scripts/optional/compatibility/shared_exported.lua
@@ -1,5 +1,5 @@
 -- !! THIS SCRIPT IS ENTIRELY EXPORTED !!
--- Check core/shared_exported.lua for the original script
+-- Check scripts/core/shared_exported.lua for the original script
 
 -- Backwards compatibility with newmodels 3.3.0
 
diff --git a/newmodels_reborn/optional/compatibility/shared_importfunc.lua b/newmodels_reborn/scripts/optional/compatibility/shared_importfunc.lua
similarity index 84%
rename from newmodels_reborn/optional/compatibility/shared_importfunc.lua
rename to newmodels_reborn/scripts/optional/compatibility/shared_importfunc.lua
index 90cc27e..aa8a3e2 100644
--- a/newmodels_reborn/optional/compatibility/shared_importfunc.lua
+++ b/newmodels_reborn/scripts/optional/compatibility/shared_importfunc.lua
@@ -7,7 +7,7 @@ _import = import
 function import()
     local str = _import()
     if not exportScriptString then
-        local f = fileOpen("optional/compatibility/shared_exported.lua", true)
+        local f = fileOpen("scripts/optional/compatibility/shared_exported.lua", true)
         if not f then
             return error("Failed to open file.")
         end
diff --git a/newmodels_reborn/optional/debug/c_debug.lua b/newmodels_reborn/scripts/optional/debug/c_debug.lua
similarity index 100%
rename from newmodels_reborn/optional/debug/c_debug.lua
rename to newmodels_reborn/scripts/optional/debug/c_debug.lua
diff --git a/newmodels_reborn/optional/debug/s_debug.lua b/newmodels_reborn/scripts/optional/debug/s_debug.lua
similarity index 100%
rename from newmodels_reborn/optional/debug/s_debug.lua
rename to newmodels_reborn/scripts/optional/debug/s_debug.lua
diff --git a/newmodels_reborn/optional/update_checker/s_update_checker.lua b/newmodels_reborn/scripts/optional/update_checker/s_update_checker.lua
similarity index 100%
rename from newmodels_reborn/optional/update_checker/s_update_checker.lua
rename to newmodels_reborn/scripts/optional/update_checker/s_update_checker.lua