diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6dbe79..7802310 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,10 @@ include(FetchContent)
 FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz)
 FetchContent_MakeAvailable(json)
 
-add_executable(htt main.cpp HyprlandService.cpp Workspace.cpp Client.cpp)
+add_executable(htt
+	src/main.cpp
+	src/HyprlandService.cpp
+	src/Workspace.cpp
+	src/Client.cpp)
 target_link_libraries(htt PRIVATE nlohmann_json::nlohmann_json)
 target_include_directories(htt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Client.h b/include/Client.h
similarity index 100%
rename from Client.h
rename to include/Client.h
diff --git a/HyprlandService.h b/include/HyprlandService.h
similarity index 100%
rename from HyprlandService.h
rename to include/HyprlandService.h
diff --git a/Workspace.h b/include/Workspace.h
similarity index 100%
rename from Workspace.h
rename to include/Workspace.h
diff --git a/Client.cpp b/src/Client.cpp
similarity index 97%
rename from Client.cpp
rename to src/Client.cpp
index 50d8838..2de0273 100644
--- a/Client.cpp
+++ b/src/Client.cpp
@@ -1,4 +1,4 @@
-#include "Client.h"
+#include "../include/Client.h"
 
 void from_json(const json& j, WorkspaceSignature& ws) {
   j.at("id").get_to(ws.id);
diff --git a/HyprlandService.cpp b/src/HyprlandService.cpp
similarity index 94%
rename from HyprlandService.cpp
rename to src/HyprlandService.cpp
index 822a697..9a501af 100644
--- a/HyprlandService.cpp
+++ b/src/HyprlandService.cpp
@@ -1,4 +1,4 @@
-#include "HyprlandService.h"
+#include "../include/HyprlandService.h"
 
 using json = nlohmann::json;
 
diff --git a/Workspace.cpp b/src/Workspace.cpp
similarity index 92%
rename from Workspace.cpp
rename to src/Workspace.cpp
index 828d399..28d08ee 100644
--- a/Workspace.cpp
+++ b/src/Workspace.cpp
@@ -1,4 +1,4 @@
-#include "Workspace.h"
+#include "../include/Workspace.h"
 
 void from_json(const nlohmann::json &j, Workspace &w) {
   j.at("id").get_to(w.id);
diff --git a/main.cpp b/src/main.cpp
similarity index 98%
rename from main.cpp
rename to src/main.cpp
index 94d524e..6b9b80d 100644
--- a/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "HyprlandService.h"
+#include "../include/HyprlandService.h"
 
 int main(int, char**){
   Workspace w = HyprlandService::getCurrentWorkspace();