28 files changed, 5 insertions, 5 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b43189c..06634b06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ file(GLOB opentrack-subprojects
     "protocol-*/${C}"
     "filter-*/${C}"
     "opentrack*/${C}"
-    "facetracknoir/${C}"
+    "gui/${C}"
     "x-plane-plugin/${C}"
     "csv/${C}"
     "pose-widget/${C}"
diff --git a/facetracknoir/CMakeLists.txt b/gui/CMakeLists.txt
index 51d0cea3..51d0cea3 100644
--- a/facetracknoir/CMakeLists.txt
+++ b/gui/CMakeLists.txt
diff --git a/facetracknoir/curve-config.cpp b/gui/curve-config.cpp
index 2e9065b4..2e9065b4 100644
--- a/facetracknoir/curve-config.cpp
+++ b/gui/curve-config.cpp
diff --git a/facetracknoir/curve-config.h b/gui/curve-config.h
index 0cbc7055..0cbc7055 100644
--- a/facetracknoir/curve-config.h
+++ b/gui/curve-config.h
diff --git a/facetracknoir/facetracknoir.ico b/gui/facetracknoir.ico
index 5cac8da1..5cac8da1 100644
--- a/facetracknoir/facetracknoir.ico
+++ b/gui/facetracknoir.ico
diff --git a/facetracknoir/facetracknoir.rc b/gui/facetracknoir.rc
index 020ffe97..020ffe97 100644
--- a/facetracknoir/facetracknoir.rc
+++ b/gui/facetracknoir.rc
diff --git a/facetracknoir/images/curves.png b/gui/images/curves.png
index 3f953a0a..3f953a0a 100644
--- a/facetracknoir/images/curves.png
+++ b/gui/images/curves.png
diff --git a/facetracknoir/images/facetracknoir.png b/gui/images/facetracknoir.png
index 85c06df6..85c06df6 100644
--- a/facetracknoir/images/facetracknoir.png
+++ b/gui/images/facetracknoir.png
diff --git a/facetracknoir/images/filter-16.png b/gui/images/filter-16.png
index ecde6a10..ecde6a10 100644
--- a/facetracknoir/images/filter-16.png
+++ b/gui/images/filter-16.png
diff --git a/facetracknoir/images/no-feed.png b/gui/images/no-feed.png
index 02aa227a..02aa227a 100644
--- a/facetracknoir/images/no-feed.png
+++ b/gui/images/no-feed.png
diff --git a/facetracknoir/images/settings16.png b/gui/images/settings16.png
index 3b31623b..3b31623b 100644
--- a/facetracknoir/images/settings16.png
+++ b/gui/images/settings16.png
diff --git a/facetracknoir/images/tools.png b/gui/images/tools.png
index 2da8f9f5..2da8f9f5 100644
--- a/facetracknoir/images/tools.png
+++ b/gui/images/tools.png
diff --git a/facetracknoir/keyboard.h b/gui/keyboard.h
index 62a9ce20..62a9ce20 100644
--- a/facetracknoir/keyboard.h
+++ b/gui/keyboard.h
diff --git a/facetracknoir/keyboard_listener.ui b/gui/keyboard_listener.ui
index b6977df0..b6977df0 100644
--- a/facetracknoir/keyboard_listener.ui
+++ b/gui/keyboard_listener.ui
diff --git a/facetracknoir/main.cpp b/gui/main.cpp
index a63fe54a..a63fe54a 100644
--- a/facetracknoir/main.cpp
+++ b/gui/main.cpp
diff --git a/facetracknoir/main.ui b/gui/main.ui
index ab63e832..ab63e832 100644
--- a/facetracknoir/main.ui
+++ b/gui/main.ui
diff --git a/facetracknoir/mapping.ui b/gui/mapping.ui
index 75c32e27..75c32e27 100644
--- a/facetracknoir/mapping.ui
+++ b/gui/mapping.ui
diff --git a/facetracknoir/new_config.ui b/gui/new_config.ui
index 27dce0f8..27dce0f8 100644
--- a/facetracknoir/new_config.ui
+++ b/gui/new_config.ui
diff --git a/facetracknoir/new_file_dialog.h b/gui/new_file_dialog.h
index 3a35cf71..3a35cf71 100644
--- a/facetracknoir/new_file_dialog.h
+++ b/gui/new_file_dialog.h
diff --git a/facetracknoir/options-dialog.cpp b/gui/options-dialog.cpp
index fef2b0ca..fef2b0ca 100644
--- a/facetracknoir/options-dialog.cpp
+++ b/gui/options-dialog.cpp
diff --git a/facetracknoir/options-dialog.hpp b/gui/options-dialog.hpp
index 3ef99d06..3ef99d06 100644
--- a/facetracknoir/options-dialog.hpp
+++ b/gui/options-dialog.hpp
diff --git a/facetracknoir/process_detector.cpp b/gui/process_detector.cpp
index 59a40f03..f9fa4b59 100644
--- a/facetracknoir/process_detector.cpp
+++ b/gui/process_detector.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "process_detector.h"
-#include "facetracknoir/ui.h"
+#include "ui.h"
 #include "opentrack-compat/process-list.hpp"
 #include <QList>
 #include <QFileDialog>
diff --git a/facetracknoir/process_detector.h b/gui/process_detector.h
index f6497c90..f6497c90 100644
--- a/facetracknoir/process_detector.h
+++ b/gui/process_detector.h
diff --git a/facetracknoir/process_widget.ui b/gui/process_widget.ui
index 19fe39da..63ad9472 100644
--- a/facetracknoir/process_widget.ui
+++ b/gui/process_widget.ui
@@ -113,7 +113,7 @@
   <customwidget>
    <class>FancyTable</class>
    <extends>QTableWidget</extends>
-   <header>facetracknoir/process_detector.h</header>
+   <header>process_detector.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/facetracknoir/settings.ui b/gui/settings.ui
index 92d275b6..e277b5d8 100644
--- a/facetracknoir/settings.ui
+++ b/gui/settings.ui
@@ -1068,7 +1068,7 @@
   <customwidget>
    <class>process_detector</class>
    <extends>QWidget</extends>
-   <header>facetracknoir/process_detector.h</header>
+   <header>process_detector.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/facetracknoir/ui-res.qrc b/gui/ui-res.qrc
index 030a6153..030a6153 100644
--- a/facetracknoir/ui-res.qrc
+++ b/gui/ui-res.qrc
diff --git a/facetracknoir/ui.cpp b/gui/ui.cpp
index d0a5e93c..5ea5dbfa 100644
--- a/facetracknoir/ui.cpp
+++ b/gui/ui.cpp
@@ -9,7 +9,7 @@
 #include "ui.h"
 #include "opentrack/tracker.h"
 #include "opentrack/options.hpp"
-#include "facetracknoir/new_file_dialog.h"
+#include "new_file_dialog.h"
 #include <QFileDialog>
 #include <QDesktopServices>
 
diff --git a/facetracknoir/ui.h b/gui/ui.h
index 91e4ebbf..91e4ebbf 100644
--- a/facetracknoir/ui.h
+++ b/gui/ui.h