Refactor DataModel

src/include/Application.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <G3DAll.h>
 #include "PropertyWindow.h"
-#include "TextButtonInstance.h"
-#include "ImageButtonInstance.h"
+#include "DataModel/TextButtonInstance.h"
+#include "DataModel/ImageButtonInstance.h"
 #include "CameraController.h"
 #include "IEBrowser.h"
 #include "Mouse.h"

src/include/CameraController.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <G3DAll.h>
-#include "Instance.h"
+#include "DataModel/Instance.h"
 #include "Globals.h"
 #include <string>
 

src/include/DataModel/BaseButtonInstance.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "instance.h"
+#include "Instance.h"
 #include "Listener/ButtonListener.h"
 
 class ButtonListener;

src/include/Globals.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "DataModelInstance.h"
+#include "DataModel/DataModelInstance.h"
 
 
 class Application;

src/include/Mouse.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "PartInstance.h"
+#include "DataModel/PartInstance.h"
 #pragma once
-#include "WorkspaceInstance.h"
+#include "DataModel/WorkspaceInstance.h"
 
 struct MousePoint{
 	Vector3 position;

src/include/PropertyWindow.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "Instance.h"
+#include "DataModel/Instance.h"
 
 class PropertyWindow {
 public: