Index: gui/imgui/button-imgui.cpp
===================================================================
--- gui/imgui/button-imgui.cpp	(revision 301c90acc8bb0ab81d5a848b74956cc61b6b1299)
+++ gui/imgui/button-imgui.cpp	(revision d255d52c76a1ef970df87204c3b18504d7ed2379)
@@ -1,6 +1,6 @@
 #include "button-imgui.hpp"
 
-#include "../IMGUI/imgui.h"
-#include "../IMGUI/imgui_internal.h" // For CalcItemSize
+#include "../../IMGUI/imgui.h"
+#include "../../IMGUI/imgui_internal.h" // For CalcItemSize
 
 ButtonImGui::ButtonImGui(string label) {
Index: i/imgui/ui-wdget.cpp
===================================================================
--- gui/imgui/ui-wdget.cpp	(revision 301c90acc8bb0ab81d5a848b74956cc61b6b1299)
+++ 	(revision )
@@ -1,12 +1,0 @@
-#include "ui-widget.hpp"
-
-UIWidget::~UIWidget() {
-}
-
-int UIWidget::getWidth() {
-   return width;
-}
-
-int UIWidget::getHeight() {
-   return height;
-}
Index: gui/imgui/ui-widget.cpp
===================================================================
--- gui/imgui/ui-widget.cpp	(revision d255d52c76a1ef970df87204c3b18504d7ed2379)
+++ gui/imgui/ui-widget.cpp	(revision d255d52c76a1ef970df87204c3b18504d7ed2379)
@@ -0,0 +1,12 @@
+#include "ui-widget.hpp"
+
+UIWidget::~UIWidget() {
+}
+
+int UIWidget::getWidth() {
+   return width;
+}
+
+int UIWidget::getHeight() {
+   return height;
+}
Index: makefile
===================================================================
--- makefile	(revision 301c90acc8bb0ab81d5a848b74956cc61b6b1299)
+++ makefile	(revision d255d52c76a1ef970df87204c3b18504d7ed2379)
@@ -60,15 +60,15 @@
 	$(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
 
-GUI_SRC_FILES = gui/screen.cpp gui/main-screen.cpp gui/game-screen.cpp gui/ui-element.cpp gui/button.cpp gui/panel.cpp
-GUI_HEADER_FILES = gui/screen.hpp gui/main-screen.hpp gui/game-screen.hpp gui/ui-element.hpp gui/button.hpp gui/panel.hpp gui/ui-value.hpp
+GUI_SRC_FILES = gui/imgui/button-imgui.cpp gui/imgui/ui-widget.cpp
+GUI_HEADER_FILES = gui/imgui/button-imgui.hpp gui/imgui/ui-widget.hpp
 
-vulkangame: SRC_FILES = main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp utils.cpp game-gui-sdl.cpp IMGUI/imgui_impl_sdl.cpp IMGUI/imgui_impl_vulkan.cpp $(IMGUI_FILES)
-vulkangame: HEADER_FILES = vulkan-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp utils.hpp game-gui-sdl.hpp game-gui.hpp graphics-pipeline_vulkan.hpp IMGUI/imgui_impl_sdl.h IMGUI/imgui_impl_vulkan.h
+vulkangame: SRC_FILES = main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp utils.cpp game-gui-sdl.cpp $(GUI_SRC_FILES) IMGUI/imgui_impl_sdl.cpp IMGUI/imgui_impl_vulkan.cpp $(IMGUI_FILES)
+vulkangame: HEADER_FILES = vulkan-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp utils.hpp game-gui-sdl.hpp game-gui.hpp graphics-pipeline_vulkan.hpp $(GUI_HEADER_FILES) IMGUI/imgui_impl_sdl.h IMGUI/imgui_impl_vulkan.h
 
 vulkangame: $(SRC_FILES) $(HEADER_FILES)
 	$(CC) $(CXX_FLAGS) -o $@ $(SRC_FILES) $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
 
-sdlgame: SRC_FILES = main-vulkan.cpp sdl-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp game-gui-sdl.cpp IMGUI/imgui_impl_sdl.cpp IMGUI/imgui_impl_vulkan.cpp $(IMGUI_FILES)
-sdlgame: HEADER_FILES = sdl-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp game-gui.hpp game-gui-sdl.hpp IMGUI/imgui_impl_sdl.h IMGUI/imgui_impl_vulkan.h
+sdlgame: SRC_FILES = main-vulkan.cpp sdl-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp game-gui-sdl.cpp $(GUI_SRC_FILES) IMGUI/imgui_impl_sdl.cpp IMGUI/imgui_impl_vulkan.cpp $(IMGUI_FILES)
+sdlgame: HEADER_FILES = sdl-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp game-gui.hpp game-gui-sdl.hpp $(GUI_HEADER_FILES) IMGUI/imgui_impl_sdl.h IMGUI/imgui_impl_vulkan.h
 
 sdlgame: $(SRC_FILES) $(HEADER_FILES)