diff --git a/Dialogs.rc b/Dialogs.rc
index e0c0b01..b4c19ae 100644
--- a/Dialogs.rc
+++ b/Dialogs.rc
@@ -5,7 +5,7 @@
 #include <windows.h>
 #include <commctrl.h>
 #include <richedit.h>
-#include "resource.h"
+#include "src/include/resource.h" //Should not have to do this...
 
 
 
diff --git a/G3DTest.vcproj b/G3DTest.vcproj
index 3401df2..1d31bd8 100644
--- a/G3DTest.vcproj
+++ b/G3DTest.vcproj
@@ -239,10 +239,6 @@
 				RelativePath=".\src\source\Application.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\ArrowTool.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\AudioPlayer.cpp"
 				>
@@ -371,10 +367,6 @@
 				RelativePath=".\src\source\ToggleImageButtonInstance.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\Tool.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\ToolbarListener.cpp"
 				>
@@ -387,6 +379,18 @@
 				RelativePath=".\src\source\WorkspaceInstance.cpp"
 				>
 			</File>
+			<Filter
+				Name="Tool"
+				>
+				<File
+					RelativePath=".\src\source\Tool\ArrowTool.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Tool\Tool.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -396,10 +400,6 @@
 				RelativePath=".\src\include\Application.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\ArrowTool.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\AudioPlayer.h"
 				>
@@ -536,10 +536,6 @@
 				RelativePath=".\src\include\ToggleImageButtonInstance.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\Tool.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\ToolbarListener.h"
 				>
@@ -576,17 +572,17 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="DataModel"
-				>
-			</Filter>
 			<Filter
 				Name="Tool"
 				>
-			</Filter>
-			<Filter
-				Name="Listener"
-				>
+				<File
+					RelativePath=".\src\include\Tool\ArrowTool.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Tool\Tool.h"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/src/include/Application.h b/src/include/Application.h
index c33f121..30c2fe3 100644
--- a/src/include/Application.h
+++ b/src/include/Application.h
@@ -6,7 +6,7 @@
 #include "CameraController.h"
 #include "IEBrowser.h"
 #include "Mouse.h"
-#include "Tool.h"
+#include "Tool/Tool.h"
 //#include "GuiRoot.h"
 
 class TextButtonInstance;
diff --git a/src/include/ArrowTool.h b/src/include/Tool/ArrowTool.h
similarity index 100%
rename from src/include/ArrowTool.h
rename to src/include/Tool/ArrowTool.h
diff --git a/src/include/Tool.h b/src/include/Tool/Tool.h
similarity index 100%
rename from src/include/Tool.h
rename to src/include/Tool/Tool.h
diff --git a/src/source/ModeSelectionListener.cpp b/src/source/ModeSelectionListener.cpp
index 9356155..ec7bcc7 100644
--- a/src/source/ModeSelectionListener.cpp
+++ b/src/source/ModeSelectionListener.cpp
@@ -2,7 +2,7 @@
 #include "Instance.h"
 #include "ModeSelectionListener.h"
 #include "Application.h"
-#include "ArrowTool.h"
+#include "Tool/ArrowTool.h"
 
 void ModeSelectionListener::onButton1MouseClick(BaseButtonInstance* button)
 {
diff --git a/src/source/ArrowTool.cpp b/src/source/Tool/ArrowTool.cpp
similarity index 98%
rename from src/source/ArrowTool.cpp
rename to src/source/Tool/ArrowTool.cpp
index ad58279..afcc577 100644
--- a/src/source/ArrowTool.cpp
+++ b/src/source/Tool/ArrowTool.cpp
@@ -1,4 +1,4 @@
-#include "ArrowTool.h"
+#include "Tool/ArrowTool.h"
 #include "Application.h"
 
 ArrowTool::ArrowTool(void)
diff --git a/src/source/Tool.cpp b/src/source/Tool/Tool.cpp
similarity index 97%
rename from src/source/Tool.cpp
rename to src/source/Tool/Tool.cpp
index 25f8f93..109d372 100644
--- a/src/source/Tool.cpp
+++ b/src/source/Tool/Tool.cpp
@@ -1,4 +1,4 @@
-#include "Tool.h"
+#include "Tool/Tool.h"
 
 Tool::Tool(void)
 {