diff --git a/deps/date/CMakeLists.txt b/deps/date/CMakeLists.txt
index 193eb67..23b1e50 100644
--- a/deps/date/CMakeLists.txt
+++ b/deps/date/CMakeLists.txt
@@ -14,5 +14,6 @@ FetchContent_MakeAvailable(date)
 target_include_directories(
     ${PROJECT_NAME}
     INTERFACE
-    ${date_SOURCE_DIR}/include
+    $<BUILD_INTERFACE:${date_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:${date_SOURCE_DIR}/include>
 )
diff --git a/include/B-luga/Maths/CMakeLists.txt b/include/B-luga/Maths/CMakeLists.txt
deleted file mode 100644
index f37deb6..0000000
--- a/include/B-luga/Maths/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-target_include_directories(
-    ${PROJECT_NAME_CLIENT}
-    PRIVATE
-        .
-)
-
-target_include_directories(
-    ${PROJECT_NAME_SERVER}
-    PRIVATE
-        .
-)
diff --git a/include/B-luga/Plugins/CMakeLists.txt b/include/B-luga/Plugins/CMakeLists.txt
deleted file mode 100644
index 29ff85d..0000000
--- a/include/B-luga/Plugins/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-add_subdirectory(Graphics)
-add_subdirectory(Systems)
diff --git a/include/B-luga/Plugins/Graphics/CMakeLists.txt b/include/B-luga/Plugins/Graphics/CMakeLists.txt
deleted file mode 100644
index e29c3e9..0000000
--- a/include/B-luga/Plugins/Graphics/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-target_include_directories(
-    ${PROJECT_NAME_CLIENT}
-    PRIVATE
-        .
-)
-
-add_subdirectory(Raylib)
diff --git a/include/B-luga/Plugins/Graphics/Raylib/Audio/CMakeLists.txt b/include/B-luga/Plugins/Graphics/Raylib/Audio/CMakeLists.txt
deleted file mode 100644
index b407613..0000000
--- a/include/B-luga/Plugins/Graphics/Raylib/Audio/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-target_include_directories(
-    ${PROJECT_NAME_CLIENT}
-    PRIVATE
-        .
-)
-
diff --git a/include/B-luga/Plugins/Graphics/Raylib/CMakeLists.txt b/include/B-luga/Plugins/Graphics/Raylib/CMakeLists.txt
deleted file mode 100644
index 5264e06..0000000
--- a/include/B-luga/Plugins/Graphics/Raylib/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-target_include_directories(
-    ${PROJECT_NAME_CLIENT}
-    PRIVATE
-        .
-)
-
-add_subdirectory(Geometry)
-add_subdirectory(Graphics)
-add_subdirectory(Audio)
-add_subdirectory(Events)
diff --git a/include/B-luga/Plugins/Graphics/Raylib/Events/CMakeLists.txt b/include/B-luga/Plugins/Graphics/Raylib/Events/CMakeLists.txt
deleted file mode 100644
index f665fcf..0000000
--- a/include/B-luga/Plugins/Graphics/Raylib/Events/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-target_include_directories(
-    ${PROJECT_NAME_CLIENT}
-    PRIVATE
-        .
-)
diff --git a/include/B-luga/Plugins/Graphics/Raylib/Geometry/CMakeLists.txt b/include/B-luga/Plugins/Graphics/Raylib/Geometry/CMakeLists.txt
deleted file mode 100644
index b407613..0000000
--- a/include/B-luga/Plugins/Graphics/Raylib/Geometry/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-target_include_directories(
-    ${PROJECT_NAME_CLIENT}
-    PRIVATE
-        .
-)
-
diff --git a/include/B-luga/Plugins/Graphics/Raylib/Graphics/CMakeLists.txt b/include/B-luga/Plugins/Graphics/Raylib/Graphics/CMakeLists.txt
deleted file mode 100644
index b407613..0000000
--- a/include/B-luga/Plugins/Graphics/Raylib/Graphics/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-target_include_directories(
-    ${PROJECT_NAME_CLIENT}
-    PRIVATE
-        .
-)
-
diff --git a/include/B-luga/Plugins/Systems/CMakeLists.txt b/include/B-luga/Plugins/Systems/CMakeLists.txt
deleted file mode 100644
index f37deb6..0000000
--- a/include/B-luga/Plugins/Systems/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-target_include_directories(
-    ${PROJECT_NAME_CLIENT}
-    PRIVATE
-        .
-)
-
-target_include_directories(
-    ${PROJECT_NAME_SERVER}
-    PRIVATE
-        .
-)
diff --git a/include/B-luga/SystemManagers/CMakeLists.txt b/include/B-luga/SystemManagers/CMakeLists.txt
deleted file mode 100644
index 3a7b4ca..0000000
--- a/include/B-luga/SystemManagers/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-target_include_directories(
-    ${PROJECT_NAME_CLIENT}
-    PRIVATE
-        .
-)
-
-target_include_directories(
-    ${PROJECT_NAME_SERVER}
-    PRIVATE
-        .
-)
-