diff --git a/gui/combat_ui.cpp b/gui/combat_ui.cpp
index 3a95dde..ee4e285 100644
--- a/gui/combat_ui.cpp
+++ b/gui/combat_ui.cpp
@@ -2,7 +2,7 @@
 #include "constants.hpp"
 #include "rituals.hpp"
 #include <fmt/xchar.h>
-#include "guecstra.hpp"
+#include "gui/guecstra.hpp"
 
 namespace gui {
   using namespace guecs;
diff --git a/guecstra.cpp b/gui/guecstra.cpp
similarity index 94%
rename from guecstra.cpp
rename to gui/guecstra.cpp
index 915b8a1..de974be 100644
--- a/guecstra.cpp
+++ b/gui/guecstra.cpp
@@ -1,4 +1,4 @@
-#include "guecstra.hpp"
+#include "gui/guecstra.hpp"
 
 namespace guecs {
 
diff --git a/guecstra.hpp b/gui/guecstra.hpp
similarity index 100%
rename from guecstra.hpp
rename to gui/guecstra.hpp
diff --git a/gui/loot_ui.cpp b/gui/loot_ui.cpp
index bba8ff7..e0460a1 100644
--- a/gui/loot_ui.cpp
+++ b/gui/loot_ui.cpp
@@ -1,7 +1,7 @@
 #include "gui/loot_ui.hpp"
 #include "constants.hpp"
 #include <fmt/xchar.h>
-#include "guecstra.hpp"
+#include "gui/guecstra.hpp"
 
 namespace gui {
   using namespace guecs;
diff --git a/meson.build b/meson.build
index 50bb256..44bbd84 100644
--- a/meson.build
+++ b/meson.build
@@ -93,7 +93,16 @@ sources = [
   'dbc.cpp',
   'devices.cpp',
   'goap.cpp',
-  'guecstra.cpp',
+  'gui/boss_fight_ui.cpp',
+  'gui/combat_ui.cpp',
+  'gui/debug_ui.cpp',
+  'gui/guecstra.cpp',
+  'gui/gui_fsm.cpp',
+  'gui/loot_ui.cpp',
+  'gui/main_ui.cpp',
+  'gui/overlay_ui.cpp',
+  'gui/ritual_ui.cpp',
+  'gui/status_ui.cpp',
   'inventory.cpp',
   'levelmanager.cpp',
   'lights.cpp',
@@ -115,15 +124,6 @@ sources = [
   'systems.cpp',
   'textures.cpp',
   'tilemap.cpp',
-  'gui/boss_fight_ui.cpp',
-  'gui/loot_ui.cpp',
-  'gui/combat_ui.cpp',
-  'gui/debug_ui.cpp',
-  'gui/gui_fsm.cpp',
-  'gui/main_ui.cpp',
-  'gui/overlay_ui.cpp',
-  'gui/ritual_ui.cpp',
-  'gui/status_ui.cpp',
   'worldbuilder.cpp',
 ]