diff --git a/installer/olympus.iss b/installer/olympus.iss
index da9adb03..2239bf5c 100644
--- a/installer/olympus.iss
+++ b/installer/olympus.iss
@@ -27,11 +27,11 @@ Name: "installmodules"; Description: "Install node.js modules"; GroupDescription
 Source: "..\olympus.json"; DestDir: "{app}";
 
 Source: "..\scripts\OlympusHook.lua"; DestDir: "{app}\Scripts"; Flags: ignoreversion 
-Source: "..\scripts\OlympusCommand.lua"; DestDir: "{app}\Scripts"; Flags: ignoreversion 
-Source: "..\scripts\unitPayloads.lua"; DestDir: "{app}\Scripts"; Flags: ignoreversion
-Source: "..\scripts\templates.lua"; DestDir: "{app}\Scripts"; Flags: ignoreversion 
-Source: "..\scripts\mist.lua"; DestDir: "{app}\Scripts"; Flags: ignoreversion 
-Source: "..\scripts\mods.lua"; DestDir: "{app}\Scripts"; Flags: ignoreversion 
+Source: "..\scripts\OlympusCommand.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion 
+Source: "..\scripts\unitPayloads.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion
+Source: "..\scripts\templates.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion 
+Source: "..\scripts\mist.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion 
+Source: "..\scripts\mods.lua"; DestDir: "{app}\mod\scripts"; Flags: ignoreversion 
 
 Source: "..\mod\*"; DestDir: "{app}\mod"; Flags: ignoreversion recursesubdirs;
 Source: "..\bin\*.dll"; DestDir: "{app}\mod\bin"; Flags: ignoreversion;
diff --git a/manager/javascripts/preload.js b/manager/javascripts/preload.js
index 2662fadf..33bafd49 100644
--- a/manager/javascripts/preload.js
+++ b/manager/javascripts/preload.js
@@ -107,8 +107,8 @@ function delay(ms) {
 
 async function installOlympus(folder) {
     console.log(`Installing Olympus in ${folder}`);
-    fs.cpSync(path.join("..", "Mod"), path.join(folder, "Mods", "Services", "Olympus"), {recursive: true});
-    fs.cpSync(path.join("..", "Scripts", "OlympusHook.lua"), path.join(folder, "Scripts", "OlympusHook.lua"));
+    fs.cpSync(path.join("..", "mod"), path.join(folder, "Mods", "Services", "Olympus"), {recursive: true});
+    fs.cpSync(path.join("..", "scripts", "OlympusHook.lua"), path.join(folder, "Scripts", "OlympusHook.lua"));
     fs.cpSync(path.join("..", "olympus.json"), path.join(folder, "Config", "olympus.json"));
     if (createDesktopShortcut({
         windows: {
diff --git a/src/shared/include/defines.h b/src/shared/include/defines.h
index 571147b3..4ded4e59 100644
--- a/src/shared/include/defines.h
+++ b/src/shared/include/defines.h
@@ -15,7 +15,7 @@
 #define FRAMERATE_TIME_INTERVAL 0.05
 
 #define OLYMPUS_JSON_PATH "..\\..\\..\\..\\Config\\olympus.json"
-#define AIRCRAFT_DATABASE_PATH "..\\databases\\aircraftdatabase.json"
-#define HELICOPTER_DATABASE_PATH "..\\databases\\helicopterdatabase.json"
-#define GROUNDUNIT_DATABASE_PATH "..\\databases\\groundunitdatabase.json"
-#define NAVYUNIT_DATABASE_PATH "..\\databases\\navyunitdatabase.json"
+#define AIRCRAFT_DATABASE_PATH "..\\databases\\units\\aircraftdatabase.json"
+#define HELICOPTER_DATABASE_PATH "..\\databases\\units\\helicopterdatabase.json"
+#define GROUNDUNIT_DATABASE_PATH "..\\databases\\units\\groundunitdatabase.json"
+#define NAVYUNIT_DATABASE_PATH "..\\databases\\units\\navyunitdatabase.json"