diff --git a/lang/cem/libcc.ansi/build.lua b/lang/cem/libcc.ansi/build.lua
index 27704f208..25011e729 100644
--- a/lang/cem/libcc.ansi/build.lua
+++ b/lang/cem/libcc.ansi/build.lua
@@ -33,6 +33,7 @@ for _, plat in ipairs(vars.plats) do
 		srcs = {
 			"+ctype_files",
 			"+ctype_tab",
+			"./src/core/*.c",
 			"./ctype/*.c",
 			"./errno/*.c",
 			"./locale/*.c",
diff --git a/lang/cem/libcc.ansi/string/strerror.c b/lang/cem/libcc.ansi/errno/strerror.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strerror.c
rename to lang/cem/libcc.ansi/errno/strerror.c
diff --git a/lang/cem/libcc.ansi/string/memchr.c b/lang/cem/libcc.ansi/src/core/memchr.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/memchr.c
rename to lang/cem/libcc.ansi/src/core/memchr.c
diff --git a/lang/cem/libcc.ansi/string/memcmp.c b/lang/cem/libcc.ansi/src/core/memcmp.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/memcmp.c
rename to lang/cem/libcc.ansi/src/core/memcmp.c
diff --git a/lang/cem/libcc.ansi/string/memcpy.c b/lang/cem/libcc.ansi/src/core/memcpy.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/memcpy.c
rename to lang/cem/libcc.ansi/src/core/memcpy.c
diff --git a/lang/cem/libcc.ansi/string/memmove.c b/lang/cem/libcc.ansi/src/core/memmove.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/memmove.c
rename to lang/cem/libcc.ansi/src/core/memmove.c
diff --git a/lang/cem/libcc.ansi/string/memset.c b/lang/cem/libcc.ansi/src/core/memset.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/memset.c
rename to lang/cem/libcc.ansi/src/core/memset.c
diff --git a/lang/cem/libcc.ansi/string/strcat.c b/lang/cem/libcc.ansi/src/core/strcat.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strcat.c
rename to lang/cem/libcc.ansi/src/core/strcat.c
diff --git a/lang/cem/libcc.ansi/string/strchr.c b/lang/cem/libcc.ansi/src/core/strchr.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strchr.c
rename to lang/cem/libcc.ansi/src/core/strchr.c
diff --git a/lang/cem/libcc.ansi/string/strcmp.c b/lang/cem/libcc.ansi/src/core/strcmp.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strcmp.c
rename to lang/cem/libcc.ansi/src/core/strcmp.c
diff --git a/lang/cem/libcc.ansi/string/strcoll.c b/lang/cem/libcc.ansi/src/core/strcoll.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strcoll.c
rename to lang/cem/libcc.ansi/src/core/strcoll.c
diff --git a/lang/cem/libcc.ansi/string/strcpy.c b/lang/cem/libcc.ansi/src/core/strcpy.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strcpy.c
rename to lang/cem/libcc.ansi/src/core/strcpy.c
diff --git a/lang/cem/libcc.ansi/string/strcspn.c b/lang/cem/libcc.ansi/src/core/strcspn.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strcspn.c
rename to lang/cem/libcc.ansi/src/core/strcspn.c
diff --git a/lang/cem/libcc.ansi/string/strdup.c b/lang/cem/libcc.ansi/src/core/strdup.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strdup.c
rename to lang/cem/libcc.ansi/src/core/strdup.c
diff --git a/lang/cem/libcc.ansi/string/strlen.c b/lang/cem/libcc.ansi/src/core/strlen.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strlen.c
rename to lang/cem/libcc.ansi/src/core/strlen.c
diff --git a/lang/cem/libcc.ansi/string/strncat.c b/lang/cem/libcc.ansi/src/core/strncat.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strncat.c
rename to lang/cem/libcc.ansi/src/core/strncat.c
diff --git a/lang/cem/libcc.ansi/string/strncmp.c b/lang/cem/libcc.ansi/src/core/strncmp.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strncmp.c
rename to lang/cem/libcc.ansi/src/core/strncmp.c
diff --git a/lang/cem/libcc.ansi/string/strncpy.c b/lang/cem/libcc.ansi/src/core/strncpy.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strncpy.c
rename to lang/cem/libcc.ansi/src/core/strncpy.c
diff --git a/lang/cem/libcc.ansi/string/strpbrk.c b/lang/cem/libcc.ansi/src/core/strpbrk.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strpbrk.c
rename to lang/cem/libcc.ansi/src/core/strpbrk.c
diff --git a/lang/cem/libcc.ansi/string/strrchr.c b/lang/cem/libcc.ansi/src/core/strrchr.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strrchr.c
rename to lang/cem/libcc.ansi/src/core/strrchr.c
diff --git a/lang/cem/libcc.ansi/string/strspn.c b/lang/cem/libcc.ansi/src/core/strspn.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strspn.c
rename to lang/cem/libcc.ansi/src/core/strspn.c
diff --git a/lang/cem/libcc.ansi/string/strstr.c b/lang/cem/libcc.ansi/src/core/strstr.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strstr.c
rename to lang/cem/libcc.ansi/src/core/strstr.c
diff --git a/lang/cem/libcc.ansi/string/strtok.c b/lang/cem/libcc.ansi/src/core/strtok.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strtok.c
rename to lang/cem/libcc.ansi/src/core/strtok.c
diff --git a/lang/cem/libcc.ansi/string/strxfrm.c b/lang/cem/libcc.ansi/src/core/strxfrm.c
similarity index 100%
rename from lang/cem/libcc.ansi/string/strxfrm.c
rename to lang/cem/libcc.ansi/src/core/strxfrm.c
diff --git a/lang/cem/libcc.ansi/string/LIST b/lang/cem/libcc.ansi/string/LIST
deleted file mode 100644
index 5f594fd11..000000000
--- a/lang/cem/libcc.ansi/string/LIST
+++ /dev/null
@@ -1,22 +0,0 @@
-memchr.c
-memcmp.c
-memcpy.c
-memmove.c
-memset.c
-strcat.c
-strchr.c
-strcmp.c
-strcoll.c
-strcpy.c
-strcspn.c
-strerror.c
-strncat.c
-strncpy.c
-strrchr.c
-strstr.c
-strlen.c
-strtok.c
-strpbrk.c
-strspn.c
-strncmp.c
-strxfrm.c
diff --git a/lang/cem/libcc.ansi/string/Makefile b/lang/cem/libcc.ansi/string/Makefile
deleted file mode 100644
index f6263807f..000000000
--- a/lang/cem/libcc.ansi/string/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-clean:
-	rm -f memchr.o memcmp.o memcpy.o memmove.o memset.o strcat.o \
-		strchr.o strcmp.o strcoll.o strcpy.o strcspn.o strerror.o \
-		strncat.o strncpy.o strrchr.o strstr.o strlen.o strtok.o \
-		strpbrk.o strspn.o strncmp.o strxfrm.o OLIST