diff --git a/G3DTest.vcproj b/G3DTest.vcproj
index 1d31bd8..3a5080f 100644
--- a/G3DTest.vcproj
+++ b/G3DTest.vcproj
@@ -255,14 +255,6 @@
 				RelativePath=".\src\source\BrowserCallHandler.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\ButtonListener.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\CameraButtonListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\CameraController.cpp"
 				>
@@ -271,10 +263,6 @@
 				RelativePath=".\src\source\DataModelInstance.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\DeleteListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\ErrorFunctions.cpp"
 				>
@@ -287,10 +275,6 @@
 				RelativePath=".\src\source\GroupInstance.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\GUDButtonListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\GuiRootInstance.cpp"
 				>
@@ -319,14 +303,6 @@
 				RelativePath=".\src\source\main.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\MenuButtonListener.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\ModeSelectionListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\Mouse.cpp"
 				>
@@ -347,10 +323,6 @@
 				RelativePath=".\src\source\PVInstance.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\RotateButtonListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\StringFunctions.cpp"
 				>
@@ -367,10 +339,6 @@
 				RelativePath=".\src\source\ToggleImageButtonInstance.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\ToolbarListener.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\WindowFunctions.cpp"
 				>
@@ -391,6 +359,42 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Listener"
+				>
+				<File
+					RelativePath=".\src\source\Listener\ButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\CameraButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\DeleteListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\GUDButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\MenuButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\ModeSelectionListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\RotateButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\Listener\ToolbarListener.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -416,14 +420,6 @@
 				RelativePath=".\src\include\BrowserCallHandler.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\ButtonListener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\CameraButtonListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\CameraController.h"
 				>
@@ -432,10 +428,6 @@
 				RelativePath=".\src\include\DataModelInstance.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\DeleteListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\Enum.h"
 				>
@@ -456,10 +448,6 @@
 				RelativePath=".\src\include\GroupInstance.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\GUDButtonListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\GuiRootInstance.h"
 				>
@@ -484,14 +472,6 @@
 				RelativePath=".\src\include\LevelInstance.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\MenuButtonListener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\ModeSelectionListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\Mouse.h"
 				>
@@ -516,10 +496,6 @@
 				RelativePath=".\src\include\resource.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\RotateButtonListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\StringFunctions.h"
 				>
@@ -536,10 +512,6 @@
 				RelativePath=".\src\include\ToggleImageButtonInstance.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\ToolbarListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\win32Defines.h"
 				>
@@ -572,6 +544,42 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Listener"
+				>
+				<File
+					RelativePath=".\src\include\Listener\ButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\CameraButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\DeleteListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\GUDButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\MenuButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\ModeSelectionListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\RotateButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\Listener\ToolbarListener.h"
+					>
+				</File>
+			</Filter>
 			<Filter
 				Name="Tool"
 				>
diff --git a/src/include/BaseButtonInstance.h b/src/include/BaseButtonInstance.h
index 3b3cb82..d22f439 100644
--- a/src/include/BaseButtonInstance.h
+++ b/src/include/BaseButtonInstance.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "instance.h"
-#include "ButtonListener.h"
+#include "Listener/ButtonListener.h"
 
 class ButtonListener;
 class Instance;
diff --git a/src/include/ButtonListener.h b/src/include/Listener/ButtonListener.h
similarity index 100%
rename from src/include/ButtonListener.h
rename to src/include/Listener/ButtonListener.h
diff --git a/src/include/CameraButtonListener.h b/src/include/Listener/CameraButtonListener.h
similarity index 100%
rename from src/include/CameraButtonListener.h
rename to src/include/Listener/CameraButtonListener.h
diff --git a/src/include/DeleteListener.h b/src/include/Listener/DeleteListener.h
similarity index 100%
rename from src/include/DeleteListener.h
rename to src/include/Listener/DeleteListener.h
diff --git a/src/include/GUDButtonListener.h b/src/include/Listener/GUDButtonListener.h
similarity index 100%
rename from src/include/GUDButtonListener.h
rename to src/include/Listener/GUDButtonListener.h
diff --git a/src/include/MenuButtonListener.h b/src/include/Listener/MenuButtonListener.h
similarity index 100%
rename from src/include/MenuButtonListener.h
rename to src/include/Listener/MenuButtonListener.h
diff --git a/src/include/ModeSelectionListener.h b/src/include/Listener/ModeSelectionListener.h
similarity index 100%
rename from src/include/ModeSelectionListener.h
rename to src/include/Listener/ModeSelectionListener.h
diff --git a/src/include/RotateButtonListener.h b/src/include/Listener/RotateButtonListener.h
similarity index 100%
rename from src/include/RotateButtonListener.h
rename to src/include/Listener/RotateButtonListener.h
diff --git a/src/include/ToolbarListener.h b/src/include/Listener/ToolbarListener.h
similarity index 100%
rename from src/include/ToolbarListener.h
rename to src/include/Listener/ToolbarListener.h
diff --git a/src/source/Application.cpp b/src/source/Application.cpp
index a3f6cf3..4b6236f 100644
--- a/src/source/Application.cpp
+++ b/src/source/Application.cpp
@@ -25,11 +25,11 @@
 #include "StringFunctions.h"
 #include "GuiRootInstance.h"
 
-#include "GUDButtonListener.h"
-#include "ModeSelectionListener.h"
-#include "DeleteListener.h"
-#include "CameraButtonListener.h"
-#include "RotateButtonListener.h"
+#include "Listener/GUDButtonListener.h"
+#include "Listener/ModeSelectionListener.h"
+#include "Listener/DeleteListener.h"
+#include "Listener/CameraButtonListener.h"
+#include "Listener/RotateButtonListener.h"
 #define LEGACY_LOAD_G3DFUN_LEVEL
 //Ray testRay;
 //static int cursorid = 0;
diff --git a/src/source/GuiRootInstance.cpp b/src/source/GuiRootInstance.cpp
index 7550631..3b56f2d 100644
--- a/src/source/GuiRootInstance.cpp
+++ b/src/source/GuiRootInstance.cpp
@@ -9,13 +9,13 @@
 #include "Globals.h"
 #include "StringFunctions.h"
 
-#include "GUDButtonListener.h"
-#include "ModeSelectionListener.h"
-#include "MenuButtonListener.h"
-#include "RotateButtonListener.h"
-#include "CameraButtonListener.h"
-#include "DeleteListener.h"
-#include "ToolbarListener.h"
+#include "Listener/GUDButtonListener.h"
+#include "Listener/ModeSelectionListener.h"
+#include "Listener/MenuButtonListener.h"
+#include "Listener/RotateButtonListener.h"
+#include "Listener/CameraButtonListener.h"
+#include "Listener/DeleteListener.h"
+#include "Listener/ToolbarListener.h"
 
 #include "ImageButtonInstance.h"
 
diff --git a/src/source/ButtonListener.cpp b/src/source/Listener/ButtonListener.cpp
similarity index 84%
rename from src/source/ButtonListener.cpp
rename to src/source/Listener/ButtonListener.cpp
index 7d1f9e9..510476e 100644
--- a/src/source/ButtonListener.cpp
+++ b/src/source/Listener/ButtonListener.cpp
@@ -1,5 +1,5 @@
 #include "BaseButtonInstance.h"
-#include "ButtonListener.h"
+#include "Listener/ButtonListener.h"
 
 
 ButtonListener::ButtonListener()
diff --git a/src/source/CameraButtonListener.cpp b/src/source/Listener/CameraButtonListener.cpp
similarity index 95%
rename from src/source/CameraButtonListener.cpp
rename to src/source/Listener/CameraButtonListener.cpp
index 09a1bf0..08c3dd7 100644
--- a/src/source/CameraButtonListener.cpp
+++ b/src/source/Listener/CameraButtonListener.cpp
@@ -1,4 +1,4 @@
-#include "CameraButtonListener.h"
+#include "Listener/CameraButtonListener.h"
 #include "Globals.h"
 #include "AudioPlayer.h"
 #include "Application.h"
diff --git a/src/source/DeleteListener.cpp b/src/source/Listener/DeleteListener.cpp
similarity index 80%
rename from src/source/DeleteListener.cpp
rename to src/source/Listener/DeleteListener.cpp
index 9fd3c30..d76de77 100644
--- a/src/source/DeleteListener.cpp
+++ b/src/source/Listener/DeleteListener.cpp
@@ -1,4 +1,4 @@
-#include "DeleteListener.h"
+#include "Listener/DeleteListener.h"
 #include "Globals.h"
 #include "Application.h"
 
diff --git a/src/source/GUDButtonListener.cpp b/src/source/Listener/GUDButtonListener.cpp
similarity index 98%
rename from src/source/GUDButtonListener.cpp
rename to src/source/Listener/GUDButtonListener.cpp
index f493cad..4e00f43 100644
--- a/src/source/GUDButtonListener.cpp
+++ b/src/source/Listener/GUDButtonListener.cpp
@@ -2,7 +2,7 @@
 #include "Application.h"
 #include "Globals.h"
 #include "AudioPlayer.h"
-#include "GUDButtonListener.h"
+#include "Listener/GUDButtonListener.h"
 
 void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
diff --git a/src/source/MenuButtonListener.cpp b/src/source/Listener/MenuButtonListener.cpp
similarity index 86%
rename from src/source/MenuButtonListener.cpp
rename to src/source/Listener/MenuButtonListener.cpp
index e3aab7b..779bd80 100644
--- a/src/source/MenuButtonListener.cpp
+++ b/src/source/Listener/MenuButtonListener.cpp
@@ -1,4 +1,4 @@
-#include "MenuButtonListener.h"
+#include "Listener/MenuButtonListener.h"
 #include "toggleimagebuttoninstance.h"
 #include "Globals.h"
 void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button)
diff --git a/src/source/ModeSelectionListener.cpp b/src/source/Listener/ModeSelectionListener.cpp
similarity index 95%
rename from src/source/ModeSelectionListener.cpp
rename to src/source/Listener/ModeSelectionListener.cpp
index ec7bcc7..fac7a17 100644
--- a/src/source/ModeSelectionListener.cpp
+++ b/src/source/Listener/ModeSelectionListener.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"
 #include "Instance.h"
-#include "ModeSelectionListener.h"
+#include "Listener/ModeSelectionListener.h"
 #include "Application.h"
 #include "Tool/ArrowTool.h"
 
diff --git a/src/source/RotateButtonListener.cpp b/src/source/Listener/RotateButtonListener.cpp
similarity index 93%
rename from src/source/RotateButtonListener.cpp
rename to src/source/Listener/RotateButtonListener.cpp
index 485582e..b9f0ea4 100644
--- a/src/source/RotateButtonListener.cpp
+++ b/src/source/Listener/RotateButtonListener.cpp
@@ -1,5 +1,5 @@
 #include "BaseButtonInstance.h"
-#include "RotateButtonListener.h"
+#include "Listener/RotateButtonListener.h"
 #include "Globals.h"
 #include "AudioPlayer.h"
 
diff --git a/src/source/ToolbarListener.cpp b/src/source/Listener/ToolbarListener.cpp
similarity index 96%
rename from src/source/ToolbarListener.cpp
rename to src/source/Listener/ToolbarListener.cpp
index f551275..22cb981 100644
--- a/src/source/ToolbarListener.cpp
+++ b/src/source/Listener/ToolbarListener.cpp
@@ -1,4 +1,4 @@
-#include "ToolbarListener.h"
+#include "Listener/ToolbarListener.h"
 #include "Globals.h"
 #include "StringFunctions.h"
 #include "Application.h"