27 files changed, 88 insertions, 110 deletions
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 212559c..1584479 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -1,16 +1,10 @@
 # Library
 
-add_library("ui"
-  "src/init.cpp"
-  "src/widgets/participant_editor.cpp"
-  "src/widgets/participant_row.cpp"
-  "src/widgets/preferences.cpp"
-  "src/widgets/turn_order_view.cpp"
-  "src/windows/tracker.cpp"
-  "src/windows/tracker/actions.cpp"
-  "src/windows/tracker/event_handlers.cpp"
-)
+file(GLOB_RECURSE UI_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src" CONFIGURE_DEPENDS "*.ui")
+file(GLOB_RECURSE UI_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "src/*.cpp")
+file(GLOB_RECURSE UI_TESTS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "tests/*.cpp")
 
+add_library("ui" ${UI_SOURCES})
 add_library("turns::ui" ALIAS "ui")
 
 target_compile_options("ui" PUBLIC
@@ -32,8 +26,6 @@ target_link_libraries("ui" PUBLIC
   "PkgConfig::gtkmm"
 )
 
-file(GLOB_RECURSE UI_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src" CONFIGURE_DEPENDS "**.ui")
-
 target_add_glib_resources("ui"
   PREFIX "/ch/arknet/Turns/"
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src"
@@ -46,14 +38,7 @@ enable_coverage("ui")
 
 get_target_property(TRANSLATIONS_BINARY_DIR "lang" BINARY_DIR)
 
-add_executable("ui-tests"
-  "tests/gtk_test_init.cpp"
-
-  "tests/widgets/participant_row.cpp"
-  "tests/widgets/participant_editor.cpp"
-  "tests/windows/resources.cpp"
-  "tests/windows/tracker.cpp"
-)
+add_executable("ui-tests" ${UI_TESTS})
 
 target_compile_definitions("ui-tests" PUBLIC
   "TESTLOCALEDIR=\"${TRANSLATIONS_BINARY_DIR}\""
diff --git a/ui/include/turns/ui/widgets/fwd.hpp b/ui/include/turns/ui/fwd.hpp
index 69f324d..69dc0b5 100644
--- a/ui/include/turns/ui/widgets/fwd.hpp
+++ b/ui/include/turns/ui/fwd.hpp
@@ -5,6 +5,8 @@ namespace turns::ui::widgets
 {
   struct participant_editor;
   struct participant_row;
+  struct preferences;
+  struct tracker;
   struct turn_order_view;
   struct preferences;
 }  // namespace turns::ui::widgets
diff --git a/ui/include/turns/ui/widgets/participant_editor.hpp b/ui/include/turns/ui/participant_editor.hpp
index 2fab47d..e2017fd 100644
--- a/ui/include/turns/ui/widgets/participant_editor.hpp
+++ b/ui/include/turns/ui/participant_editor.hpp
@@ -1,9 +1,9 @@
-#ifndef TURNS_UI_WIDGETS_PARTICIPANT_EDITOR_HPP
-#define TURNS_UI_WIDGETS_PARTICIPANT_EDITOR_HPP
+#ifndef TURNS_UI_PARTICIPANT_EDITOR_HPP
+#define TURNS_UI_PARTICIPANT_EDITOR_HPP
 
 #include "turns/core/disposition.hpp"
 #include "turns/core/fwd.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <sigc++/signal.h>
 
@@ -24,7 +24,7 @@
 
 #include <array>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
 
   struct ParticipantEditor : template_widget<ParticipantEditor, Adwaita::Dialog>
diff --git a/ui/include/turns/ui/widgets/participant_row.hpp b/ui/include/turns/ui/participant_row.hpp
index f33da34..dc72013 100644
--- a/ui/include/turns/ui/widgets/participant_row.hpp
+++ b/ui/include/turns/ui/participant_row.hpp
@@ -1,8 +1,8 @@
-#ifndef TURNS_UI_WIDGETS_PARTICIPANT_ROW_HPP
-#define TURNS_UI_WIDGETS_PARTICIPANT_ROW_HPP
+#ifndef TURNS_UI_PARTICIPANT_ROW_HPP
+#define TURNS_UI_PARTICIPANT_ROW_HPP
 
 #include "turns/core/fwd.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <glibmm/property.h>
 #include <glibmm/propertyproxy.h>
@@ -15,7 +15,7 @@
 
 #include <array>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   struct participant_row : template_widget<participant_row, Gtk::ListBoxRow>
   {
diff --git a/ui/include/turns/ui/widgets/preferences.hpp b/ui/include/turns/ui/preferences.hpp
index 2a56f0b..bf24274 100644
--- a/ui/include/turns/ui/widgets/preferences.hpp
+++ b/ui/include/turns/ui/preferences.hpp
@@ -1,7 +1,7 @@
-#ifndef TURNS_UI_WIDGETS_PREFERENCES_HPP
-#define TURNS_UI_WIDGETS_PREFERENCES_HPP
+#ifndef TURNS_UI_PREFERENCES_HPP
+#define TURNS_UI_PREFERENCES_HPP
 
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
@@ -16,7 +16,7 @@
 
 #include <array>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   struct preferences : template_widget<preferences, Adwaita::PreferencesPage>
   {
diff --git a/ui/include/turns/ui/widgets/template_widget.hpp b/ui/include/turns/ui/template_widget.hpp
index f04f331..7147560 100644
--- a/ui/include/turns/ui/widgets/template_widget.hpp
+++ b/ui/include/turns/ui/template_widget.hpp
@@ -1,5 +1,5 @@
-#ifndef TURNS_UI_WIDGETS_TEMPLATE_WIDGET_HPP
-#define TURNS_UI_WIDGETS_TEMPLATE_WIDGET_HPP
+#ifndef TURNS_UI_TEMPLATE_WIDGET_HPP
+#define TURNS_UI_TEMPLATE_WIDGET_HPP
 
 #include <glibmm/extraclassinit.h>
 #include <glibmm/ustring.h>
@@ -14,7 +14,7 @@
 #include <algorithm>
 #include <utility>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
 
   template<typename CustomWidgetType, typename BaseWidgetType>
diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/tracker.hpp
index 495f825..3bd631e 100644
--- a/ui/include/turns/ui/windows/tracker.hpp
+++ b/ui/include/turns/ui/tracker.hpp
@@ -1,8 +1,8 @@
-#ifndef TURNS_UI_WINDOWS_TRACKER_HPP
-#define TURNS_UI_WINDOWS_TRACKER_HPP
+#ifndef TURNS_UI_TRACKER_HPP
+#define TURNS_UI_TRACKER_HPP
 
 #include "turns/core/turn_order.hpp"
-#include "turns/ui/widgets/turn_order_view.hpp"
+#include "turns/ui/turn_order_view.hpp"
 
 #include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
@@ -29,7 +29,7 @@
 #include <exception>
 #include <string>
 
-namespace turns::ui::windows
+namespace turns::ui
 {
 
   struct tracker : Adwaita::ApplicationWindow
@@ -73,7 +73,7 @@ namespace turns::ui::windows
     Gtk::Button * m_start;
     Adwaita::WindowTitle * m_title;
     Glib::RefPtr<core::turn_order> m_turn_order;
-    widgets::turn_order_view * m_turn_order_view;
+    turn_order_view * m_turn_order_view;
     Glib::RefPtr<Gio::Settings> m_settings{};
     Glib::PropertyProxy<Glib::ustring> m_subtitle;
 
diff --git a/ui/include/turns/ui/widgets/turn_order_view.hpp b/ui/include/turns/ui/turn_order_view.hpp
index a9a3654..12a51eb 100644
--- a/ui/include/turns/ui/widgets/turn_order_view.hpp
+++ b/ui/include/turns/ui/turn_order_view.hpp
@@ -1,9 +1,9 @@
-#ifndef TURNS_UI_WIDGETS_TURN_ORDER_VIEW_HPP
-#define TURNS_UI_WIDGETS_TURN_ORDER_VIEW_HPP
+#ifndef TURNS_UI_TURN_ORDER_VIEW_HPP
+#define TURNS_UI_TURN_ORDER_VIEW_HPP
 
 #include "turns/core/fwd.hpp"
 #include "turns/core/turn_order.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <glibmm/object.h>
 #include <glibmm/refptr.h>
@@ -15,7 +15,7 @@
 
 #include <array>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   struct turn_order_view : template_widget<turn_order_view, Gtk::Box>
   {
diff --git a/ui/include/turns/ui/windows/fwd.hpp b/ui/include/turns/ui/windows/fwd.hpp
deleted file mode 100644
index 14dbfd1..0000000
--- a/ui/include/turns/ui/windows/fwd.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef TURNS_UI_WINDOWS_FWD_HPP
-#define TURNS_UI_WINDOWS_FWD_HPP
-
-namespace turns::ui::windows
-{
-  struct tracker;
-}  // namespace turns::ui::windows
-
-#endif
-\ No newline at end of file
diff --git a/ui/src/init.cpp b/ui/src/init.cpp
index 6139044..73bd909 100644
--- a/ui/src/init.cpp
+++ b/ui/src/init.cpp
@@ -1,19 +1,19 @@
 #include "turns/ui/init.hpp"
 
-#include "turns/ui/widgets/participant_editor.hpp"
-#include "turns/ui/widgets/participant_row.hpp"
-#include "turns/ui/widgets/preferences.hpp"
-#include "turns/ui/widgets/turn_order_view.hpp"
+#include "turns/ui/participant_editor.hpp"
+#include "turns/ui/participant_row.hpp"
+#include "turns/ui/preferences.hpp"
+#include "turns/ui/turn_order_view.hpp"
 
 namespace turns::ui
 {
 
   auto register_types() -> void
   {
-    static_cast<void>(widgets::ParticipantEditor{{}});
-    static_cast<void>(widgets::participant_row{{}});
-    static_cast<void>(widgets::preferences{{}});
-    static_cast<void>(widgets::turn_order_view{{}});
+    static_cast<void>(ParticipantEditor{{}});
+    static_cast<void>(participant_row{{}});
+    static_cast<void>(preferences{{}});
+    static_cast<void>(turn_order_view{{}});
   }
 
 }  // namespace turns::ui
 \ No newline at end of file
diff --git a/ui/src/widgets/participant_editor.cpp b/ui/src/participant_editor.cpp
index 816ad09..8598139 100644
--- a/ui/src/widgets/participant_editor.cpp
+++ b/ui/src/participant_editor.cpp
@@ -1,9 +1,9 @@
-#include "turns/ui/widgets/participant_editor.hpp"
+#include "turns/ui/participant_editor.hpp"
 
 #include "turns/core/disposition.hpp"
 #include "turns/core/participant.hpp"
 #include "turns/lang/messages.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <sigc++/functors/mem_fun.h>
 
@@ -31,12 +31,12 @@
 #include <memory>
 #include <ranges>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   namespace
   {
     auto constexpr static TYPE_NAME = "ParticipantEditor";
-    auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/participant_editor.ui";
+    auto constexpr static TEMPLATE = "/ch/arknet/Turns/participant_editor.ui";
   }  // namespace
 
   ParticipantEditor::ParticipantEditor(Glib::RefPtr<core::participant> participant)
@@ -136,4 +136,4 @@ namespace turns::ui::widgets
     item->set_child(*Gtk::make_managed<Gtk::Label>());
   }
 
-}  // namespace turns::ui::widgets
-\ No newline at end of file
+}  // namespace turns::ui
+\ No newline at end of file
diff --git a/ui/src/widgets/participant_editor.ui b/ui/src/participant_editor.ui
index 6bcf83e..6bcf83e 100644
--- a/ui/src/widgets/participant_editor.ui
+++ b/ui/src/participant_editor.ui
diff --git a/ui/src/widgets/participant_row.cpp b/ui/src/participant_row.cpp
index 6902a1c..b6d18a8 100644
--- a/ui/src/widgets/participant_row.cpp
+++ b/ui/src/participant_row.cpp
@@ -1,9 +1,9 @@
-#include "turns/ui/widgets/participant_row.hpp"
+#include "turns/ui/participant_row.hpp"
 
 #include "turns/core/disposition.hpp"
 #include "turns/core/participant.hpp"
 #include "turns/lang/messages.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <sigc++/functors/mem_fun.h>
 
@@ -24,12 +24,12 @@
 #include <format>
 #include <vector>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   namespace
   {
     auto constexpr static TYPE_NAME = "participant_row";
-    auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/participant_row.ui";
+    auto constexpr static TEMPLATE = "/ch/arknet/Turns/participant_row.ui";
 
     auto css_class_for(core::disposition value) -> Glib::ustring
     {
@@ -146,4 +146,4 @@ namespace turns::ui::widgets
     activate_action("win.edit", index);
   }
 
-}  // namespace turns::ui::widgets
-\ No newline at end of file
+}  // namespace turns::ui
+\ No newline at end of file
diff --git a/ui/src/widgets/participant_row.ui b/ui/src/participant_row.ui
index 1a215c6..1a215c6 100644
--- a/ui/src/widgets/participant_row.ui
+++ b/ui/src/participant_row.ui
diff --git a/ui/src/widgets/preferences.cpp b/ui/src/preferences.cpp
index 327860f..b521a25 100644
--- a/ui/src/widgets/preferences.cpp
+++ b/ui/src/preferences.cpp
@@ -1,7 +1,7 @@
-#include "turns/ui/widgets/preferences.hpp"
+#include "turns/ui/preferences.hpp"
 
 #include "turns/core/settings.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/functors/mem_fun.h>
@@ -23,12 +23,12 @@
 
 #include <gdkmm/rgba.h>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   namespace
   {
     auto constexpr static TYPE_NAME = "preferences";
-    auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/preferences.ui";
+    auto constexpr static TEMPLATE = "/ch/arknet/Turns/preferences.ui";
   }  // namespace
 
   preferences::preferences(Glib::RefPtr<Gio::Settings> settings)
diff --git a/ui/src/widgets/preferences.ui b/ui/src/preferences.ui
index 3831274..3831274 100644
--- a/ui/src/widgets/preferences.ui
+++ b/ui/src/preferences.ui
diff --git a/ui/src/windows/tracker.cpp b/ui/src/tracker.cpp
index 851d233..17aff89 100644
--- a/ui/src/windows/tracker.cpp
+++ b/ui/src/tracker.cpp
@@ -1,8 +1,8 @@
-#include "turns/ui/windows/tracker.hpp"
+#include "turns/ui/tracker.hpp"
 
 #include "turns/core/turn_order.hpp"
 #include "turns/lang/messages.hpp"
-#include "turns/ui/widgets/turn_order_view.hpp"
+#include "turns/ui/turn_order_view.hpp"
 
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/functors/mem_fun.h>
@@ -45,7 +45,7 @@
 #include <string>
 #include <utility>
 
-namespace turns::ui::windows
+namespace turns::ui
 {
 
   tracker::tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<Gio::Settings> settings)
@@ -57,7 +57,7 @@ namespace turns::ui::windows
       , m_start{builder->get_widget<Gtk::Button>("start")}
       , m_title{builder->get_widget<Adwaita::WindowTitle>("title")}
       , m_turn_order{core::turn_order::create()}
-      , m_turn_order_view{Gtk::make_managed<widgets::turn_order_view>(m_turn_order)}
+      , m_turn_order_view{Gtk::make_managed<turn_order_view>(m_turn_order)}
       , m_settings{std::move(settings)}
       , m_subtitle{m_title->property_subtitle()}
       , m_css{Gtk::CssProvider::create()}
diff --git a/ui/src/windows/tracker.ui b/ui/src/tracker.ui
index b875d10..b875d10 100644
--- a/ui/src/windows/tracker.ui
+++ b/ui/src/tracker.ui
diff --git a/ui/src/windows/tracker/actions.cpp b/ui/src/tracker/actions.cpp
index 54580ca..51642f8 100644
--- a/ui/src/windows/tracker/actions.cpp
+++ b/ui/src/tracker/actions.cpp
@@ -1,8 +1,8 @@
 #include "turns/core/participant.hpp"
 #include "turns/lang/messages.hpp"
-#include "turns/ui/widgets/participant_editor.hpp"
-#include "turns/ui/widgets/preferences.hpp"
-#include "turns/ui/windows/tracker.hpp"
+#include "turns/ui/participant_editor.hpp"
+#include "turns/ui/preferences.hpp"
+#include "turns/ui/tracker.hpp"
 
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/functors/mem_fun.h>
@@ -31,7 +31,7 @@
 
 #include <utility>
 
-namespace turns::ui::windows
+namespace turns::ui
 {
   namespace
   {
@@ -48,7 +48,7 @@ namespace turns::ui::windows
 
   auto tracker::add_participant() -> void
   {
-    auto dialog = Gtk::make_managed<widgets::ParticipantEditor>(nullptr);
+    auto dialog = Gtk::make_managed<ParticipantEditor>(nullptr);
     dialog->present(this);
     dialog->signal_finished().connect([this](auto n, auto p, auto d) { m_turn_order->add(n, p, d); });
   }
@@ -63,7 +63,7 @@ namespace turns::ui::windows
   {
     auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
     auto participant = m_turn_order->get_typed_object<core::participant>(index.get());
-    auto dialog = Gtk::make_managed<widgets::ParticipantEditor>(participant);
+    auto dialog = Gtk::make_managed<ParticipantEditor>(participant);
     dialog->present(this);
   }
 
@@ -76,7 +76,7 @@ namespace turns::ui::windows
 
   auto tracker::preferences() -> void
   {
-    auto preferences = Gtk::make_managed<widgets::preferences>(m_settings);
+    auto preferences = Gtk::make_managed<struct preferences>(m_settings);
     auto dialog = Gtk::make_managed<Adwaita::PreferencesDialog>();
     dialog->add(*preferences);
     dialog->set_visible_page(*preferences);
@@ -122,4 +122,4 @@ namespace turns::ui::windows
       m_turn_order->stop();
     });
   }
-}  // namespace turns::ui::windows
-\ No newline at end of file
+}  // namespace turns::ui
+\ No newline at end of file
diff --git a/ui/src/windows/tracker/event_handlers.cpp b/ui/src/tracker/event_handlers.cpp
index a3cf788..80664e4 100644
--- a/ui/src/windows/tracker/event_handlers.cpp
+++ b/ui/src/tracker/event_handlers.cpp
@@ -1,5 +1,5 @@
 #include "turns/lang/messages.hpp"
-#include "turns/ui/windows/tracker.hpp"
+#include "turns/ui/tracker.hpp"
 
 #include <sigc++/functors/mem_fun.h>
 
@@ -19,7 +19,7 @@
 #include <format>
 #include <string_view>
 
-namespace turns::ui::windows
+namespace turns::ui
 {
 
   auto tracker::on_load_content_done(Glib::RefPtr<Gio::AsyncResult> result) -> void
@@ -102,4 +102,4 @@ namespace turns::ui::windows
     update_colors();
   }
 
-}  // namespace turns::ui::windows
-\ No newline at end of file
+}  // namespace turns::ui
+\ No newline at end of file
diff --git a/ui/src/widgets/turn_order_view.cpp b/ui/src/turn_order_view.cpp
index 97f3834..2ab8bba 100644
--- a/ui/src/widgets/turn_order_view.cpp
+++ b/ui/src/turn_order_view.cpp
@@ -1,8 +1,8 @@
-#include "turns/ui/widgets/turn_order_view.hpp"
+#include "turns/ui/turn_order_view.hpp"
 
 #include "turns/core/participant.hpp"
-#include "turns/ui/widgets/participant_row.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/participant_row.hpp"
+#include "turns/ui/template_widget.hpp"
 
 #include <sigc++/functors/mem_fun.h>
 
@@ -19,12 +19,12 @@
 
 #include <memory>
 
-namespace turns::ui::widgets
+namespace turns::ui
 {
   namespace
   {
     auto constexpr static TYPE_NAME = "turn_order_view";
-    auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/turn_order_view.ui";
+    auto constexpr static TEMPLATE = "/ch/arknet/Turns/turn_order_view.ui";
   }  // namespace
 
   turn_order_view::turn_order_view(Glib::RefPtr<model_type> model)
@@ -48,7 +48,7 @@ namespace turns::ui::widgets
   auto turn_order_view::handle_create_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget *
   {
     auto participant = std::dynamic_pointer_cast<core::participant>(item);
-    auto row = Gtk::make_managed<widgets::participant_row>(participant);
+    auto row = Gtk::make_managed<participant_row>(participant);
 
     Glib::Binding::bind_property(m_model->is_running(),
                                  row->delete_enabled(),
diff --git a/ui/src/widgets/turn_order_view.ui b/ui/src/turn_order_view.ui
index d5a1006..d5a1006 100644
--- a/ui/src/widgets/turn_order_view.ui
+++ b/ui/src/turn_order_view.ui
diff --git a/ui/tests/widgets/participant_editor.cpp b/ui/tests/participant_editor.cpp
index 41ba5bd..d222598 100644
--- a/ui/tests/widgets/participant_editor.cpp
+++ b/ui/tests/participant_editor.cpp
@@ -1,4 +1,4 @@
-#include "turns/ui/widgets/participant_editor.hpp"
+#include "turns/ui/participant_editor.hpp"
 
 #include "turns/core/disposition.hpp"
 #include "turns/core/participant.hpp"
@@ -23,7 +23,7 @@
 #include <clocale>
 #include <memory>
 
-namespace turns::ui::widgets::tests
+namespace turns::ui::tests
 {
 
   TEST_CASE("A freshly constructed participant editor without a participant", "[windows]")
diff --git a/ui/tests/widgets/participant_row.cpp b/ui/tests/participant_row.cpp
index 491dcc8..5d89c42 100644
--- a/ui/tests/widgets/participant_row.cpp
+++ b/ui/tests/participant_row.cpp
@@ -1,4 +1,4 @@
-#include "turns/ui/widgets/participant_row.hpp"
+#include "turns/ui/participant_row.hpp"
 
 #include "turns/core/disposition.hpp"
 #include "turns/core/participant.hpp"
@@ -11,7 +11,7 @@
 
 #include <memory>
 
-namespace turns::ui::widgets::tests
+namespace turns::ui::tests
 {
 
   TEST_CASE("A freshly constructed participant row")
diff --git a/ui/tests/windows/resources.cpp b/ui/tests/resources.cpp
index 022f3c4..07c026a 100644
--- a/ui/tests/windows/resources.cpp
+++ b/ui/tests/resources.cpp
@@ -5,7 +5,7 @@
 
 TEST_CASE("GResource for tracker")
 {
-  auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui");
+  auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/tracker.ui");
 
   SECTION("can create Gtk.Builder for the tracker window UI definition")
   {
diff --git a/ui/tests/windows/tracker.cpp b/ui/tests/tracker.cpp
index 0f79000..4065a6b 100644
--- a/ui/tests/windows/tracker.cpp
+++ b/ui/tests/tracker.cpp
@@ -1,4 +1,4 @@
-#include "turns/ui/windows/tracker.hpp"
+#include "turns/ui/tracker.hpp"
 
 #include "turns/core/settings.hpp"
 #include "turns/lang/messages.hpp"
@@ -18,7 +18,7 @@
 
 #include <clocale>
 
-namespace turns::ui::windows::tests
+namespace turns::ui::tests
 {
 
   TEST_CASE("A freshly constructed tracker window", "[windows]")
@@ -26,7 +26,7 @@ namespace turns::ui::windows::tests
     auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8");
     setlocale(LC_ALL, locale);
 
-    auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui");
+    auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/tracker.ui");
     auto instance = Gtk::Builder::get_widget_derived<tracker>(builder, "tracker", core::get_settings());
 
     SECTION("was successfully constructed")
@@ -74,4 +74,4 @@ namespace turns::ui::windows::tests
     delete instance;
   }
 
-}  // namespace turns::ui::windows::tests
-\ No newline at end of file
+}  // namespace turns::ui::tests
+\ No newline at end of file
diff --git a/ui/ui.cmb b/ui/ui.cmb
index d042398..cd66243 100644
--- a/ui/ui.cmb
+++ b/ui/ui.cmb
@@ -2,9 +2,9 @@
 <!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
 <!-- Created with Cambalache 0.96.0 -->
 <cambalache-project version="0.96.0" target_tk="gtk-4.0">
-  <ui filename="src/windows/tracker.ui" sha256="42f969578c4270a07d66510c5694aea2f84dd44a8cd486a194d6c4441384b6c8"/>
-  <ui template-class="gtkmm__CustomObject_ParticipantEditor" filename="src/widgets/participant_editor.ui" sha256="175e5445abfe35525885929739b998e9b5d5379bc01dfbef798c52ef8870cf96"/>
-  <ui template-class="gtkmm__CustomObject_participant_row" filename="src/widgets/participant_row.ui" sha256="c807d84027f3c957b38b3aca21d13aa07bcf01ef4df3e1c3451eef098d6da046"/>
-  <ui template-class="gtkmm__CustomObject_turn_order_view" filename="src/widgets/turn_order_view.ui" sha256="d8b41adf9c578f70d7e94bde8983a22c73a861847e28f7b9e5665f44cdb05cbf"/>
-  <ui template-class="gtkmm__CustomObject_preferences" filename="src/widgets/preferences.ui" sha256="bc7c7622f9533cab9f10346406d6b8bf44a6d2dae0bbae0cee60aea7b7a85bab"/>
+  <ui filename="src/tracker.ui" sha256="42f969578c4270a07d66510c5694aea2f84dd44a8cd486a194d6c4441384b6c8"/>
+  <ui template-class="gtkmm__CustomObject_ParticipantEditor" filename="src/participant_editor.ui" sha256="175e5445abfe35525885929739b998e9b5d5379bc01dfbef798c52ef8870cf96"/>
+  <ui template-class="gtkmm__CustomObject_participant_row" filename="src/participant_row.ui" sha256="c807d84027f3c957b38b3aca21d13aa07bcf01ef4df3e1c3451eef098d6da046"/>
+  <ui template-class="gtkmm__CustomObject_turn_order_view" filename="src/turn_order_view.ui" sha256="d8b41adf9c578f70d7e94bde8983a22c73a861847e28f7b9e5665f44cdb05cbf"/>
+  <ui template-class="gtkmm__CustomObject_preferences" filename="src/preferences.ui" sha256="bc7c7622f9533cab9f10346406d6b8bf44a6d2dae0bbae0cee60aea7b7a85bab"/>
 </cambalache-project>