diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33e1b1d..2c82250 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,8 @@ project(c0ding)
 
 set(CMAKE_CXX_STANDARD 20)
 
-file(GLOB_RECURSE HEADERS src/*.h)
 file(GLOB_RECURSE SOURCES src/*.cpp)
 
-add_library(c0ding SHARED ${HEADERS} ${SOURCES})
+add_library(c0ding SHARED ${SOURCES})
+
+target_include_directories(c0ding INTERFACE src/include)
diff --git a/src/algorithm/sort/heap.cpp b/src/algorithm/sort/heap.cpp
deleted file mode 100644
index 76763bc..0000000
--- a/src/algorithm/sort/heap.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "./heap.h"
-
-namespace c0ding::algorithm {}
\ No newline at end of file
diff --git a/src/algorithm/sort/radix.cpp b/src/algorithm/sort/radix.cpp
deleted file mode 100644
index a869a22..0000000
--- a/src/algorithm/sort/radix.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "./radix.h"
-
-namespace c0ding::algorithm {}
diff --git a/src/algorithm/sort/heap.h b/src/include/algorithm/sort/heap.h
similarity index 100%
rename from src/algorithm/sort/heap.h
rename to src/include/algorithm/sort/heap.h
diff --git a/src/algorithm/sort/merge.h b/src/include/algorithm/sort/merge.h
similarity index 100%
rename from src/algorithm/sort/merge.h
rename to src/include/algorithm/sort/merge.h
diff --git a/src/algorithm/sort/quick.h b/src/include/algorithm/sort/quick.h
similarity index 100%
rename from src/algorithm/sort/quick.h
rename to src/include/algorithm/sort/quick.h
diff --git a/src/algorithm/sort/radix.h b/src/include/algorithm/sort/radix.h
similarity index 100%
rename from src/algorithm/sort/radix.h
rename to src/include/algorithm/sort/radix.h
diff --git a/src/network/network.h b/src/include/network/network.h
similarity index 100%
rename from src/network/network.h
rename to src/include/network/network.h
diff --git a/src/string/string.h b/src/include/string/string.h
similarity index 100%
rename from src/string/string.h
rename to src/include/string/string.h
diff --git a/src/lib/algorithm/sort/heap.cpp b/src/lib/algorithm/sort/heap.cpp
new file mode 100644
index 0000000..072bec5
--- /dev/null
+++ b/src/lib/algorithm/sort/heap.cpp
@@ -0,0 +1,3 @@
+#include "../../../include/algorithm/sort/heap.h"
+
+namespace c0ding::algorithm {}
\ No newline at end of file
diff --git a/src/algorithm/sort/merge.cpp b/src/lib/algorithm/sort/merge.cpp
similarity index 89%
rename from src/algorithm/sort/merge.cpp
rename to src/lib/algorithm/sort/merge.cpp
index c5832e8..08ba92e 100644
--- a/src/algorithm/sort/merge.cpp
+++ b/src/lib/algorithm/sort/merge.cpp
@@ -1,4 +1,4 @@
-#include "./merge.h"
+#include "../../../include/algorithm/sort/merge.h"
 
 namespace c0ding::algorithm {
   template<class T>
diff --git a/src/algorithm/sort/quick.cpp b/src/lib/algorithm/sort/quick.cpp
similarity index 94%
rename from src/algorithm/sort/quick.cpp
rename to src/lib/algorithm/sort/quick.cpp
index 7c7e4a8..1cb7560 100644
--- a/src/algorithm/sort/quick.cpp
+++ b/src/lib/algorithm/sort/quick.cpp
@@ -1,4 +1,4 @@
-#include "./quick.h"
+#include "../../../include/algorithm/sort/quick.h"
 
 namespace c0ding::algorithm {
   template<class T>
diff --git a/src/lib/algorithm/sort/radix.cpp b/src/lib/algorithm/sort/radix.cpp
new file mode 100644
index 0000000..6e7bdcd
--- /dev/null
+++ b/src/lib/algorithm/sort/radix.cpp
@@ -0,0 +1,3 @@
+#include "../../../include/algorithm/sort/radix.h"
+
+namespace c0ding::algorithm {}
diff --git a/src/network/network.cpp b/src/lib/network/network.cpp
similarity index 67%
rename from src/network/network.cpp
rename to src/lib/network/network.cpp
index bb68f77..aae80ab 100644
--- a/src/network/network.cpp
+++ b/src/lib/network/network.cpp
@@ -1,4 +1,4 @@
-#include "network.h"
+#include "../../include/network/network.h"
 
 #include <iostream>
 
diff --git a/src/string/string.cpp b/src/lib/string/string.cpp
similarity index 98%
rename from src/string/string.cpp
rename to src/lib/string/string.cpp
index 63584dd..4ebc3fb 100644
--- a/src/string/string.cpp
+++ b/src/lib/string/string.cpp
@@ -1,4 +1,4 @@
-#include "./string.h" // NOLINT(modernize-deprecated-headers)
+#include "../../include/string/string.h" // NOLINT(modernize-deprecated-headers)
 
 namespace c0ding {
   string::string() {
diff --git a/src/library.h b/src/library.h
index dced775..bb9e7a3 100644
--- a/src/library.h
+++ b/src/library.h
@@ -4,7 +4,6 @@
 #define VERSION "1.0.0";
 
 #include <string>
-#include "network/network.h"
 
 namespace c0ding {
   void version();