diff --git a/CMakeLists.txt b/CMakeLists.txt
index be0aff1bc436914e4957922d122ff070b32e2f95..2867edb1d364522b0a71f2329f4f2ef8d6b61fe2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ file(GLOB Vivy_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c"
 )
 file(GLOB Vivy_INC
-    "${CMAKE_CURRENT_SOURCE_DIR}/inc/Vivy/*.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h"
 )
 set(PROJECT_SOURCES
     ${Vivy_SRC}
diff --git a/src/AudioVisualizer.cc b/src/AudioVisualizer.cc
index 8de3f03ce05d8b200ee997ac2ddbe5144d45966d..a882eb270c1fa36e757faa9222ae33fa13d52776 100644
--- a/src/AudioVisualizer.cc
+++ b/src/AudioVisualizer.cc
@@ -1,4 +1,5 @@
-#include <Vivy/AudioVisualizer.h>
+#include "AudioVisualizer.h"
+#include "Timer.h"
 
 #include <QLabel>
 #include <QScrollArea>
diff --git a/inc/Vivy/AudioVisualizer.h b/src/AudioVisualizer.h
similarity index 92%
rename from inc/Vivy/AudioVisualizer.h
rename to src/AudioVisualizer.h
index 9b14e7b34541d99c62121d5e3a78eaa5525ac292..7929fe420873f0389983b42fca3a611c4a1fba4d 100644
--- a/inc/Vivy/AudioVisualizer.h
+++ b/src/AudioVisualizer.h
@@ -1,10 +1,9 @@
 #ifndef VIVY_AUDIOVISUALIZER_H
 #define VIVY_AUDIOVISUALIZER_H
 
+#include "Timer.h"
 #include <QWidget>
 
-#include <Vivy/Timer.h>
-
 class AudioVisualizer : public QWidget {
     Q_OBJECT
 
diff --git a/src/Main.cc b/src/Main.cc
index 22dc17c1fdab49f3ddbaf3b96985c97c62209d3a..92644d33564f18f7141f34292ae0f9d42a4b1916 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -1,4 +1,4 @@
-#include <Vivy/MainWindow.h>
+#include "MainWindow.h"
 #include <QApplication>
 
 int
diff --git a/src/MainWindow.cc b/src/MainWindow.cc
index af9926e185d31b19e2ba1d42ea48f01b0c23df00..7ac096d45605d8ed85073416752d19fc9479b9c4 100644
--- a/src/MainWindow.cc
+++ b/src/MainWindow.cc
@@ -1,4 +1,4 @@
-#include <Vivy/MainWindow.h>
+#include "MainWindow.h"
 
 #include <iostream>
 #include <cstring>
diff --git a/inc/Vivy/MainWindow.h b/src/MainWindow.h
similarity index 94%
rename from inc/Vivy/MainWindow.h
rename to src/MainWindow.h
index 91509b344f9622bcf4afbd88377107939e56230b..e2166b04168f94cbc7644e2b30c61a233ec08bdd 100644
--- a/inc/Vivy/MainWindow.h
+++ b/src/MainWindow.h
@@ -1,8 +1,8 @@
 #ifndef VIVY_MAINWINDOW_H
 #define VIVY_MAINWINDOW_H
 
+#include "AudioVisualizer.h"
 #include <QMainWindow>
-#include <Vivy/AudioVisualizer.h>
 
 class QMenu;
 class QAction;
diff --git a/src/Timer.cc b/src/Timer.cc
index b964c9530b5c3ebb5c20c32defdb82c8020255d4..de7dadf347e2f60e85c3a82f9c89062335f10809 100644
--- a/src/Timer.cc
+++ b/src/Timer.cc
@@ -1,4 +1,4 @@
-#include <Vivy/Timer.h>
+#include "Timer.h"
 
 #include <QLabel>
 #include <QGraphicsLineItem>
diff --git a/inc/Vivy/Timer.h b/src/Timer.h
similarity index 95%
rename from inc/Vivy/Timer.h
rename to src/Timer.h
index 7bc6d473a5216009a28c7640319947c8a8905808..2d0d93bde8e85e08d387d2faf4af7d989694839b 100644
--- a/inc/Vivy/Timer.h
+++ b/src/Timer.h
@@ -1,13 +1,13 @@
 #ifndef VIVY_TIMER_H
 #define VIVY_TIMER_H
 
+#include "TimingBar.h"
+
 #include <QWidget>
 #include <QColor>
 #include <QVector>
 #include <QGraphicsView>
 
-#include <Vivy/TimingBar.h>
-
 class QGraphicsPixmapItem;
 
 class Timer final : public QGraphicsView {
diff --git a/src/TimingBar.cc b/src/TimingBar.cc
index a650270669bbaaa530225542676c98c87174098f..3c98a0b4f0857f84b1256b2be29c7f4b19795c56 100644
--- a/src/TimingBar.cc
+++ b/src/TimingBar.cc
@@ -1,4 +1,4 @@
-#include <Vivy/TimingBar.h>
+#include "TimingBar.h"
 
 #include <QLabel>
 #include <QScrollArea>
diff --git a/inc/Vivy/TimingBar.h b/src/TimingBar.h
similarity index 100%
rename from inc/Vivy/TimingBar.h
rename to src/TimingBar.h