diff --git a/ring.png b/Art/ring.png
similarity index 100%
rename from ring.png
rename to Art/ring.png
diff --git a/Launch.lua b/Launch.lua
index 64abf240..8f81cab1 100644
--- a/Launch.lua
+++ b/Launch.lua
@@ -1,6 +1,8 @@
 #@ SimpleGraphic
 
 SetWindowTitle("PathOfBuilding")
+ConExecute("vid_mode 1")
+ConExecute("vid_resizable 3")
 
 LoadModule("Common")
 
diff --git a/Build.lua b/Modules/Build.lua
similarity index 100%
rename from Build.lua
rename to Modules/Build.lua
diff --git a/Calcs.lua b/Modules/Calcs.lua
similarity index 100%
rename from Calcs.lua
rename to Modules/Calcs.lua
diff --git a/CalcsControl.lua b/Modules/CalcsControl.lua
similarity index 100%
rename from CalcsControl.lua
rename to Modules/CalcsControl.lua
diff --git a/CalcsView.lua b/Modules/CalcsView.lua
similarity index 100%
rename from CalcsView.lua
rename to Modules/CalcsView.lua
diff --git a/Data.lua b/Modules/Data.lua
similarity index 100%
rename from Data.lua
rename to Modules/Data.lua
diff --git a/Items.lua b/Modules/Items.lua
similarity index 100%
rename from Items.lua
rename to Modules/Items.lua
diff --git a/List.lua b/Modules/List.lua
similarity index 100%
rename from List.lua
rename to Modules/List.lua
diff --git a/Main.lua b/Modules/Main.lua
similarity index 100%
rename from Main.lua
rename to Modules/Main.lua
diff --git a/ModParser.lua b/Modules/ModParser.lua
similarity index 100%
rename from ModParser.lua
rename to Modules/ModParser.lua
diff --git a/ModTools.lua b/Modules/ModTools.lua
similarity index 100%
rename from ModTools.lua
rename to Modules/ModTools.lua
diff --git a/Spec.lua b/Modules/Spec.lua
similarity index 100%
rename from Spec.lua
rename to Modules/Spec.lua
diff --git a/Tree.lua b/Modules/Tree.lua
similarity index 100%
rename from Tree.lua
rename to Modules/Tree.lua
diff --git a/TreeView.lua b/Modules/TreeView.lua
similarity index 100%
rename from TreeView.lua
rename to Modules/TreeView.lua
diff --git a/PathOfBuilding.sln b/PathOfBuilding.sln
index 6885df9e..0eb79c40 100644
--- a/PathOfBuilding.sln
+++ b/PathOfBuilding.sln
@@ -1,34 +1,22 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AE7B8DC6-833A-4817-915D-AAB9B8F17C1B}"
 	ProjectSection(SolutionItems) = preProject
-		_gemparse.lua = _gemparse.lua
-		Build.lua = Build.lua
-		Calcs.lua = Calcs.lua
-		CalcsControl.lua = CalcsControl.lua
-		CalcsView.lua = CalcsView.lua
 		Common.lua = Common.lua
-		Data.lua = Data.lua
-		Items.lua = Items.lua
 		Launch.lua = Launch.lua
-		List.lua = List.lua
-		Main.lua = Main.lua
-		ModParser.lua = ModParser.lua
-		ModTools.lua = ModTools.lua
-		Spec.lua = Spec.lua
-		Tree.lua = Tree.lua
-		TreeView.lua = TreeView.lua
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gem DB", "Gem DB", "{EE9D06F5-7310-4567-AB18-6923BCF0A2A1}"
 	ProjectSection(SolutionItems) = preProject
-		gems\act_dex.lua = gems\act_dex.lua
-		gems\act_int.lua = gems\act_int.lua
-		gems\act_str.lua = gems\act_str.lua
-		gems\sup_dex.lua = gems\sup_dex.lua
-		gems\sup_int.lua = gems\sup_int.lua
-		gems\sup_str.lua = gems\sup_str.lua
+		Gems\act_dex.lua = Gems\act_dex.lua
+		Gems\act_int.lua = Gems\act_int.lua
+		Gems\act_str.lua = Gems\act_str.lua
+		Gems\sup_dex.lua = Gems\sup_dex.lua
+		Gems\sup_int.lua = Gems\sup_int.lua
+		Gems\sup_str.lua = Gems\sup_str.lua
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Item DB", "Item DB", "{5BCB69A7-EFE8-4C72-B5E3-DF2C1E227290}"
@@ -49,6 +37,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Item DB", "Item DB", "{5BCB
 		Items\wand.lua = Items\wand.lua
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{35D8BE82-CD83-4C2D-AD31-47026E724F46}"
+	ProjectSection(SolutionItems) = preProject
+		Modules\Build.lua = Modules\Build.lua
+		Modules\Calcs.lua = Modules\Calcs.lua
+		Modules\CalcsControl.lua = Modules\CalcsControl.lua
+		Modules\CalcsView.lua = Modules\CalcsView.lua
+		Modules\Data.lua = Modules\Data.lua
+		Modules\Items.lua = Modules\Items.lua
+		Modules\List.lua = Modules\List.lua
+		Modules\Main.lua = Modules\Main.lua
+		Modules\ModParser.lua = Modules\ModParser.lua
+		Modules\ModTools.lua = Modules\ModTools.lua
+		Modules\Spec.lua = Modules\Spec.lua
+		Modules\Tree.lua = Modules\Tree.lua
+		Modules\TreeView.lua = Modules\TreeView.lua
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -56,5 +61,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{EE9D06F5-7310-4567-AB18-6923BCF0A2A1} = {AE7B8DC6-833A-4817-915D-AAB9B8F17C1B}
 		{5BCB69A7-EFE8-4C72-B5E3-DF2C1E227290} = {AE7B8DC6-833A-4817-915D-AAB9B8F17C1B}
+		{35D8BE82-CD83-4C2D-AD31-47026E724F46} = {AE7B8DC6-833A-4817-915D-AAB9B8F17C1B}
 	EndGlobalSection
 EndGlobal