diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6baee4fdcb9e08613f84d971b980cd4f89655d79..75ad7037bace36ea74fa722eab71a4b32237dd82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,17 +30,15 @@ file(GLOB Vivy_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cc"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.cc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.c"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/*.cc"
 )
 file(GLOB Vivy_INC
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.hh"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/Document/*.hh"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/Ass/*.hh"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/UI/*.hh"
 )
 set(PROJECT_SOURCES
     ${Vivy_SRC}
diff --git a/src/Main.cc b/src/Main.cc
index a47f666cb968d8660d79a11b5ea67ce82d941b27..1fcc24a12a4beb33e5f79e3135b0eeb6894b3ebb 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -1,4 +1,3 @@
-#include "MainWindow.hh"
 #include "VivyApplication.hh"
 
 int
diff --git a/src/AudioVisualizer.cc b/src/UI/AudioVisualizer.cc
similarity index 98%
rename from src/AudioVisualizer.cc
rename to src/UI/AudioVisualizer.cc
index 79ac7a9333e12ab834aa950c5bfe8496ab55df16..b53c20d8c93734f23a08005c0727309527922814 100644
--- a/src/AudioVisualizer.cc
+++ b/src/UI/AudioVisualizer.cc
@@ -1,5 +1,5 @@
 #include "AudioVisualizer.hh"
-#include "AudioUtils.h"
+#include "../AudioUtils.h"
 
 #include <QGraphicsPixmapItem>
 #include <QLabel>
diff --git a/src/AudioVisualizer.hh b/src/UI/AudioVisualizer.hh
similarity index 100%
rename from src/AudioVisualizer.hh
rename to src/UI/AudioVisualizer.hh
diff --git a/src/DialogHelp.cc b/src/UI/DialogHelp.cc
similarity index 94%
rename from src/DialogHelp.cc
rename to src/UI/DialogHelp.cc
index f3e34eb171371e77f22379afe497ae1e09a7bff9..1eabd5c73d68bd6c479fec5db26206813c92f41a 100644
--- a/src/DialogHelp.cc
+++ b/src/UI/DialogHelp.cc
@@ -1,5 +1,5 @@
 #include "DialogHelp.hh"
-#include "VivyApplication.hh"
+#include "../VivyApplication.hh"
 
 #include <QWidget>
 #include <QLabel>
diff --git a/src/DialogHelp.hh b/src/UI/DialogHelp.hh
similarity index 100%
rename from src/DialogHelp.hh
rename to src/UI/DialogHelp.hh
diff --git a/src/MainWindow.cc b/src/UI/MainWindow.cc
similarity index 99%
rename from src/MainWindow.cc
rename to src/UI/MainWindow.cc
index 10d54bbaaf08428404ed5adaadc80862ec51c672..2a5c156656487825898715d6b03bb2ed367084dd 100644
--- a/src/MainWindow.cc
+++ b/src/UI/MainWindow.cc
@@ -1,8 +1,8 @@
 #include "MainWindow.hh"
 #include "DialogHelp.hh"
 #include "VivyDocumentView.hh"
-#include "Utils.hh"
-#include "VivyApplication.hh"
+#include "../Utils.hh"
+#include "../VivyApplication.hh"
 
 #include <functional>
 #include <optional>
diff --git a/src/MainWindow.hh b/src/UI/MainWindow.hh
similarity index 94%
rename from src/MainWindow.hh
rename to src/UI/MainWindow.hh
index 9beb57859c1d74b342eae9e66c947257af9b95cc..7947e04aa3f34777dee6ec1eda10bde46f0cbcd7 100644
--- a/src/MainWindow.hh
+++ b/src/UI/MainWindow.hh
@@ -5,9 +5,9 @@
 #error "This is a C++ header"
 #endif
 
-#include "Utils.hh"
+#include "../Utils.hh"
 #include "AudioVisualizer.hh"
-#include "Document/VivyDocumentStore.hh"
+#include "../Document/VivyDocumentStore.hh"
 #include "VivyDocumentView.hh"
 #include <QMainWindow>
 
diff --git a/src/TimingBar.cc b/src/UI/TimingBar.cc
similarity index 100%
rename from src/TimingBar.cc
rename to src/UI/TimingBar.cc
diff --git a/src/TimingBar.hh b/src/UI/TimingBar.hh
similarity index 100%
rename from src/TimingBar.hh
rename to src/UI/TimingBar.hh
diff --git a/src/TimingScene.cc b/src/UI/TimingScene.cc
similarity index 98%
rename from src/TimingScene.cc
rename to src/UI/TimingScene.cc
index 3d61703f7833f8d6fd3e87510e86b2627887ef9c..042149bd2c27427c35f64f3d82fa8e3f4046a9f7 100644
--- a/src/TimingScene.cc
+++ b/src/UI/TimingScene.cc
@@ -1,5 +1,5 @@
 #include "TimingScene.hh"
-#include "Utils.hh"
+#include "../Utils.hh"
 
 #include <QGraphicsLineItem>
 #include <QGraphicsPixmapItem>
diff --git a/src/TimingScene.hh b/src/UI/TimingScene.hh
similarity index 96%
rename from src/TimingScene.hh
rename to src/UI/TimingScene.hh
index a47560c1e9682bd4e2b3bceea2f29d6581c0e574..ed6742f95b9bbc8addb2c18016f0591c6bf0a53d 100644
--- a/src/TimingScene.hh
+++ b/src/UI/TimingScene.hh
@@ -1,8 +1,8 @@
 #ifndef VIVY_TIMING_SCENE_H
 #define VIVY_TIMING_SCENE_H
 
-#include "Utils.hh"
-#include "Ass/Ass.hh"
+#include "../Utils.hh"
+#include "../Ass/Ass.hh"
 #include "TimingBar.hh"
 
 #include <QWidget>
diff --git a/src/TimingView.cc b/src/UI/TimingView.cc
similarity index 100%
rename from src/TimingView.cc
rename to src/UI/TimingView.cc
diff --git a/src/TimingView.hh b/src/UI/TimingView.hh
similarity index 96%
rename from src/TimingView.hh
rename to src/UI/TimingView.hh
index bb64bc40232cf96feb3520fc51531c0f57def831..3358226c85aa09ca5516e89c82c2e9dffaac3c44 100644
--- a/src/TimingView.hh
+++ b/src/UI/TimingView.hh
@@ -5,7 +5,7 @@
 #error "This is a C++ header"
 #endif
 
-#include "Utils.hh"
+#include "../Utils.hh"
 #include "TimingBar.hh"
 #include "TimingScene.hh"
 
diff --git a/src/VivyDocumentView.cc b/src/UI/VivyDocumentView.cc
similarity index 98%
rename from src/VivyDocumentView.cc
rename to src/UI/VivyDocumentView.cc
index 9d731c5120bd4af53baa30f65f97b5bc86b07024..d9a0cc4c8e8ee992d688d4fc8dec50b198d0c294 100644
--- a/src/VivyDocumentView.cc
+++ b/src/UI/VivyDocumentView.cc
@@ -1,6 +1,6 @@
 #include "VivyDocumentView.hh"
 #include "AudioVisualizer.hh"
-#include "Document/VivyDocument.hh"
+#include "../Document/VivyDocument.hh"
 
 #include <QVBoxLayout>
 
diff --git a/src/VivyDocumentView.hh b/src/UI/VivyDocumentView.hh
similarity index 94%
rename from src/VivyDocumentView.hh
rename to src/UI/VivyDocumentView.hh
index 5bdd43f1b0e2c179ba85663e455f11d21fd4f337..89788e56e748ea8d02f4ed2146eeda27f119a749 100644
--- a/src/VivyDocumentView.hh
+++ b/src/UI/VivyDocumentView.hh
@@ -5,7 +5,7 @@
 #error "This is a C++ header"
 #endif
 
-#include "Document/VivyDocument.hh"
+#include "../Document/VivyDocument.hh"
 #include "AudioVisualizer.hh"
 
 #include <QWidget>
diff --git a/src/VivyApplication.cc b/src/VivyApplication.cc
index a5fe158a8d05d63de5eb02951c23334d222dcc72..5b23121370541f8427260fd27a3439c45f65a1bd 100644
--- a/src/VivyApplication.cc
+++ b/src/VivyApplication.cc
@@ -1,5 +1,5 @@
 #include "VivyApplication.hh"
-#include "MainWindow.hh"
+#include "UI/MainWindow.hh"
 
 using namespace Vivy;