From ac7414b13ca613cf90104af4ca5a36474c5af890 Mon Sep 17 00:00:00 2001
From: Openarl <dayveplusplus@gmail.com>
Date: Thu, 5 May 2016 01:24:38 +1000
Subject: [PATCH] Unbreak things

---
 Launch.lua               |  2 +-
 Modules/Build.lua        |  4 ++--
 Modules/Calcs.lua        |  2 +-
 Modules/CalcsControl.lua |  2 +-
 Modules/Main.lua         | 14 +++++++-------
 Modules/ModTools.lua     |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Launch.lua b/Launch.lua
index 8f81cab1..ae5d8d8b 100644
--- a/Launch.lua
+++ b/Launch.lua
@@ -16,7 +16,7 @@ function launch:LoadMain()
 	self.main = nil
 	collectgarbage("collect")
 	local errMsg
-	errMsg, self.main = PLoadModule("main", launch)
+	errMsg, self.main = PLoadModule("Modules/main", launch)
 	if errMsg then
 		self:ShowErrMsg("Error loading main script: %s", errMsg)
 	elseif not self.main then
diff --git a/Modules/Build.lua b/Modules/Build.lua
index ddc3c31f..6df1c4ae 100644
--- a/Modules/Build.lua
+++ b/Modules/Build.lua
@@ -154,9 +154,9 @@ function buildMode:Init(dbFileName)
 
 	self.abortSave = true
 
-	self.items = LoadModule("Items", launch, cfg, main)
+	self.items = LoadModule("Modules/Items", launch, cfg, main)
 	self.items:Init(self)
-	self.calcs = LoadModule("Calcs", launch, cfg, main)
+	self.calcs = LoadModule("Modules/Calcs", launch, cfg, main)
 	self.calcs:Init(self)
 	self.tree = main.tree
 	self.spec = main.SpecClass.NewSpec(main.tree)
diff --git a/Modules/Calcs.lua b/Modules/Calcs.lua
index 20d9b5bd..ce5c94d9 100644
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -529,7 +529,7 @@ end
 function calcs:LoadControl()
 	grid:Clear()
 	local errMsg
-	errMsg, self.control = PLoadModule("CalcsControl", grid)
+	errMsg, self.control = PLoadModule("Modules/CalcsControl", grid)
 	if errMsg then
 		launch:ShowErrMsg("Error loading control script: %s", errMsg)
 	elseif not self.control then
diff --git a/Modules/CalcsControl.lua b/Modules/CalcsControl.lua
index 48b01136..28353e1b 100644
--- a/Modules/CalcsControl.lua
+++ b/Modules/CalcsControl.lua
@@ -15,7 +15,7 @@ local mod_dbUnmerge = mod.dbUnmerge
 local mod_dbMergeList = mod.dbMergeList
 local mod_dbUnmergeList = mod.dbUnmergeList
 
-local setViewMode = LoadModule("CalcsView", grid)
+local setViewMode = LoadModule("Modules/CalcsView", grid)
 
 local isElemental = { fire = true, cold = true, lightning = true }
 
diff --git a/Modules/Main.lua b/Modules/Main.lua
index f6175abd..c46465e3 100644
--- a/Modules/Main.lua
+++ b/Modules/Main.lua
@@ -75,16 +75,16 @@ function main:DrawTooltip(x, y, w, h, viewPort, col, center)
 	end
 end
 
-LoadModule("Data")
-LoadModule("ModTools")
+LoadModule("Modules/Data")
+LoadModule("Modules/ModTools")
 
-main.TreeClass = LoadModule("Tree", launch, cfg, main)
-main.SpecClass = LoadModule("Spec", launch, cfg, main)
-main.TreeViewClass = LoadModule("TreeView", launch, cfg, main)
+main.TreeClass = LoadModule("Modules/Tree", launch, cfg, main)
+main.SpecClass = LoadModule("Modules/Spec", launch, cfg, main)
+main.TreeViewClass = LoadModule("Modules/TreeView", launch, cfg, main)
 
 main.modes = { }
-main.modes["LIST"] = LoadModule("List", launch, cfg, main)
-main.modes["BUILD"] = LoadModule("Build", launch, cfg, main)
+main.modes["LIST"] = LoadModule("Modules/List", launch, cfg, main)
+main.modes["BUILD"] = LoadModule("Modules/Build", launch, cfg, main)
 
 function main:SetMode(newMode, ...)
 	self.newMode = newMode
diff --git a/Modules/ModTools.lua b/Modules/ModTools.lua
index 646d5429..6aa5e299 100644
--- a/Modules/ModTools.lua
+++ b/Modules/ModTools.lua
@@ -3,7 +3,7 @@ local t_insert = table.insert
 
 mod = { }
 
-mod.parseMod = LoadModule("ModParser")
+mod.parseMod = LoadModule("Modules/ModParser")
 
 -- Break modifier name into namespace and mod name
 local spaceLookup = { }