diff --git a/modules/TestClay/src/TestClay.cpp b/modules/GUImodules/TestClay/src/TestClay.cpp
similarity index 100%
rename from modules/TestClay/src/TestClay.cpp
rename to modules/GUImodules/TestClay/src/TestClay.cpp
diff --git a/modules/TestClay/src/TestClay.h b/modules/GUImodules/TestClay/src/TestClay.h
similarity index 100%
rename from modules/TestClay/src/TestClay.h
rename to modules/GUImodules/TestClay/src/TestClay.h
diff --git a/modules/TestImgui/src/TestImgui.cpp b/modules/GUImodules/TestImgui/src/TestImgui.cpp
similarity index 100%
rename from modules/TestImgui/src/TestImgui.cpp
rename to modules/GUImodules/TestImgui/src/TestImgui.cpp
diff --git a/modules/TestImgui/src/TestImgui.h b/modules/GUImodules/TestImgui/src/TestImgui.h
similarity index 100%
rename from modules/TestImgui/src/TestImgui.h
rename to modules/GUImodules/TestImgui/src/TestImgui.h
diff --git a/src/GuiModule.h b/src/GuiModule.h
index 3b2f81f..b799f01 100644
--- a/src/GuiModule.h
+++ b/src/GuiModule.h
@@ -2,15 +2,22 @@
 #define GUIMODULE_H
 
 #include "Module.h"
+#include "Window/Window.h"
 
 class GuiModule : Module {
 
     public:
         typedef GuiModule* create_t();
-        typedef void destroy_t(GuiModule*);
 
+        GuiModule(void* h, App& a) : Module(h, a) {
+            deps["Window"] = "";
+        }
         virtual ~GuiModule() {}
+        virtual void load() = 0;
         virtual void run() = 0;
+
+    private:
+        Window window;
 };
 
 
diff --git a/modules/Window/src/Renderer/Renderer.h b/utils/Renderer/Renderer.h
similarity index 100%
rename from modules/Window/src/Renderer/Renderer.h
rename to utils/Renderer/Renderer.h
diff --git a/modules/Window/src/Renderer/RendererOpenGL/RendererOpenGL.cpp b/utils/Renderer/RendererOpenGL/RendererOpenGL.cpp
similarity index 100%
rename from modules/Window/src/Renderer/RendererOpenGL/RendererOpenGL.cpp
rename to utils/Renderer/RendererOpenGL/RendererOpenGL.cpp
diff --git a/modules/Window/src/Renderer/RendererOpenGL/RendererOpenGL.h b/utils/Renderer/RendererOpenGL/RendererOpenGL.h
similarity index 100%
rename from modules/Window/src/Renderer/RendererOpenGL/RendererOpenGL.h
rename to utils/Renderer/RendererOpenGL/RendererOpenGL.h
diff --git a/modules/Window/src/WindowImpl/GLFW/windowGLFW.cpp b/utils/Window/GLFW/windowGLFW.cpp
similarity index 100%
rename from modules/Window/src/WindowImpl/GLFW/windowGLFW.cpp
rename to utils/Window/GLFW/windowGLFW.cpp
diff --git a/modules/Window/src/WindowImpl/GLFW/windowGLFW.h b/utils/Window/GLFW/windowGLFW.h
similarity index 77%
rename from modules/Window/src/WindowImpl/GLFW/windowGLFW.h
rename to utils/Window/GLFW/windowGLFW.h
index ef60d5c..59fa488 100644
--- a/modules/Window/src/WindowImpl/GLFW/windowGLFW.h
+++ b/utils/Window/GLFW/windowGLFW.h
@@ -1,10 +1,10 @@
-#include "Archimedes.h"
+#include "Window/Window.h"
 
 #define GLEW_STATIC
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
 
-class Window {
+class WindowGLFW : public Window {
 
     public:
     
diff --git a/utils/Window/Window.h b/utils/Window/Window.h
new file mode 100644
index 0000000..a5b6b34
--- /dev/null
+++ b/utils/Window/Window.h
@@ -0,0 +1,13 @@
+#include "Archimedes.h"
+
+class Window {
+
+    public:
+    
+        virtual ~Window() {};
+
+        virtual bool shouldClose() = 0;
+
+        virtual void doFrame() = 0;
+
+};