diff --git a/reactos/lib/sdk/crt/crt.rbuild b/reactos/lib/sdk/crt/crt.rbuild
index ec077753e44..b7ff3da6495 100644
--- a/reactos/lib/sdk/crt/crt.rbuild
+++ b/reactos/lib/sdk/crt/crt.rbuild
@@ -120,13 +120,16 @@
 		<file>asin.c</file>
 		<file>cabs.c</file>
 		<file>cosh.c</file>
+		<file>div.c</file>
 		<file>frexp.c</file>
 		<file>huge_val.c</file>
 		<file>hypot.c</file>
 		<file>j0_y0.c</file>
 		<file>j1_y1.c</file>
 		<file>jn_yn.c</file>
+		<file>ldiv.c</file>
 		<file>modf.c</file>
+		<file>rand.c</file>
 		<file>s_modf.c</file>
 		<file>sinh.c</file>
 		<file>stubs.c</file>
@@ -205,6 +208,26 @@
 		<file>mbstrlen.c</file>
 		<file>mbsupr.c</file>
 	</directory>
+
+	<directory name="mem">
+		<if property="ARCH" value="i386">
+			<directory name="i386">
+				<file>memchr_asm.s</file>
+				<file>memcpy_asm.s</file>
+				<file>memmove_asm.s</file>
+				<file>memset_asm.s</file>
+			</directory>
+		</if>
+		<ifnot property="ARCH" value="i386">
+			<file>memchr.c</file>
+			<file>memcpy.c</file>
+			<file>memmove.c</file>
+			<file>memset.c</file>
+		</ifnot>
+		<file>memcmp.c</file>
+		<file>memicmp.c</file>
+	</directory>
+
 	<directory name="misc">
 		<file>amsg.c</file>
 		<file>assert.c</file>
@@ -321,8 +344,6 @@
 		<file>_exit.c</file>
 		<file>abort.c</file>
 		<file>atexit.c</file>
-		<file>atof.c</file>
-		<file>div.c</file>
 		<file>ecvt.c</file>
 		<file>ecvtbuf.c</file>
 		<file>errno.c</file>
@@ -331,35 +352,22 @@
 		<file>fullpath.c</file>
 		<file>gcvt.c</file>
 		<file>getenv.c</file>
-		<file>ldiv.c</file>
 		<file>makepath.c</file>
 		<file>malloc.c</file>
 		<file>mbtowc.c</file>
 		<file>obsol.c</file>
 		<file>putenv.c</file>
-		<file>rand.c</file>
 		<file>rot.c</file>
 		<file>senv.c</file>
-		<file>strtod.c</file>
-		<file>strtoul.c</file>
-		<file>strtoull.c</file>
 		<file>swab.c</file>
-		<file>wcstod.c</file>
-		<file>wcstombs.c</file>
-		<file>wctomb.c</file>
 		<file>wfulpath.c</file>
 		<file>wputenv.c</file>
 		<file>wsenv.c</file>
-		<file>wsplitp.c</file>
 		<file>wmakpath.c</file>
 	</directory>
 	<directory name="string">
 		<if property="ARCH" value="i386">
 			<directory name="i386">
-				<file>memchr_asm.s</file>
-				<file>memcpy_asm.s</file>
-				<file>memmove_asm.s</file>
-				<file>memset_asm.s</file>
 				<file>strcat_asm.s</file>
 				<file>strchr_asm.s</file>
 				<file>strcmp_asm.s</file>
@@ -383,10 +391,6 @@
 			</directory>
 		</if>
 		<ifnot property="ARCH" value="i386">
-			<file>memchr.c</file>
-			<file>memcpy.c</file>
-			<file>memmove.c</file>
-			<file>memset.c</file>
 			<file>strcat.c</file>
 			<file>strchr.c</file>
 			<file>strcmp.c</file>
@@ -408,9 +412,8 @@
 			<file>wcsnlen.c</file>
 			<file>wcsrchr.c</file>
 		</ifnot>
+		<file>atof.c</file>
 		<file>lasttok.c</file>
-		<file>memcmp.c</file>
-		<file>memicmp.c</file>
 		<file>strcoll.c</file>
 		<file>strdup.c</file>
 		<file>strerror.c</file>
@@ -422,9 +425,16 @@
 		<file>strrev.c</file>
 		<file>strset.c</file>
 		<file>strstr.c</file>
+		<file>strtod.c</file>
 		<file>strtok.c</file>
+		<file>strtoul.c</file>
+		<file>strtoull.c</file>
 		<file>strupr.c</file>
 		<file>strxfrm.c</file>
+		<file>wcstod.c</file>
+		<file>wcstombs.c</file>
+		<file>wctomb.c</file>
+		<file>wsplitp.c</file>
 	</directory>
 	<directory name="sys_stat">
 		<file>fstat.c</file>
diff --git a/reactos/lib/sdk/crt/stdlib/abs.c b/reactos/lib/sdk/crt/math/abs.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/abs.c
rename to reactos/lib/sdk/crt/math/abs.c
diff --git a/reactos/lib/sdk/crt/stdlib/bsearch.c b/reactos/lib/sdk/crt/math/bsearch.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/bsearch.c
rename to reactos/lib/sdk/crt/math/bsearch.c
diff --git a/reactos/lib/sdk/crt/stdlib/div.c b/reactos/lib/sdk/crt/math/div.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/div.c
rename to reactos/lib/sdk/crt/math/div.c
diff --git a/reactos/lib/sdk/crt/stdlib/labs.c b/reactos/lib/sdk/crt/math/labs.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/labs.c
rename to reactos/lib/sdk/crt/math/labs.c
diff --git a/reactos/lib/sdk/crt/stdlib/ldiv.c b/reactos/lib/sdk/crt/math/ldiv.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/ldiv.c
rename to reactos/lib/sdk/crt/math/ldiv.c
diff --git a/reactos/lib/sdk/crt/stdlib/rand.c b/reactos/lib/sdk/crt/math/rand.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/rand.c
rename to reactos/lib/sdk/crt/math/rand.c
diff --git a/reactos/lib/sdk/crt/string/i386/memchr_asm.s b/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
similarity index 100%
rename from reactos/lib/sdk/crt/string/i386/memchr_asm.s
rename to reactos/lib/sdk/crt/mem/i386/memchr_asm.s
diff --git a/reactos/lib/sdk/crt/string/i386/memcpy_asm.s b/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s
similarity index 100%
rename from reactos/lib/sdk/crt/string/i386/memcpy_asm.s
rename to reactos/lib/sdk/crt/mem/i386/memcpy_asm.s
diff --git a/reactos/lib/sdk/crt/string/i386/memmove_asm.s b/reactos/lib/sdk/crt/mem/i386/memmove_asm.s
similarity index 100%
rename from reactos/lib/sdk/crt/string/i386/memmove_asm.s
rename to reactos/lib/sdk/crt/mem/i386/memmove_asm.s
diff --git a/reactos/lib/sdk/crt/string/i386/memset_asm.s b/reactos/lib/sdk/crt/mem/i386/memset_asm.s
similarity index 100%
rename from reactos/lib/sdk/crt/string/i386/memset_asm.s
rename to reactos/lib/sdk/crt/mem/i386/memset_asm.s
diff --git a/reactos/lib/sdk/crt/string/memchr.c b/reactos/lib/sdk/crt/mem/memchr.c
similarity index 100%
rename from reactos/lib/sdk/crt/string/memchr.c
rename to reactos/lib/sdk/crt/mem/memchr.c
diff --git a/reactos/lib/sdk/crt/string/memcmp.c b/reactos/lib/sdk/crt/mem/memcmp.c
similarity index 100%
rename from reactos/lib/sdk/crt/string/memcmp.c
rename to reactos/lib/sdk/crt/mem/memcmp.c
diff --git a/reactos/lib/sdk/crt/string/memcpy.c b/reactos/lib/sdk/crt/mem/memcpy.c
similarity index 100%
rename from reactos/lib/sdk/crt/string/memcpy.c
rename to reactos/lib/sdk/crt/mem/memcpy.c
diff --git a/reactos/lib/sdk/crt/string/memicmp.c b/reactos/lib/sdk/crt/mem/memicmp.c
similarity index 100%
rename from reactos/lib/sdk/crt/string/memicmp.c
rename to reactos/lib/sdk/crt/mem/memicmp.c
diff --git a/reactos/lib/sdk/crt/string/memmove.c b/reactos/lib/sdk/crt/mem/memmove.c
similarity index 100%
rename from reactos/lib/sdk/crt/string/memmove.c
rename to reactos/lib/sdk/crt/mem/memmove.c
diff --git a/reactos/lib/sdk/crt/string/memset.c b/reactos/lib/sdk/crt/mem/memset.c
similarity index 100%
rename from reactos/lib/sdk/crt/string/memset.c
rename to reactos/lib/sdk/crt/mem/memset.c
diff --git a/reactos/lib/sdk/crt/stdlib/atof.c b/reactos/lib/sdk/crt/string/atof.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/atof.c
rename to reactos/lib/sdk/crt/string/atof.c
diff --git a/reactos/lib/sdk/crt/stdlib/atoi.c b/reactos/lib/sdk/crt/string/atoi.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/atoi.c
rename to reactos/lib/sdk/crt/string/atoi.c
diff --git a/reactos/lib/sdk/crt/stdlib/atoi64.c b/reactos/lib/sdk/crt/string/atoi64.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/atoi64.c
rename to reactos/lib/sdk/crt/string/atoi64.c
diff --git a/reactos/lib/sdk/crt/stdlib/atol.c b/reactos/lib/sdk/crt/string/atol.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/atol.c
rename to reactos/lib/sdk/crt/string/atol.c
diff --git a/reactos/lib/sdk/crt/stdlib/itoa.c b/reactos/lib/sdk/crt/string/itoa.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/itoa.c
rename to reactos/lib/sdk/crt/string/itoa.c
diff --git a/reactos/lib/sdk/crt/stdlib/itow.c b/reactos/lib/sdk/crt/string/itow.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/itow.c
rename to reactos/lib/sdk/crt/string/itow.c
diff --git a/reactos/lib/sdk/crt/stdlib/splitp.c b/reactos/lib/sdk/crt/string/splitp.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/splitp.c
rename to reactos/lib/sdk/crt/string/splitp.c
diff --git a/reactos/lib/sdk/crt/stdlib/strtod.c b/reactos/lib/sdk/crt/string/strtod.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/strtod.c
rename to reactos/lib/sdk/crt/string/strtod.c
diff --git a/reactos/lib/sdk/crt/stdlib/strtol.c b/reactos/lib/sdk/crt/string/strtol.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/strtol.c
rename to reactos/lib/sdk/crt/string/strtol.c
diff --git a/reactos/lib/sdk/crt/stdlib/strtold.c b/reactos/lib/sdk/crt/string/strtold.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/strtold.c
rename to reactos/lib/sdk/crt/string/strtold.c
diff --git a/reactos/lib/sdk/crt/stdlib/strtoul.c b/reactos/lib/sdk/crt/string/strtoul.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/strtoul.c
rename to reactos/lib/sdk/crt/string/strtoul.c
diff --git a/reactos/lib/sdk/crt/stdlib/strtoull.c b/reactos/lib/sdk/crt/string/strtoull.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/strtoull.c
rename to reactos/lib/sdk/crt/string/strtoull.c
diff --git a/reactos/lib/sdk/crt/stdlib/wcstod.c b/reactos/lib/sdk/crt/string/wcstod.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wcstod.c
rename to reactos/lib/sdk/crt/string/wcstod.c
diff --git a/reactos/lib/sdk/crt/stdlib/wcstol.c b/reactos/lib/sdk/crt/string/wcstol.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wcstol.c
rename to reactos/lib/sdk/crt/string/wcstol.c
diff --git a/reactos/lib/sdk/crt/stdlib/wcstom.c b/reactos/lib/sdk/crt/string/wcstom.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wcstom.c
rename to reactos/lib/sdk/crt/string/wcstom.c
diff --git a/reactos/lib/sdk/crt/stdlib/wcstomb.c b/reactos/lib/sdk/crt/string/wcstomb.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wcstomb.c
rename to reactos/lib/sdk/crt/string/wcstomb.c
diff --git a/reactos/lib/sdk/crt/stdlib/wcstombs.c b/reactos/lib/sdk/crt/string/wcstombs.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wcstombs.c
rename to reactos/lib/sdk/crt/string/wcstombs.c
diff --git a/reactos/lib/sdk/crt/stdlib/wcstoul.c b/reactos/lib/sdk/crt/string/wcstoul.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wcstoul.c
rename to reactos/lib/sdk/crt/string/wcstoul.c
diff --git a/reactos/lib/sdk/crt/stdlib/wctomb.c b/reactos/lib/sdk/crt/string/wctomb.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wctomb.c
rename to reactos/lib/sdk/crt/string/wctomb.c
diff --git a/reactos/lib/sdk/crt/stdlib/witoa.c b/reactos/lib/sdk/crt/string/witoa.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/witoa.c
rename to reactos/lib/sdk/crt/string/witoa.c
diff --git a/reactos/lib/sdk/crt/stdlib/witow.c b/reactos/lib/sdk/crt/string/witow.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/witow.c
rename to reactos/lib/sdk/crt/string/witow.c
diff --git a/reactos/lib/sdk/crt/stdlib/wsplitp.c b/reactos/lib/sdk/crt/string/wsplitp.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wsplitp.c
rename to reactos/lib/sdk/crt/string/wsplitp.c
diff --git a/reactos/lib/sdk/crt/stdlib/wtoi.c b/reactos/lib/sdk/crt/string/wtoi.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wtoi.c
rename to reactos/lib/sdk/crt/string/wtoi.c
diff --git a/reactos/lib/sdk/crt/stdlib/wtoi64.c b/reactos/lib/sdk/crt/string/wtoi64.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wtoi64.c
rename to reactos/lib/sdk/crt/string/wtoi64.c
diff --git a/reactos/lib/sdk/crt/stdlib/wtol.c b/reactos/lib/sdk/crt/string/wtol.c
similarity index 100%
rename from reactos/lib/sdk/crt/stdlib/wtol.c
rename to reactos/lib/sdk/crt/string/wtol.c