diff --git a/gui/fsm.hpp b/gui/fsm.hpp
index 75fc169..a70c64f 100644
--- a/gui/fsm.hpp
+++ b/gui/fsm.hpp
@@ -9,8 +9,8 @@
 #include "gui/status_ui.hpp"
 #include "gui/loot_ui.hpp"
 #include "gui/boss_fight_ui.hpp"
-#include "map_view.hpp"
-#include "mini_map.hpp"
+#include "gui/map_view.hpp"
+#include "gui/mini_map.hpp"
 
 namespace gui {
   enum class State {
diff --git a/map_view.cpp b/gui/map_view.cpp
similarity index 100%
rename from map_view.cpp
rename to gui/map_view.cpp
diff --git a/map_view.hpp b/gui/map_view.hpp
similarity index 100%
rename from map_view.hpp
rename to gui/map_view.hpp
diff --git a/mini_map.cpp b/gui/mini_map.cpp
similarity index 100%
rename from mini_map.cpp
rename to gui/mini_map.cpp
diff --git a/mini_map.hpp b/gui/mini_map.hpp
similarity index 100%
rename from mini_map.hpp
rename to gui/mini_map.hpp
diff --git a/meson.build b/meson.build
index da2a8de..28bc46b 100644
--- a/meson.build
+++ b/meson.build
@@ -96,10 +96,12 @@ sources = [
   'gui/boss_fight_ui.cpp',
   'gui/combat_ui.cpp',
   'gui/debug_ui.cpp',
-  'gui/guecstra.cpp',
   'gui/fsm.cpp',
+  'gui/guecstra.cpp',
   'gui/loot_ui.cpp',
   'gui/main_ui.cpp',
+  'gui/map_view.cpp',
+  'gui/mini_map.cpp',
   'gui/overlay_ui.cpp',
   'gui/ritual_ui.cpp',
   'gui/status_ui.cpp',
@@ -107,10 +109,7 @@ sources = [
   'levelmanager.cpp',
   'lights.cpp',
   'map.cpp',
-  'map_view.cpp',
-  'matrix.cpp',
   'matrix.cpp',
-  'mini_map.cpp',
   'pathing.cpp',
   'rand.cpp',
   'raycaster.cpp',