diff --git a/G3DTest.vcproj b/G3DTest.vcproj
index 3a5080f..ab76dd8 100644
--- a/G3DTest.vcproj
+++ b/G3DTest.vcproj
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include\DataModel&quot;;&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
@@ -247,10 +247,6 @@
 				RelativePath=".\src\source\ax.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\BaseButtonInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\BrowserCallHandler.cpp"
 				>
@@ -259,10 +255,6 @@
 				RelativePath=".\src\source\CameraController.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\DataModelInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\ErrorFunctions.cpp"
 				>
@@ -271,14 +263,6 @@
 				RelativePath=".\src\source\Globals.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\GroupInstance.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\GuiRootInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\IEBrowser.cpp"
 				>
@@ -287,18 +271,6 @@
 				RelativePath=".\src\source\IEDispatcher.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\ImageButtonInstance.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\Instance.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\source\LevelInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\main.cpp"
 				>
@@ -307,10 +279,6 @@
 				RelativePath=".\src\source\Mouse.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\PartInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\propertyGrid.cpp"
 				>
@@ -319,34 +287,18 @@
 				RelativePath=".\src\source\PropertyWindow.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\PVInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\StringFunctions.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\TextButtonInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\TextureHandler.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\ToggleImageButtonInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\source\WindowFunctions.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\source\WorkspaceInstance.cpp"
-				>
-			</File>
 			<Filter
 				Name="Tool"
 				>
@@ -395,6 +347,58 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="DataModel"
+				>
+				<File
+					RelativePath=".\src\source\DataModel\BaseButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\DataModelInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\GroupInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\GuiRootInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\ImageButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\Instance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\LevelInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\PartInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\PVInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\TextButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\ToggleImageButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\source\DataModel\WorkspaceInstance.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -412,10 +416,6 @@
 				RelativePath=".\src\include\ax.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\BaseButtonInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\BrowserCallHandler.h"
 				>
@@ -424,10 +424,6 @@
 				RelativePath=".\src\include\CameraController.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\DataModelInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\Enum.h"
 				>
@@ -444,14 +440,6 @@
 				RelativePath=".\src\include\Globals.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\GroupInstance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\GuiRootInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\IEBrowser.h"
 				>
@@ -460,26 +448,10 @@
 				RelativePath=".\src\include\IEDispatcher.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\ImageButtonInstance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\Instance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\include\LevelInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\Mouse.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\PartInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\propertyGrid.h"
 				>
@@ -488,10 +460,6 @@
 				RelativePath=".\src\include\PropertyWindow.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\PVInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\resource.h"
 				>
@@ -500,18 +468,10 @@
 				RelativePath=".\src\include\StringFunctions.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\TextButtonInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\TextureHandler.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\ToggleImageButtonInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\include\win32Defines.h"
 				>
@@ -520,10 +480,6 @@
 				RelativePath=".\src\include\WindowFunctions.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\include\WorkspaceInstance.h"
-				>
-			</File>
 			<Filter
 				Name="RapidXML"
 				>
@@ -592,6 +548,58 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="DataModel"
+				>
+				<File
+					RelativePath=".\src\include\DataModel\BaseButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\DataModelInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\GroupInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\GuiRootInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\ImageButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\Instance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\LevelInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\PartInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\PVInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\TextButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\ToggleImageButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\include\DataModel\WorkspaceInstance.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/src/include/BaseButtonInstance.h b/src/include/DataModel/BaseButtonInstance.h
similarity index 100%
rename from src/include/BaseButtonInstance.h
rename to src/include/DataModel/BaseButtonInstance.h
diff --git a/src/include/DataModelInstance.h b/src/include/DataModel/DataModelInstance.h
similarity index 100%
rename from src/include/DataModelInstance.h
rename to src/include/DataModel/DataModelInstance.h
diff --git a/src/include/GroupInstance.h b/src/include/DataModel/GroupInstance.h
similarity index 100%
rename from src/include/GroupInstance.h
rename to src/include/DataModel/GroupInstance.h
diff --git a/src/include/GuiRootInstance.h b/src/include/DataModel/GuiRootInstance.h
similarity index 100%
rename from src/include/GuiRootInstance.h
rename to src/include/DataModel/GuiRootInstance.h
diff --git a/src/include/ImageButtonInstance.h b/src/include/DataModel/ImageButtonInstance.h
similarity index 100%
rename from src/include/ImageButtonInstance.h
rename to src/include/DataModel/ImageButtonInstance.h
diff --git a/src/include/Instance.h b/src/include/DataModel/Instance.h
similarity index 100%
rename from src/include/Instance.h
rename to src/include/DataModel/Instance.h
diff --git a/src/include/LevelInstance.h b/src/include/DataModel/LevelInstance.h
similarity index 100%
rename from src/include/LevelInstance.h
rename to src/include/DataModel/LevelInstance.h
diff --git a/src/include/PVInstance.h b/src/include/DataModel/PVInstance.h
similarity index 100%
rename from src/include/PVInstance.h
rename to src/include/DataModel/PVInstance.h
diff --git a/src/include/PartInstance.h b/src/include/DataModel/PartInstance.h
similarity index 100%
rename from src/include/PartInstance.h
rename to src/include/DataModel/PartInstance.h
diff --git a/src/include/TextButtonInstance.h b/src/include/DataModel/TextButtonInstance.h
similarity index 100%
rename from src/include/TextButtonInstance.h
rename to src/include/DataModel/TextButtonInstance.h
diff --git a/src/include/ToggleImageButtonInstance.h b/src/include/DataModel/ToggleImageButtonInstance.h
similarity index 100%
rename from src/include/ToggleImageButtonInstance.h
rename to src/include/DataModel/ToggleImageButtonInstance.h
diff --git a/src/include/WorkspaceInstance.h b/src/include/DataModel/WorkspaceInstance.h
similarity index 100%
rename from src/include/WorkspaceInstance.h
rename to src/include/DataModel/WorkspaceInstance.h
diff --git a/src/source/BaseButtonInstance.cpp b/src/source/DataModel/BaseButtonInstance.cpp
similarity index 100%
rename from src/source/BaseButtonInstance.cpp
rename to src/source/DataModel/BaseButtonInstance.cpp
diff --git a/src/source/DataModelInstance.cpp b/src/source/DataModel/DataModelInstance.cpp
similarity index 100%
rename from src/source/DataModelInstance.cpp
rename to src/source/DataModel/DataModelInstance.cpp
diff --git a/src/source/GroupInstance.cpp b/src/source/DataModel/GroupInstance.cpp
similarity index 100%
rename from src/source/GroupInstance.cpp
rename to src/source/DataModel/GroupInstance.cpp
diff --git a/src/source/GuiRootInstance.cpp b/src/source/DataModel/GuiRootInstance.cpp
similarity index 100%
rename from src/source/GuiRootInstance.cpp
rename to src/source/DataModel/GuiRootInstance.cpp
diff --git a/src/source/ImageButtonInstance.cpp b/src/source/DataModel/ImageButtonInstance.cpp
similarity index 100%
rename from src/source/ImageButtonInstance.cpp
rename to src/source/DataModel/ImageButtonInstance.cpp
diff --git a/src/source/Instance.cpp b/src/source/DataModel/Instance.cpp
similarity index 100%
rename from src/source/Instance.cpp
rename to src/source/DataModel/Instance.cpp
diff --git a/src/source/LevelInstance.cpp b/src/source/DataModel/LevelInstance.cpp
similarity index 100%
rename from src/source/LevelInstance.cpp
rename to src/source/DataModel/LevelInstance.cpp
diff --git a/src/source/PVInstance.cpp b/src/source/DataModel/PVInstance.cpp
similarity index 100%
rename from src/source/PVInstance.cpp
rename to src/source/DataModel/PVInstance.cpp
diff --git a/src/source/PartInstance.cpp b/src/source/DataModel/PartInstance.cpp
similarity index 100%
rename from src/source/PartInstance.cpp
rename to src/source/DataModel/PartInstance.cpp
diff --git a/src/source/TextButtonInstance.cpp b/src/source/DataModel/TextButtonInstance.cpp
similarity index 100%
rename from src/source/TextButtonInstance.cpp
rename to src/source/DataModel/TextButtonInstance.cpp
diff --git a/src/source/ToggleImageButtonInstance.cpp b/src/source/DataModel/ToggleImageButtonInstance.cpp
similarity index 100%
rename from src/source/ToggleImageButtonInstance.cpp
rename to src/source/DataModel/ToggleImageButtonInstance.cpp
diff --git a/src/source/WorkspaceInstance.cpp b/src/source/DataModel/WorkspaceInstance.cpp
similarity index 100%
rename from src/source/WorkspaceInstance.cpp
rename to src/source/DataModel/WorkspaceInstance.cpp