diff --git a/include/collections/Array.h b/include/tlibc/collections/Array.h
similarity index 100%
rename from include/collections/Array.h
rename to include/tlibc/collections/Array.h
diff --git a/include/collections/HashMap.h b/include/tlibc/collections/HashMap.h
similarity index 100%
rename from include/collections/HashMap.h
rename to include/tlibc/collections/HashMap.h
diff --git a/include/collections/List.h b/include/tlibc/collections/List.h
similarity index 100%
rename from include/collections/List.h
rename to include/tlibc/collections/List.h
diff --git a/include/std.h b/include/tlibc/std.h
similarity index 100%
rename from include/std.h
rename to include/tlibc/std.h
diff --git a/include/string/StringBuilder.h b/include/tlibc/string/StringBuilder.h
similarity index 100%
rename from include/string/StringBuilder.h
rename to include/tlibc/string/StringBuilder.h
diff --git a/include/string/char.h b/include/tlibc/string/char.h
similarity index 100%
rename from include/string/char.h
rename to include/tlibc/string/char.h
diff --git a/include/string/cstr.h b/include/tlibc/string/cstr.h
similarity index 100%
rename from include/string/cstr.h
rename to include/tlibc/string/cstr.h
diff --git a/include/string/str.h b/include/tlibc/string/str.h
similarity index 100%
rename from include/string/str.h
rename to include/tlibc/string/str.h
diff --git a/src/collections/HashMap.c b/src/collections/HashMap.c
index c375691..d722a20 100755
--- a/src/collections/HashMap.c
+++ b/src/collections/HashMap.c
@@ -1,4 +1,4 @@
-#include "collections/HashMap.h"
+#include "tlibc/collections/HashMap.h"
 #include <assert.h>
 
 //TODO: sort bucket keys for binary search
diff --git a/src/collections/List.c b/src/collections/List.c
index 8247e7a..2c450d8 100755
--- a/src/collections/List.c
+++ b/src/collections/List.c
@@ -1,4 +1,4 @@
-#include "collections/List.h"
+#include "tlibc/collections/List.h"
 
 List List_alloc_size(u32 initial_size){
     if(initial_size == 0)
diff --git a/src/string/StringBuilder.c b/src/string/StringBuilder.c
index b13227e..28a50e1 100755
--- a/src/string/StringBuilder.c
+++ b/src/string/StringBuilder.c
@@ -1,4 +1,4 @@
-#include "string/StringBuilder.h"
+#include "tlibc/string/StringBuilder.h"
 
 void StringBuilder_destroy(StringBuilder* b){
     free(b->buffer.data);
diff --git a/src/string/cstr.c b/src/string/cstr.c
index b147eb2..bbd14ef 100755
--- a/src/string/cstr.c
+++ b/src/string/cstr.c
@@ -1,4 +1,4 @@
-#include "string/cstr.h"
+#include "tlibc/string/cstr.h"
 #include <stdarg.h>
 
 char* _strcat_malloc(size_t n, cstr str0, ...){
diff --git a/src/string/str.c b/src/string/str.c
index 83e7fec..83c0ab3 100755
--- a/src/string/str.c
+++ b/src/string/str.c
@@ -1,5 +1,5 @@
-#include "string/str.h"
-#include "string/StringBuilder.h"
+#include "tlibc/string/str.h"
+#include "tlibc/string/StringBuilder.h"
 
 str str_copy(str src){
     if(src.data == NULL || src.size == 0)