diff --git a/src/gui/ctrl/window-locator.cpp b/src/gui/ctrl/window-locator.cpp
index 01d72feca..9dc8d7dda 100644
--- a/src/gui/ctrl/window-locator.cpp
+++ b/src/gui/ctrl/window-locator.cpp
@@ -30,7 +30,7 @@
 #include "gui/ctrl/global-ctx.hpp"
 #include "gui/ctrl/panel-locator.hpp"
 #include "gui/ctrl/window-locator.hpp"
-#include "gui/ctrl/elem-access-dir.hpp"
+#include "gui/interact/elem-access-dir.hpp"
 #include "gui/workspace/workspace-window.hpp"
 #include "lib/util.hpp"
 
diff --git a/src/gui/ctrl/elem-access-dir.hpp b/src/gui/interact/elem-access-dir.hpp
similarity index 100%
rename from src/gui/ctrl/elem-access-dir.hpp
rename to src/gui/interact/elem-access-dir.hpp
diff --git a/tests/gui/ctrl/element-access-test.cpp b/tests/gui/model/element-access-test.cpp
similarity index 100%
rename from tests/gui/ctrl/element-access-test.cpp
rename to tests/gui/model/element-access-test.cpp