restructure modules. make GuiModules depend on WindowModule

include/utils/GuiModule/GuiModule.h

@@ -2,7 +2,7 @@
 #undef GUIMODULE
 
 #include "utils/Module/Module.h"
-#include "utils/Window/Window.h"
+#include "modules/WindowModule/src/WindowModule.h"
 
 namespace Archimedes {
 
@@ -11,7 +11,10 @@ namespace Archimedes {
         public:
             typedef GuiModule* create_t(void*, App*);
 
-            GuiModule(void* h, App* a) : Module(h, a) {}
+            GuiModule(void* h, App* a) : Module(h, a) {
+                window = new WindowModule(nullptr, a);
+                deps["WindowModule"] = window;
+            }
             virtual ~GuiModule() { if(window) delete window; }
             virtual void onLoad() = 0;
             virtual void run() = 0;
@@ -20,7 +23,7 @@ namespace Archimedes {
             void createWindow() { window = new Window(); }
 
         protected:
-            Window* window;
+            WindowModule* window;
             //Renderer* renderer;
     };
 }