diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6acce80..76868e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,12 +4,18 @@ project(tstd C)
 set(CMAKE_C_STANDARD 23)
 
 add_library(tstd STATIC library.c
-        string.h
+        include/string.h
         string.c)
 
 
 add_executable(test_tstd test/test_main.c)
 target_link_libraries(test_tstd tstd)
 
+target_include_directories(tstd
+        PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+)
+
 enable_testing()
 add_test(NAME tstd_tests COMMAND test_tstd)
\ No newline at end of file
diff --git a/library.h b/include/library.h
similarity index 100%
rename from library.h
rename to include/library.h
diff --git a/string.h b/include/string.h
similarity index 100%
rename from string.h
rename to include/string.h
diff --git a/library.c b/library.c
index 2814686..20c8d1e 100644
--- a/library.c
+++ b/library.c
@@ -1,4 +1,4 @@
-#include "library.h"
+#include "include/library.h"
 
 #include <stdio.h>
 
diff --git a/string.c b/string.c
index b32ffb4..fe70b2a 100644
--- a/string.c
+++ b/string.c
@@ -1,4 +1,6 @@
-#include "string.h"
+#include  "include/string.h"
+#include <stdlib.h>
+#include <string.h>
 
 
 size_t str_count_occurrences(const char* str, const char c) {
diff --git a/test/test_main.c b/test/test_main.c
index 2502dd1..039d041 100644
--- a/test/test_main.c
+++ b/test/test_main.c
@@ -6,7 +6,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "../string.h"
+#include "../include/string.h"
 
 int test_count_occurrences() {
     const char* test_str = "11abababb111";