diff --git a/Demo.h b/Demo.h
deleted file mode 100644
index 923bbe6..0000000
--- a/Demo.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-#include <G3DAll.h>
-#include "CameraController.h"
-#include "PropertyWindow.h"
-
-class Demo { // : public GApp {
-	public:
-		Demo(const GAppSettings& settings,HWND parentWindow);
-		void Boop();
-		virtual				~Demo() {}
-		virtual void		exitApplication();
-		virtual void		onInit();
-		virtual void		onLogic();
-		virtual void		onNetwork();
-		virtual void		onSimulation(RealTime rdt, SimTime sdt, SimTime idt);
-		virtual void		onGraphics(RenderDevice* rd);
-		virtual void		onUserInput(UserInput* ui);
-		virtual void		onCleanup();
-
-		std::vector<Instance*>	getSelection();
-		void		run();
-		void		QuitApp();
-		void		resizeWithParent(HWND parentWindow);
-		void		onCreate(HWND parentWindow);
-		void		onKeyPressed(int key);
-		void		onKeyUp(int key);
-		void		onMouseLeftPressed(HWND hwnd,int x, int y);
-		void		onMouseLeftUp(int x, int y);
-		void		onMouseRightPressed(int x, int y);
-		void		onMouseRightUp(int x, int y);
-		void		onMouseMoved(int x, int y);
-		void		onMouseWheel(int x, int y, short delta);
-
-		CameraController	cameraController;
-		RenderDevice*		renderDevice;
-		UserInput*			userInput;
-		PropertyWindow*		_propWindow;
-		void generateShadowMap(const CoordinateFrame& lightViewMatrix) const;
-	private:
-		void				initGUI();
-		HWND				_hWndMain;
-		SkyRef				sky;
-		bool				quit;
-		bool				mouseOnScreen;
-		bool				rightButtonHolding;
-		void				main();
-		GWindow*			_window;
-		HWND				_hwndToolbox;
-		HWND				_buttonTest;
-		HWND				_hwndRenderer;
-		G3D::TextureRef		shadowMap;
-		double lightProjX, lightProjY, lightProjNear, lightProjFar;
-	protected:
-		Stopwatch           m_graphicsWatch;
-		Stopwatch           m_logicWatch;
-		Stopwatch           m_networkWatch;
-		Stopwatch           m_userInputWatch;
-		Stopwatch           m_simulationWatch;
-		Stopwatch           m_waitWatch;
-};
diff --git a/G3DTest.vcproj b/G3DTest.vcproj
index 7ba983f..ef71aad 100644
--- a/G3DTest.vcproj
+++ b/G3DTest.vcproj
@@ -234,6 +234,10 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath=".\Application.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\AudioPlayer.cpp"
 				>
@@ -254,6 +258,10 @@
 				RelativePath=".\CameraController.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\ErrorFunctions.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Globals.cpp"
 				>
@@ -342,11 +350,39 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Listeners"
+				>
+				<File
+					RelativePath=".\CameraButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\DeleteListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\GUDButtonListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ModeSelectionListener.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\RotateButtonListener.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath=".\Application.h"
+				>
+			</File>
 			<File
 				RelativePath=".\AudioPlayer.h"
 				>
@@ -359,10 +395,6 @@
 				RelativePath=".\BrowserCallHandler.h"
 				>
 			</File>
-			<File
-				RelativePath=".\ButtonListener.h"
-				>
-			</File>
 			<File
 				RelativePath=".\CameraController.h"
 				>
@@ -379,6 +411,10 @@
 				RelativePath=".\Enums.h"
 				>
 			</File>
+			<File
+				RelativePath=".\ErrorFunctions.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Globals.h"
 				>
@@ -423,6 +459,14 @@
 				RelativePath=".\resource.h"
 				>
 			</File>
+			<File
+				RelativePath=".\RotateButtonListener.h"
+				>
+			</File>
+			<File
+				RelativePath=".\StringFunctions.h"
+				>
+			</File>
 			<File
 				RelativePath=".\win32Defines.h"
 				>
@@ -471,6 +515,30 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Listeners"
+				>
+				<File
+					RelativePath=".\ButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\CameraButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\DeleteListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\GUDButtonListener.h"
+					>
+				</File>
+				<File
+					RelativePath=".\ModeSelectionListener.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"