diff --git a/libc/Makefile b/libc/Makefile
index 920a12fc..6855e226 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -166,7 +166,6 @@ arpa/inet/inet_ntoa.o \
 arpa/inet/inet_ntop.o \
 arpa/inet/inet_pton.o \
 calltrace.o \
-chmod.o \
 $(CPUDIR)/calltrace.o \
 $(CPUDIR)/fork.o \
 $(CPUDIR)/setjmp.o \
@@ -177,8 +176,6 @@ dirent/scandir.o \
 dispmsg_issue.o \
 dlfcn.o \
 errorprint.o \
-fchmodat.o \
-fchmod.o \
 fcloseall.o \
 fcntl/creat.o \
 fcntl/fcntl.o \
@@ -198,9 +195,6 @@ fsmarshall/fsm_listen.o \
 fsmarshall/fsm_mkserver.o \
 fsmarshall/fsm_recv.o \
 fsmarshall/fsm_send.o \
-fstatat.o \
-fstat.o \
-futimens.o \
 getc.o \
 gettermmode.o \
 grp/grent.o \
@@ -211,9 +205,6 @@ libgen/basename.o \
 libgen/dirname.o \
 locale/localeconv.o \
 locale/setlocale.o \
-lstat.o \
-mkdirat.o \
-mkdir.o \
 netdb/endhostent.o \
 netdb/endnetent.o \
 netdb/endprotoent.o \
@@ -262,7 +253,6 @@ signal/SIG_ERR.o \
 signal/SIG_IGN.o \
 signal/signal.o \
 signal/sigprocmask.o \
-stat.o \
 stdio.o \
 stdlib/canonicalize_file_name_at.o \
 stdlib/canonicalize_file_name.o \
@@ -293,6 +283,19 @@ sys/socket/shutdown.o \
 sys/socket/sockatmark.o \
 sys/socket/socket.o \
 sys/socket/socketpair.o \
+sys/stat/chmod.o \
+sys/stat/fchmodat.o \
+sys/stat/fchmod.o \
+sys/stat/fstatat.o \
+sys/stat/fstat.o \
+sys/stat/futimens.o \
+sys/stat/lstat.o \
+sys/stat/mkdirat.o \
+sys/stat/mkdir.o \
+sys/stat/stat.o \
+sys/stat/umask.o \
+sys/stat/utimensat.o \
+sys/stat/utimens.o \
 sys/time/gettimeofday.o \
 termios/tcgetwinsize.o \
 time/clock_getres.o \
@@ -318,7 +321,6 @@ time/timer_settime.o \
 time/times.o \
 tmpfile.o \
 tmpnam.o \
-umask.o \
 unistd/access.o \
 unistd/alarmns.o \
 unistd/alarm.o \
@@ -393,8 +395,6 @@ unistd/unlinkat.o \
 unistd/unlink.o \
 unistd/usleep.o \
 unistd/write.o \
-utimensat.o \
-utimens.o \
 utime.o \
 vscanf.o \
 wait.o \
diff --git a/libc/chmod.cpp b/libc/sys/stat/chmod.cpp
similarity index 98%
rename from libc/chmod.cpp
rename to libc/sys/stat/chmod.cpp
index 9a05e562..7e759a8f 100644
--- a/libc/chmod.cpp
+++ b/libc/sys/stat/chmod.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    chmod.cpp
+    sys/stat/chmod.cpp
     Changes the mode bits of a file.
 
 *******************************************************************************/
diff --git a/libc/fchmod.cpp b/libc/sys/stat/fchmod.cpp
similarity index 98%
rename from libc/fchmod.cpp
rename to libc/sys/stat/fchmod.cpp
index fecc59c8..34a74a0a 100644
--- a/libc/fchmod.cpp
+++ b/libc/sys/stat/fchmod.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    fchmod.cpp
+    sys/stat/fchmod.cpp
     Changes the mode bits of an open file.
 
 *******************************************************************************/
diff --git a/libc/fchmodat.cpp b/libc/sys/stat/fchmodat.cpp
similarity index 98%
rename from libc/fchmodat.cpp
rename to libc/sys/stat/fchmodat.cpp
index 0eda2fa9..a904ed9c 100644
--- a/libc/fchmodat.cpp
+++ b/libc/sys/stat/fchmodat.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    fchmodat.cpp
+    sys/stat/fchmodat.cpp
     Changes the mode bits of a file.
 
 *******************************************************************************/
diff --git a/libc/fstat.cpp b/libc/sys/stat/fstat.cpp
similarity index 98%
rename from libc/fstat.cpp
rename to libc/sys/stat/fstat.cpp
index c1d2d77a..282e275a 100644
--- a/libc/fstat.cpp
+++ b/libc/sys/stat/fstat.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    fstat.cpp
+    sys/stat/fstat.cpp
     Retrieves status of an open file.
 
 *******************************************************************************/
diff --git a/libc/fstatat.cpp b/libc/sys/stat/fstatat.cpp
similarity index 98%
rename from libc/fstatat.cpp
rename to libc/sys/stat/fstatat.cpp
index 699a62f3..a45bdfc2 100644
--- a/libc/fstatat.cpp
+++ b/libc/sys/stat/fstatat.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    fstatat.cpp
+    sys/stat/fstatat.cpp
     Retrieves status of an open file.
 
 *******************************************************************************/
diff --git a/libc/futimens.cpp b/libc/sys/stat/futimens.cpp
similarity index 98%
rename from libc/futimens.cpp
rename to libc/sys/stat/futimens.cpp
index ceac2670..dae622c7 100644
--- a/libc/futimens.cpp
+++ b/libc/sys/stat/futimens.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    futimens.cpp
+    sys/stat/futimens.cpp
     Change file last access and modification times.
 
 *******************************************************************************/
diff --git a/libc/lstat.cpp b/libc/sys/stat/lstat.cpp
similarity index 98%
rename from libc/lstat.cpp
rename to libc/sys/stat/lstat.cpp
index 19e42cbf..75cb18ec 100644
--- a/libc/lstat.cpp
+++ b/libc/sys/stat/lstat.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    lstat.cpp
+    sys/stat/lstat.cpp
     Retrieves status of a file.
 
 *******************************************************************************/
diff --git a/libc/mkdir.cpp b/libc/sys/stat/mkdir.cpp
similarity index 98%
rename from libc/mkdir.cpp
rename to libc/sys/stat/mkdir.cpp
index 6cbbfcf9..420ab661 100644
--- a/libc/mkdir.cpp
+++ b/libc/sys/stat/mkdir.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    mkdir.cpp
+    sys/stat/mkdir.cpp
     Creates a new directory.
 
 *******************************************************************************/
diff --git a/libc/mkdirat.cpp b/libc/sys/stat/mkdirat.cpp
similarity index 98%
rename from libc/mkdirat.cpp
rename to libc/sys/stat/mkdirat.cpp
index 065e8d8b..2635e02e 100644
--- a/libc/mkdirat.cpp
+++ b/libc/sys/stat/mkdirat.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    mkdirat.cpp
+    sys/stat/mkdirat.cpp
     Creates a new directory.
 
 *******************************************************************************/
diff --git a/libc/stat.cpp b/libc/sys/stat/stat.cpp
similarity index 98%
rename from libc/stat.cpp
rename to libc/sys/stat/stat.cpp
index 5c70d412..f49f4b2d 100644
--- a/libc/stat.cpp
+++ b/libc/sys/stat/stat.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    stat.cpp
+    sys/stat/stat.cpp
     Retrieves status of a file.
 
 *******************************************************************************/
diff --git a/libc/umask.cpp b/libc/sys/stat/umask.cpp
similarity index 98%
rename from libc/umask.cpp
rename to libc/sys/stat/umask.cpp
index bf043f59..397e652c 100644
--- a/libc/umask.cpp
+++ b/libc/sys/stat/umask.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    umask.cpp
+    sys/stat/umask.cpp
     Set file mode creation mask.
 
 *******************************************************************************/
diff --git a/libc/utimens.cpp b/libc/sys/stat/utimens.cpp
similarity index 97%
rename from libc/utimens.cpp
rename to libc/sys/stat/utimens.cpp
index b9351246..bc665213 100644
--- a/libc/utimens.cpp
+++ b/libc/sys/stat/utimens.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    utimens.cpp
+    sys/stat/utimens.cpp
     Change file last access and modification times.
 
 *******************************************************************************/
diff --git a/libc/utimensat.cpp b/libc/sys/stat/utimensat.cpp
similarity index 98%
rename from libc/utimensat.cpp
rename to libc/sys/stat/utimensat.cpp
index d48c7e72..52fd4a1d 100644
--- a/libc/utimensat.cpp
+++ b/libc/sys/stat/utimensat.cpp
@@ -17,7 +17,7 @@
     You should have received a copy of the GNU Lesser General Public License
     along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
 
-    utimensat.cpp
+    sys/stat/utimensat.cpp
     Change file last access and modification times.
 
 *******************************************************************************/