diff --git a/Makefile b/Makefile
index e17b3b79..499124fd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ MAKEFILE_NOT_MEANT_FOR_SORTIX=1
 include compiler.mak
 include version.mak
 
-MODULES=doc libc libm dispd games mkinitrd mxmpp utils bench ext mbr sortix
+MODULES=doc libc libm dispd games mkinitrd mxmpp utils bench ext mbr kernel
 
 ifndef SYSROOT
   SYSROOT:=$(shell pwd)/sysroot
@@ -66,7 +66,7 @@ sysroot-fsh:
 
 .PHONY: sysroot-base-headers
 sysroot-base-headers: sysroot-fsh
-	(for D in libc libm sortix; do ($(MAKE) -C $$D install-headers $(SUBMAKE_OPTIONS) DESTDIR="$(SYSROOT)") || exit $$?; done)
+	(for D in libc libm kernel; do ($(MAKE) -C $$D install-headers $(SUBMAKE_OPTIONS) DESTDIR="$(SYSROOT)") || exit $$?; done)
 
 .PHONY: sysroot-system
 sysroot-system: sysroot-fsh sysroot-base-headers
diff --git a/doc/user-guide b/doc/user-guide
index 79767912..20942703 100644
--- a/doc/user-guide
+++ b/doc/user-guide
@@ -538,7 +538,7 @@ initial filesystem used to bootstrap the real root filesystem.
 The Sortix kernel is the core of the Sortix operating system. It provides all
 the primitives libc needs to implement a Unix-like environment.
 
-    cd /src/sortix
+    cd /src/kernel
     make
     make install
 
diff --git a/sortix/.gitignore b/kernel/.gitignore
similarity index 100%
rename from sortix/.gitignore
rename to kernel/.gitignore
diff --git a/sortix/Makefile b/kernel/Makefile
similarity index 100%
rename from sortix/Makefile
rename to kernel/Makefile
diff --git a/sortix/addralloc.cpp b/kernel/addralloc.cpp
similarity index 100%
rename from sortix/addralloc.cpp
rename to kernel/addralloc.cpp
diff --git a/sortix/alarm.cpp b/kernel/alarm.cpp
similarity index 100%
rename from sortix/alarm.cpp
rename to kernel/alarm.cpp
diff --git a/sortix/alarm.h b/kernel/alarm.h
similarity index 100%
rename from sortix/alarm.h
rename to kernel/alarm.h
diff --git a/sortix/ata.cpp b/kernel/ata.cpp
similarity index 100%
rename from sortix/ata.cpp
rename to kernel/ata.cpp
diff --git a/sortix/ata.h b/kernel/ata.h
similarity index 100%
rename from sortix/ata.h
rename to kernel/ata.h
diff --git a/sortix/bga.cpp b/kernel/bga.cpp
similarity index 100%
rename from sortix/bga.cpp
rename to kernel/bga.cpp
diff --git a/sortix/bga.h b/kernel/bga.h
similarity index 100%
rename from sortix/bga.h
rename to kernel/bga.h
diff --git a/sortix/calltrace.cpp b/kernel/calltrace.cpp
similarity index 100%
rename from sortix/calltrace.cpp
rename to kernel/calltrace.cpp
diff --git a/sortix/clock.cpp b/kernel/clock.cpp
similarity index 100%
rename from sortix/clock.cpp
rename to kernel/clock.cpp
diff --git a/sortix/com.cpp b/kernel/com.cpp
similarity index 100%
rename from sortix/com.cpp
rename to kernel/com.cpp
diff --git a/sortix/com.h b/kernel/com.h
similarity index 100%
rename from sortix/com.h
rename to kernel/com.h
diff --git a/sortix/copy.cpp b/kernel/copy.cpp
similarity index 100%
rename from sortix/copy.cpp
rename to kernel/copy.cpp
diff --git a/sortix/crc32.cpp b/kernel/crc32.cpp
similarity index 100%
rename from sortix/crc32.cpp
rename to kernel/crc32.cpp
diff --git a/sortix/debugger.cpp b/kernel/debugger.cpp
similarity index 100%
rename from sortix/debugger.cpp
rename to kernel/debugger.cpp
diff --git a/sortix/descriptor.cpp b/kernel/descriptor.cpp
similarity index 100%
rename from sortix/descriptor.cpp
rename to kernel/descriptor.cpp
diff --git a/sortix/dispmsg.cpp b/kernel/dispmsg.cpp
similarity index 100%
rename from sortix/dispmsg.cpp
rename to kernel/dispmsg.cpp
diff --git a/sortix/dispmsg.h b/kernel/dispmsg.h
similarity index 100%
rename from sortix/dispmsg.h
rename to kernel/dispmsg.h
diff --git a/sortix/dtable.cpp b/kernel/dtable.cpp
similarity index 100%
rename from sortix/dtable.cpp
rename to kernel/dtable.cpp
diff --git a/sortix/elf.cpp b/kernel/elf.cpp
similarity index 100%
rename from sortix/elf.cpp
rename to kernel/elf.cpp
diff --git a/sortix/elf.h b/kernel/elf.h
similarity index 100%
rename from sortix/elf.h
rename to kernel/elf.h
diff --git a/sortix/end.cpp b/kernel/end.cpp
similarity index 100%
rename from sortix/end.cpp
rename to kernel/end.cpp
diff --git a/sortix/fcache.cpp b/kernel/fcache.cpp
similarity index 100%
rename from sortix/fcache.cpp
rename to kernel/fcache.cpp
diff --git a/sortix/fs/full.cpp b/kernel/fs/full.cpp
similarity index 100%
rename from sortix/fs/full.cpp
rename to kernel/fs/full.cpp
diff --git a/sortix/fs/full.h b/kernel/fs/full.h
similarity index 100%
rename from sortix/fs/full.h
rename to kernel/fs/full.h
diff --git a/sortix/fs/kram.cpp b/kernel/fs/kram.cpp
similarity index 100%
rename from sortix/fs/kram.cpp
rename to kernel/fs/kram.cpp
diff --git a/sortix/fs/kram.h b/kernel/fs/kram.h
similarity index 100%
rename from sortix/fs/kram.h
rename to kernel/fs/kram.h
diff --git a/sortix/fs/null.cpp b/kernel/fs/null.cpp
similarity index 100%
rename from sortix/fs/null.cpp
rename to kernel/fs/null.cpp
diff --git a/sortix/fs/null.h b/kernel/fs/null.h
similarity index 100%
rename from sortix/fs/null.h
rename to kernel/fs/null.h
diff --git a/sortix/fs/user.cpp b/kernel/fs/user.cpp
similarity index 100%
rename from sortix/fs/user.cpp
rename to kernel/fs/user.cpp
diff --git a/sortix/fs/user.h b/kernel/fs/user.h
similarity index 100%
rename from sortix/fs/user.h
rename to kernel/fs/user.h
diff --git a/sortix/fs/util.cpp b/kernel/fs/util.cpp
similarity index 100%
rename from sortix/fs/util.cpp
rename to kernel/fs/util.cpp
diff --git a/sortix/fs/util.h b/kernel/fs/util.h
similarity index 100%
rename from sortix/fs/util.h
rename to kernel/fs/util.h
diff --git a/sortix/fs/zero.cpp b/kernel/fs/zero.cpp
similarity index 100%
rename from sortix/fs/zero.cpp
rename to kernel/fs/zero.cpp
diff --git a/sortix/fs/zero.h b/kernel/fs/zero.h
similarity index 100%
rename from sortix/fs/zero.h
rename to kernel/fs/zero.h
diff --git a/sortix/fsfunc.cpp b/kernel/fsfunc.cpp
similarity index 100%
rename from sortix/fsfunc.cpp
rename to kernel/fsfunc.cpp
diff --git a/sortix/identity.cpp b/kernel/identity.cpp
similarity index 100%
rename from sortix/identity.cpp
rename to kernel/identity.cpp
diff --git a/sortix/identity.h b/kernel/identity.h
similarity index 100%
rename from sortix/identity.h
rename to kernel/identity.h
diff --git a/sortix/include/sortix/__/types.h b/kernel/include/sortix/__/types.h
similarity index 100%
rename from sortix/include/sortix/__/types.h
rename to kernel/include/sortix/__/types.h
diff --git a/sortix/include/sortix/clock.h b/kernel/include/sortix/clock.h
similarity index 100%
rename from sortix/include/sortix/clock.h
rename to kernel/include/sortix/clock.h
diff --git a/sortix/include/sortix/dirent.h b/kernel/include/sortix/dirent.h
similarity index 100%
rename from sortix/include/sortix/dirent.h
rename to kernel/include/sortix/dirent.h
diff --git a/sortix/include/sortix/display.h b/kernel/include/sortix/display.h
similarity index 100%
rename from sortix/include/sortix/display.h
rename to kernel/include/sortix/display.h
diff --git a/sortix/include/sortix/fcntl.h b/kernel/include/sortix/fcntl.h
similarity index 100%
rename from sortix/include/sortix/fcntl.h
rename to kernel/include/sortix/fcntl.h
diff --git a/sortix/include/sortix/fork.h b/kernel/include/sortix/fork.h
similarity index 100%
rename from sortix/include/sortix/fork.h
rename to kernel/include/sortix/fork.h
diff --git a/sortix/include/sortix/initrd.h b/kernel/include/sortix/initrd.h
similarity index 100%
rename from sortix/include/sortix/initrd.h
rename to kernel/include/sortix/initrd.h
diff --git a/sortix/include/sortix/itimerspec.h b/kernel/include/sortix/itimerspec.h
similarity index 100%
rename from sortix/include/sortix/itimerspec.h
rename to kernel/include/sortix/itimerspec.h
diff --git a/sortix/include/sortix/kernel/addralloc.h b/kernel/include/sortix/kernel/addralloc.h
similarity index 100%
rename from sortix/include/sortix/kernel/addralloc.h
rename to kernel/include/sortix/kernel/addralloc.h
diff --git a/sortix/include/sortix/kernel/calltrace.h b/kernel/include/sortix/kernel/calltrace.h
similarity index 100%
rename from sortix/include/sortix/kernel/calltrace.h
rename to kernel/include/sortix/kernel/calltrace.h
diff --git a/sortix/include/sortix/kernel/clock.h b/kernel/include/sortix/kernel/clock.h
similarity index 100%
rename from sortix/include/sortix/kernel/clock.h
rename to kernel/include/sortix/kernel/clock.h
diff --git a/sortix/include/sortix/kernel/copy.h b/kernel/include/sortix/kernel/copy.h
similarity index 100%
rename from sortix/include/sortix/kernel/copy.h
rename to kernel/include/sortix/kernel/copy.h
diff --git a/sortix/include/sortix/kernel/cpu.h b/kernel/include/sortix/kernel/cpu.h
similarity index 100%
rename from sortix/include/sortix/kernel/cpu.h
rename to kernel/include/sortix/kernel/cpu.h
diff --git a/sortix/include/sortix/kernel/crc32.h b/kernel/include/sortix/kernel/crc32.h
similarity index 100%
rename from sortix/include/sortix/kernel/crc32.h
rename to kernel/include/sortix/kernel/crc32.h
diff --git a/sortix/include/sortix/kernel/debugger.h b/kernel/include/sortix/kernel/debugger.h
similarity index 100%
rename from sortix/include/sortix/kernel/debugger.h
rename to kernel/include/sortix/kernel/debugger.h
diff --git a/sortix/include/sortix/kernel/decl.h b/kernel/include/sortix/kernel/decl.h
similarity index 100%
rename from sortix/include/sortix/kernel/decl.h
rename to kernel/include/sortix/kernel/decl.h
diff --git a/sortix/include/sortix/kernel/descriptor.h b/kernel/include/sortix/kernel/descriptor.h
similarity index 100%
rename from sortix/include/sortix/kernel/descriptor.h
rename to kernel/include/sortix/kernel/descriptor.h
diff --git a/sortix/include/sortix/kernel/dtable.h b/kernel/include/sortix/kernel/dtable.h
similarity index 100%
rename from sortix/include/sortix/kernel/dtable.h
rename to kernel/include/sortix/kernel/dtable.h
diff --git a/sortix/include/sortix/kernel/fcache.h b/kernel/include/sortix/kernel/fcache.h
similarity index 100%
rename from sortix/include/sortix/kernel/fcache.h
rename to kernel/include/sortix/kernel/fcache.h
diff --git a/sortix/include/sortix/kernel/fsfunc.h b/kernel/include/sortix/kernel/fsfunc.h
similarity index 100%
rename from sortix/include/sortix/kernel/fsfunc.h
rename to kernel/include/sortix/kernel/fsfunc.h
diff --git a/sortix/include/sortix/kernel/inode.h b/kernel/include/sortix/kernel/inode.h
similarity index 100%
rename from sortix/include/sortix/kernel/inode.h
rename to kernel/include/sortix/kernel/inode.h
diff --git a/sortix/include/sortix/kernel/interlock.h b/kernel/include/sortix/kernel/interlock.h
similarity index 100%
rename from sortix/include/sortix/kernel/interlock.h
rename to kernel/include/sortix/kernel/interlock.h
diff --git a/sortix/include/sortix/kernel/interrupt.h b/kernel/include/sortix/kernel/interrupt.h
similarity index 100%
rename from sortix/include/sortix/kernel/interrupt.h
rename to kernel/include/sortix/kernel/interrupt.h
diff --git a/sortix/include/sortix/kernel/ioctx.h b/kernel/include/sortix/kernel/ioctx.h
similarity index 100%
rename from sortix/include/sortix/kernel/ioctx.h
rename to kernel/include/sortix/kernel/ioctx.h
diff --git a/sortix/include/sortix/kernel/kernel.h b/kernel/include/sortix/kernel/kernel.h
similarity index 100%
rename from sortix/include/sortix/kernel/kernel.h
rename to kernel/include/sortix/kernel/kernel.h
diff --git a/sortix/include/sortix/kernel/keyboard.h b/kernel/include/sortix/kernel/keyboard.h
similarity index 100%
rename from sortix/include/sortix/kernel/keyboard.h
rename to kernel/include/sortix/kernel/keyboard.h
diff --git a/sortix/include/sortix/kernel/kthread.h b/kernel/include/sortix/kernel/kthread.h
similarity index 100%
rename from sortix/include/sortix/kernel/kthread.h
rename to kernel/include/sortix/kernel/kthread.h
diff --git a/sortix/include/sortix/kernel/log.h b/kernel/include/sortix/kernel/log.h
similarity index 100%
rename from sortix/include/sortix/kernel/log.h
rename to kernel/include/sortix/kernel/log.h
diff --git a/sortix/include/sortix/kernel/memorymanagement.h b/kernel/include/sortix/kernel/memorymanagement.h
similarity index 100%
rename from sortix/include/sortix/kernel/memorymanagement.h
rename to kernel/include/sortix/kernel/memorymanagement.h
diff --git a/sortix/include/sortix/kernel/mtable.h b/kernel/include/sortix/kernel/mtable.h
similarity index 100%
rename from sortix/include/sortix/kernel/mtable.h
rename to kernel/include/sortix/kernel/mtable.h
diff --git a/sortix/include/sortix/kernel/panic.h b/kernel/include/sortix/kernel/panic.h
similarity index 100%
rename from sortix/include/sortix/kernel/panic.h
rename to kernel/include/sortix/kernel/panic.h
diff --git a/sortix/include/sortix/kernel/pci.h b/kernel/include/sortix/kernel/pci.h
similarity index 100%
rename from sortix/include/sortix/kernel/pci.h
rename to kernel/include/sortix/kernel/pci.h
diff --git a/sortix/include/sortix/kernel/pipe.h b/kernel/include/sortix/kernel/pipe.h
similarity index 100%
rename from sortix/include/sortix/kernel/pipe.h
rename to kernel/include/sortix/kernel/pipe.h
diff --git a/sortix/include/sortix/kernel/poll.h b/kernel/include/sortix/kernel/poll.h
similarity index 100%
rename from sortix/include/sortix/kernel/poll.h
rename to kernel/include/sortix/kernel/poll.h
diff --git a/sortix/include/sortix/kernel/process.h b/kernel/include/sortix/kernel/process.h
similarity index 100%
rename from sortix/include/sortix/kernel/process.h
rename to kernel/include/sortix/kernel/process.h
diff --git a/sortix/include/sortix/kernel/refcount.h b/kernel/include/sortix/kernel/refcount.h
similarity index 100%
rename from sortix/include/sortix/kernel/refcount.h
rename to kernel/include/sortix/kernel/refcount.h
diff --git a/sortix/include/sortix/kernel/scheduler.h b/kernel/include/sortix/kernel/scheduler.h
similarity index 100%
rename from sortix/include/sortix/kernel/scheduler.h
rename to kernel/include/sortix/kernel/scheduler.h
diff --git a/sortix/include/sortix/kernel/segment.h b/kernel/include/sortix/kernel/segment.h
similarity index 100%
rename from sortix/include/sortix/kernel/segment.h
rename to kernel/include/sortix/kernel/segment.h
diff --git a/sortix/include/sortix/kernel/signal.h b/kernel/include/sortix/kernel/signal.h
similarity index 100%
rename from sortix/include/sortix/kernel/signal.h
rename to kernel/include/sortix/kernel/signal.h
diff --git a/sortix/include/sortix/kernel/sortedlist.h b/kernel/include/sortix/kernel/sortedlist.h
similarity index 100%
rename from sortix/include/sortix/kernel/sortedlist.h
rename to kernel/include/sortix/kernel/sortedlist.h
diff --git a/sortix/include/sortix/kernel/string.h b/kernel/include/sortix/kernel/string.h
similarity index 100%
rename from sortix/include/sortix/kernel/string.h
rename to kernel/include/sortix/kernel/string.h
diff --git a/sortix/include/sortix/kernel/symbol.h b/kernel/include/sortix/kernel/symbol.h
similarity index 100%
rename from sortix/include/sortix/kernel/symbol.h
rename to kernel/include/sortix/kernel/symbol.h
diff --git a/sortix/include/sortix/kernel/syscall.h b/kernel/include/sortix/kernel/syscall.h
similarity index 100%
rename from sortix/include/sortix/kernel/syscall.h
rename to kernel/include/sortix/kernel/syscall.h
diff --git a/sortix/include/sortix/kernel/textbuffer.h b/kernel/include/sortix/kernel/textbuffer.h
similarity index 100%
rename from sortix/include/sortix/kernel/textbuffer.h
rename to kernel/include/sortix/kernel/textbuffer.h
diff --git a/sortix/include/sortix/kernel/thread.h b/kernel/include/sortix/kernel/thread.h
similarity index 100%
rename from sortix/include/sortix/kernel/thread.h
rename to kernel/include/sortix/kernel/thread.h
diff --git a/sortix/include/sortix/kernel/time.h b/kernel/include/sortix/kernel/time.h
similarity index 100%
rename from sortix/include/sortix/kernel/time.h
rename to kernel/include/sortix/kernel/time.h
diff --git a/sortix/include/sortix/kernel/timer.h b/kernel/include/sortix/kernel/timer.h
similarity index 100%
rename from sortix/include/sortix/kernel/timer.h
rename to kernel/include/sortix/kernel/timer.h
diff --git a/sortix/include/sortix/kernel/user-timer.h b/kernel/include/sortix/kernel/user-timer.h
similarity index 100%
rename from sortix/include/sortix/kernel/user-timer.h
rename to kernel/include/sortix/kernel/user-timer.h
diff --git a/sortix/include/sortix/kernel/video.h b/kernel/include/sortix/kernel/video.h
similarity index 100%
rename from sortix/include/sortix/kernel/video.h
rename to kernel/include/sortix/kernel/video.h
diff --git a/sortix/include/sortix/kernel/vnode.h b/kernel/include/sortix/kernel/vnode.h
similarity index 100%
rename from sortix/include/sortix/kernel/vnode.h
rename to kernel/include/sortix/kernel/vnode.h
diff --git a/sortix/include/sortix/kernel/worker.h b/kernel/include/sortix/kernel/worker.h
similarity index 100%
rename from sortix/include/sortix/kernel/worker.h
rename to kernel/include/sortix/kernel/worker.h
diff --git a/sortix/include/sortix/kernel/yielder.h b/kernel/include/sortix/kernel/yielder.h
similarity index 100%
rename from sortix/include/sortix/kernel/yielder.h
rename to kernel/include/sortix/kernel/yielder.h
diff --git a/sortix/include/sortix/keycodes.h b/kernel/include/sortix/keycodes.h
similarity index 100%
rename from sortix/include/sortix/keycodes.h
rename to kernel/include/sortix/keycodes.h
diff --git a/sortix/include/sortix/mman.h b/kernel/include/sortix/mman.h
similarity index 100%
rename from sortix/include/sortix/mman.h
rename to kernel/include/sortix/mman.h
diff --git a/sortix/include/sortix/mount.h b/kernel/include/sortix/mount.h
similarity index 100%
rename from sortix/include/sortix/mount.h
rename to kernel/include/sortix/mount.h
diff --git a/sortix/include/sortix/poll.h b/kernel/include/sortix/poll.h
similarity index 100%
rename from sortix/include/sortix/poll.h
rename to kernel/include/sortix/poll.h
diff --git a/sortix/include/sortix/resource.h b/kernel/include/sortix/resource.h
similarity index 100%
rename from sortix/include/sortix/resource.h
rename to kernel/include/sortix/resource.h
diff --git a/sortix/include/sortix/seek.h b/kernel/include/sortix/seek.h
similarity index 100%
rename from sortix/include/sortix/seek.h
rename to kernel/include/sortix/seek.h
diff --git a/sortix/include/sortix/sigevent.h b/kernel/include/sortix/sigevent.h
similarity index 100%
rename from sortix/include/sortix/sigevent.h
rename to kernel/include/sortix/sigevent.h
diff --git a/sortix/include/sortix/signal.h b/kernel/include/sortix/signal.h
similarity index 100%
rename from sortix/include/sortix/signal.h
rename to kernel/include/sortix/signal.h
diff --git a/sortix/include/sortix/sigset.h b/kernel/include/sortix/sigset.h
similarity index 100%
rename from sortix/include/sortix/sigset.h
rename to kernel/include/sortix/sigset.h
diff --git a/sortix/include/sortix/socket.h b/kernel/include/sortix/socket.h
similarity index 100%
rename from sortix/include/sortix/socket.h
rename to kernel/include/sortix/socket.h
diff --git a/sortix/include/sortix/stat.h b/kernel/include/sortix/stat.h
similarity index 100%
rename from sortix/include/sortix/stat.h
rename to kernel/include/sortix/stat.h
diff --git a/sortix/include/sortix/syscallnum.h b/kernel/include/sortix/syscallnum.h
similarity index 100%
rename from sortix/include/sortix/syscallnum.h
rename to kernel/include/sortix/syscallnum.h
diff --git a/sortix/include/sortix/termios.h b/kernel/include/sortix/termios.h
similarity index 100%
rename from sortix/include/sortix/termios.h
rename to kernel/include/sortix/termios.h
diff --git a/sortix/include/sortix/termmode.h b/kernel/include/sortix/termmode.h
similarity index 100%
rename from sortix/include/sortix/termmode.h
rename to kernel/include/sortix/termmode.h
diff --git a/sortix/include/sortix/time.h b/kernel/include/sortix/time.h
similarity index 100%
rename from sortix/include/sortix/time.h
rename to kernel/include/sortix/time.h
diff --git a/sortix/include/sortix/timespec.h b/kernel/include/sortix/timespec.h
similarity index 100%
rename from sortix/include/sortix/timespec.h
rename to kernel/include/sortix/timespec.h
diff --git a/sortix/include/sortix/tmns.h b/kernel/include/sortix/tmns.h
similarity index 100%
rename from sortix/include/sortix/tmns.h
rename to kernel/include/sortix/tmns.h
diff --git a/sortix/include/sortix/types.h b/kernel/include/sortix/types.h
similarity index 100%
rename from sortix/include/sortix/types.h
rename to kernel/include/sortix/types.h
diff --git a/sortix/include/sortix/uio.h b/kernel/include/sortix/uio.h
similarity index 100%
rename from sortix/include/sortix/uio.h
rename to kernel/include/sortix/uio.h
diff --git a/sortix/include/sortix/unistd.h b/kernel/include/sortix/unistd.h
similarity index 100%
rename from sortix/include/sortix/unistd.h
rename to kernel/include/sortix/unistd.h
diff --git a/sortix/include/sortix/vga.h b/kernel/include/sortix/vga.h
similarity index 100%
rename from sortix/include/sortix/vga.h
rename to kernel/include/sortix/vga.h
diff --git a/sortix/include/sortix/wait.h b/kernel/include/sortix/wait.h
similarity index 100%
rename from sortix/include/sortix/wait.h
rename to kernel/include/sortix/wait.h
diff --git a/sortix/include/sortix/x64/fork.h b/kernel/include/sortix/x64/fork.h
similarity index 100%
rename from sortix/include/sortix/x64/fork.h
rename to kernel/include/sortix/x64/fork.h
diff --git a/sortix/include/sortix/x86/fork.h b/kernel/include/sortix/x86/fork.h
similarity index 100%
rename from sortix/include/sortix/x86/fork.h
rename to kernel/include/sortix/x86/fork.h
diff --git a/sortix/initrd.cpp b/kernel/initrd.cpp
similarity index 100%
rename from sortix/initrd.cpp
rename to kernel/initrd.cpp
diff --git a/sortix/initrd.h b/kernel/initrd.h
similarity index 100%
rename from sortix/initrd.h
rename to kernel/initrd.h
diff --git a/sortix/inode.cpp b/kernel/inode.cpp
similarity index 100%
rename from sortix/inode.cpp
rename to kernel/inode.cpp
diff --git a/sortix/interlock.cpp b/kernel/interlock.cpp
similarity index 100%
rename from sortix/interlock.cpp
rename to kernel/interlock.cpp
diff --git a/sortix/interrupt.cpp b/kernel/interrupt.cpp
similarity index 100%
rename from sortix/interrupt.cpp
rename to kernel/interrupt.cpp
diff --git a/sortix/io.cpp b/kernel/io.cpp
similarity index 100%
rename from sortix/io.cpp
rename to kernel/io.cpp
diff --git a/sortix/io.h b/kernel/io.h
similarity index 100%
rename from sortix/io.h
rename to kernel/io.h
diff --git a/sortix/ioctx.cpp b/kernel/ioctx.cpp
similarity index 100%
rename from sortix/ioctx.cpp
rename to kernel/ioctx.cpp
diff --git a/sortix/kb/layout/us.cpp b/kernel/kb/layout/us.cpp
similarity index 100%
rename from sortix/kb/layout/us.cpp
rename to kernel/kb/layout/us.cpp
diff --git a/sortix/kb/layout/us.h b/kernel/kb/layout/us.h
similarity index 100%
rename from sortix/kb/layout/us.h
rename to kernel/kb/layout/us.h
diff --git a/sortix/kb/ps2.cpp b/kernel/kb/ps2.cpp
similarity index 100%
rename from sortix/kb/ps2.cpp
rename to kernel/kb/ps2.cpp
diff --git a/sortix/kb/ps2.h b/kernel/kb/ps2.h
similarity index 100%
rename from sortix/kb/ps2.h
rename to kernel/kb/ps2.h
diff --git a/sortix/kernel.cpp b/kernel/kernel.cpp
similarity index 100%
rename from sortix/kernel.cpp
rename to kernel/kernel.cpp
diff --git a/sortix/kernelinfo.cpp b/kernel/kernelinfo.cpp
similarity index 100%
rename from sortix/kernelinfo.cpp
rename to kernel/kernelinfo.cpp
diff --git a/sortix/kernelinfo.h b/kernel/kernelinfo.h
similarity index 100%
rename from sortix/kernelinfo.h
rename to kernel/kernelinfo.h
diff --git a/sortix/kthread.cpp b/kernel/kthread.cpp
similarity index 100%
rename from sortix/kthread.cpp
rename to kernel/kthread.cpp
diff --git a/sortix/lfbtextbuffer.cpp b/kernel/lfbtextbuffer.cpp
similarity index 100%
rename from sortix/lfbtextbuffer.cpp
rename to kernel/lfbtextbuffer.cpp
diff --git a/sortix/lfbtextbuffer.h b/kernel/lfbtextbuffer.h
similarity index 100%
rename from sortix/lfbtextbuffer.h
rename to kernel/lfbtextbuffer.h
diff --git a/sortix/linebuffer.cpp b/kernel/linebuffer.cpp
similarity index 100%
rename from sortix/linebuffer.cpp
rename to kernel/linebuffer.cpp
diff --git a/sortix/linebuffer.h b/kernel/linebuffer.h
similarity index 100%
rename from sortix/linebuffer.h
rename to kernel/linebuffer.h
diff --git a/sortix/log.cpp b/kernel/log.cpp
similarity index 100%
rename from sortix/log.cpp
rename to kernel/log.cpp
diff --git a/sortix/logterminal.cpp b/kernel/logterminal.cpp
similarity index 100%
rename from sortix/logterminal.cpp
rename to kernel/logterminal.cpp
diff --git a/sortix/logterminal.h b/kernel/logterminal.h
similarity index 100%
rename from sortix/logterminal.h
rename to kernel/logterminal.h
diff --git a/sortix/memorymanagement.cpp b/kernel/memorymanagement.cpp
similarity index 100%
rename from sortix/memorymanagement.cpp
rename to kernel/memorymanagement.cpp
diff --git a/sortix/mtable.cpp b/kernel/mtable.cpp
similarity index 100%
rename from sortix/mtable.cpp
rename to kernel/mtable.cpp
diff --git a/sortix/multiboot.h b/kernel/multiboot.h
similarity index 100%
rename from sortix/multiboot.h
rename to kernel/multiboot.h
diff --git a/sortix/net/fs.cpp b/kernel/net/fs.cpp
similarity index 100%
rename from sortix/net/fs.cpp
rename to kernel/net/fs.cpp
diff --git a/sortix/net/fs.h b/kernel/net/fs.h
similarity index 100%
rename from sortix/net/fs.h
rename to kernel/net/fs.h
diff --git a/sortix/op-new.cpp b/kernel/op-new.cpp
similarity index 100%
rename from sortix/op-new.cpp
rename to kernel/op-new.cpp
diff --git a/sortix/panic.cpp b/kernel/panic.cpp
similarity index 100%
rename from sortix/panic.cpp
rename to kernel/panic.cpp
diff --git a/sortix/partition.cpp b/kernel/partition.cpp
similarity index 100%
rename from sortix/partition.cpp
rename to kernel/partition.cpp
diff --git a/sortix/partition.h b/kernel/partition.h
similarity index 100%
rename from sortix/partition.h
rename to kernel/partition.h
diff --git a/sortix/pci.cpp b/kernel/pci.cpp
similarity index 100%
rename from sortix/pci.cpp
rename to kernel/pci.cpp
diff --git a/sortix/pipe.cpp b/kernel/pipe.cpp
similarity index 100%
rename from sortix/pipe.cpp
rename to kernel/pipe.cpp
diff --git a/sortix/pipe.h b/kernel/pipe.h
similarity index 100%
rename from sortix/pipe.h
rename to kernel/pipe.h
diff --git a/sortix/poll.cpp b/kernel/poll.cpp
similarity index 100%
rename from sortix/poll.cpp
rename to kernel/poll.cpp
diff --git a/sortix/poll.h b/kernel/poll.h
similarity index 100%
rename from sortix/poll.h
rename to kernel/poll.h
diff --git a/sortix/process.cpp b/kernel/process.cpp
similarity index 100%
rename from sortix/process.cpp
rename to kernel/process.cpp
diff --git a/sortix/refcount.cpp b/kernel/refcount.cpp
similarity index 100%
rename from sortix/refcount.cpp
rename to kernel/refcount.cpp
diff --git a/sortix/resource.cpp b/kernel/resource.cpp
similarity index 100%
rename from sortix/resource.cpp
rename to kernel/resource.cpp
diff --git a/sortix/resource.h b/kernel/resource.h
similarity index 100%
rename from sortix/resource.h
rename to kernel/resource.h
diff --git a/sortix/scheduler.cpp b/kernel/scheduler.cpp
similarity index 100%
rename from sortix/scheduler.cpp
rename to kernel/scheduler.cpp
diff --git a/sortix/segment.cpp b/kernel/segment.cpp
similarity index 100%
rename from sortix/segment.cpp
rename to kernel/segment.cpp
diff --git a/sortix/serialterminal.cpp b/kernel/serialterminal.cpp
similarity index 100%
rename from sortix/serialterminal.cpp
rename to kernel/serialterminal.cpp
diff --git a/sortix/serialterminal.h b/kernel/serialterminal.h
similarity index 100%
rename from sortix/serialterminal.h
rename to kernel/serialterminal.h
diff --git a/sortix/signal.cpp b/kernel/signal.cpp
similarity index 100%
rename from sortix/signal.cpp
rename to kernel/signal.cpp
diff --git a/sortix/string.cpp b/kernel/string.cpp
similarity index 100%
rename from sortix/string.cpp
rename to kernel/string.cpp
diff --git a/sortix/symbol.cpp b/kernel/symbol.cpp
similarity index 100%
rename from sortix/symbol.cpp
rename to kernel/symbol.cpp
diff --git a/sortix/syscall.cpp b/kernel/syscall.cpp
similarity index 100%
rename from sortix/syscall.cpp
rename to kernel/syscall.cpp
diff --git a/sortix/textbuffer.cpp b/kernel/textbuffer.cpp
similarity index 100%
rename from sortix/textbuffer.cpp
rename to kernel/textbuffer.cpp
diff --git a/sortix/textterminal.cpp b/kernel/textterminal.cpp
similarity index 100%
rename from sortix/textterminal.cpp
rename to kernel/textterminal.cpp
diff --git a/sortix/textterminal.h b/kernel/textterminal.h
similarity index 100%
rename from sortix/textterminal.h
rename to kernel/textterminal.h
diff --git a/sortix/thread.cpp b/kernel/thread.cpp
similarity index 100%
rename from sortix/thread.cpp
rename to kernel/thread.cpp
diff --git a/sortix/time.cpp b/kernel/time.cpp
similarity index 100%
rename from sortix/time.cpp
rename to kernel/time.cpp
diff --git a/sortix/timer.cpp b/kernel/timer.cpp
similarity index 100%
rename from sortix/timer.cpp
rename to kernel/timer.cpp
diff --git a/sortix/uart.cpp b/kernel/uart.cpp
similarity index 100%
rename from sortix/uart.cpp
rename to kernel/uart.cpp
diff --git a/sortix/uart.h b/kernel/uart.h
similarity index 100%
rename from sortix/uart.h
rename to kernel/uart.h
diff --git a/sortix/user-timer.cpp b/kernel/user-timer.cpp
similarity index 100%
rename from sortix/user-timer.cpp
rename to kernel/user-timer.cpp
diff --git a/sortix/utf8.cpp b/kernel/utf8.cpp
similarity index 100%
rename from sortix/utf8.cpp
rename to kernel/utf8.cpp
diff --git a/sortix/utf8.h b/kernel/utf8.h
similarity index 100%
rename from sortix/utf8.h
rename to kernel/utf8.h
diff --git a/sortix/vga.cpp b/kernel/vga.cpp
similarity index 100%
rename from sortix/vga.cpp
rename to kernel/vga.cpp
diff --git a/sortix/vga.h b/kernel/vga.h
similarity index 100%
rename from sortix/vga.h
rename to kernel/vga.h
diff --git a/sortix/vgatextbuffer.cpp b/kernel/vgatextbuffer.cpp
similarity index 100%
rename from sortix/vgatextbuffer.cpp
rename to kernel/vgatextbuffer.cpp
diff --git a/sortix/vgatextbuffer.h b/kernel/vgatextbuffer.h
similarity index 100%
rename from sortix/vgatextbuffer.h
rename to kernel/vgatextbuffer.h
diff --git a/sortix/video.cpp b/kernel/video.cpp
similarity index 100%
rename from sortix/video.cpp
rename to kernel/video.cpp
diff --git a/sortix/vnode.cpp b/kernel/vnode.cpp
similarity index 100%
rename from sortix/vnode.cpp
rename to kernel/vnode.cpp
diff --git a/sortix/worker.cpp b/kernel/worker.cpp
similarity index 100%
rename from sortix/worker.cpp
rename to kernel/worker.cpp
diff --git a/sortix/x64/base.s b/kernel/x64/base.s
similarity index 100%
rename from sortix/x64/base.s
rename to kernel/x64/base.s
diff --git a/sortix/x64/boot.s b/kernel/x64/boot.s
similarity index 100%
rename from sortix/x64/boot.s
rename to kernel/x64/boot.s
diff --git a/sortix/x64/calltrace.s b/kernel/x64/calltrace.s
similarity index 100%
rename from sortix/x64/calltrace.s
rename to kernel/x64/calltrace.s
diff --git a/sortix/x64/crti.s b/kernel/x64/crti.s
similarity index 100%
rename from sortix/x64/crti.s
rename to kernel/x64/crti.s
diff --git a/sortix/x64/crtn.s b/kernel/x64/crtn.s
similarity index 100%
rename from sortix/x64/crtn.s
rename to kernel/x64/crtn.s
diff --git a/sortix/x64/interrupt.s b/kernel/x64/interrupt.s
similarity index 100%
rename from sortix/x64/interrupt.s
rename to kernel/x64/interrupt.s
diff --git a/sortix/x64/kthread.s b/kernel/x64/kthread.s
similarity index 100%
rename from sortix/x64/kthread.s
rename to kernel/x64/kthread.s
diff --git a/sortix/x64/memorymanagement.cpp b/kernel/x64/memorymanagement.cpp
similarity index 100%
rename from sortix/x64/memorymanagement.cpp
rename to kernel/x64/memorymanagement.cpp
diff --git a/sortix/x64/memorymanagement.h b/kernel/x64/memorymanagement.h
similarity index 100%
rename from sortix/x64/memorymanagement.h
rename to kernel/x64/memorymanagement.h
diff --git a/sortix/x64/process.cpp b/kernel/x64/process.cpp
similarity index 100%
rename from sortix/x64/process.cpp
rename to kernel/x64/process.cpp
diff --git a/sortix/x64/syscall.s b/kernel/x64/syscall.s
similarity index 100%
rename from sortix/x64/syscall.s
rename to kernel/x64/syscall.s
diff --git a/sortix/x64/thread.cpp b/kernel/x64/thread.cpp
similarity index 100%
rename from sortix/x64/thread.cpp
rename to kernel/x64/thread.cpp
diff --git a/sortix/x64/x64.cpp b/kernel/x64/x64.cpp
similarity index 100%
rename from sortix/x64/x64.cpp
rename to kernel/x64/x64.cpp
diff --git a/sortix/x86-family/cmos.cpp b/kernel/x86-family/cmos.cpp
similarity index 100%
rename from sortix/x86-family/cmos.cpp
rename to kernel/x86-family/cmos.cpp
diff --git a/sortix/x86-family/cmos.h b/kernel/x86-family/cmos.h
similarity index 100%
rename from sortix/x86-family/cmos.h
rename to kernel/x86-family/cmos.h
diff --git a/sortix/x86-family/float.cpp b/kernel/x86-family/float.cpp
similarity index 100%
rename from sortix/x86-family/float.cpp
rename to kernel/x86-family/float.cpp
diff --git a/sortix/x86-family/float.h b/kernel/x86-family/float.h
similarity index 100%
rename from sortix/x86-family/float.h
rename to kernel/x86-family/float.h
diff --git a/sortix/x86-family/gdt.cpp b/kernel/x86-family/gdt.cpp
similarity index 100%
rename from sortix/x86-family/gdt.cpp
rename to kernel/x86-family/gdt.cpp
diff --git a/sortix/x86-family/gdt.h b/kernel/x86-family/gdt.h
similarity index 100%
rename from sortix/x86-family/gdt.h
rename to kernel/x86-family/gdt.h
diff --git a/sortix/x86-family/idt.cpp b/kernel/x86-family/idt.cpp
similarity index 100%
rename from sortix/x86-family/idt.cpp
rename to kernel/x86-family/idt.cpp
diff --git a/sortix/x86-family/idt.h b/kernel/x86-family/idt.h
similarity index 100%
rename from sortix/x86-family/idt.h
rename to kernel/x86-family/idt.h
diff --git a/sortix/x86-family/memorymanagement.cpp b/kernel/x86-family/memorymanagement.cpp
similarity index 100%
rename from sortix/x86-family/memorymanagement.cpp
rename to kernel/x86-family/memorymanagement.cpp
diff --git a/sortix/x86-family/memorymanagement.h b/kernel/x86-family/memorymanagement.h
similarity index 100%
rename from sortix/x86-family/memorymanagement.h
rename to kernel/x86-family/memorymanagement.h
diff --git a/sortix/x86-family/msr.cpp b/kernel/x86-family/msr.cpp
similarity index 100%
rename from sortix/x86-family/msr.cpp
rename to kernel/x86-family/msr.cpp
diff --git a/sortix/x86-family/msr.h b/kernel/x86-family/msr.h
similarity index 100%
rename from sortix/x86-family/msr.h
rename to kernel/x86-family/msr.h
diff --git a/sortix/x86-family/time.cpp b/kernel/x86-family/time.cpp
similarity index 100%
rename from sortix/x86-family/time.cpp
rename to kernel/x86-family/time.cpp
diff --git a/sortix/x86-family/x86-family.cpp b/kernel/x86-family/x86-family.cpp
similarity index 100%
rename from sortix/x86-family/x86-family.cpp
rename to kernel/x86-family/x86-family.cpp
diff --git a/sortix/x86-family/x86-family.h b/kernel/x86-family/x86-family.h
similarity index 100%
rename from sortix/x86-family/x86-family.h
rename to kernel/x86-family/x86-family.h
diff --git a/sortix/x86/base.s b/kernel/x86/base.s
similarity index 100%
rename from sortix/x86/base.s
rename to kernel/x86/base.s
diff --git a/sortix/x86/boot.s b/kernel/x86/boot.s
similarity index 100%
rename from sortix/x86/boot.s
rename to kernel/x86/boot.s
diff --git a/sortix/x86/calltrace.s b/kernel/x86/calltrace.s
similarity index 100%
rename from sortix/x86/calltrace.s
rename to kernel/x86/calltrace.s
diff --git a/sortix/x86/crti.s b/kernel/x86/crti.s
similarity index 100%
rename from sortix/x86/crti.s
rename to kernel/x86/crti.s
diff --git a/sortix/x86/crtn.s b/kernel/x86/crtn.s
similarity index 100%
rename from sortix/x86/crtn.s
rename to kernel/x86/crtn.s
diff --git a/sortix/x86/interrupt.s b/kernel/x86/interrupt.s
similarity index 100%
rename from sortix/x86/interrupt.s
rename to kernel/x86/interrupt.s
diff --git a/sortix/x86/kthread.s b/kernel/x86/kthread.s
similarity index 100%
rename from sortix/x86/kthread.s
rename to kernel/x86/kthread.s
diff --git a/sortix/x86/memorymanagement.cpp b/kernel/x86/memorymanagement.cpp
similarity index 100%
rename from sortix/x86/memorymanagement.cpp
rename to kernel/x86/memorymanagement.cpp
diff --git a/sortix/x86/memorymanagement.h b/kernel/x86/memorymanagement.h
similarity index 100%
rename from sortix/x86/memorymanagement.h
rename to kernel/x86/memorymanagement.h
diff --git a/sortix/x86/process.cpp b/kernel/x86/process.cpp
similarity index 100%
rename from sortix/x86/process.cpp
rename to kernel/x86/process.cpp
diff --git a/sortix/x86/syscall.s b/kernel/x86/syscall.s
similarity index 100%
rename from sortix/x86/syscall.s
rename to kernel/x86/syscall.s
diff --git a/sortix/x86/thread.cpp b/kernel/x86/thread.cpp
similarity index 100%
rename from sortix/x86/thread.cpp
rename to kernel/x86/thread.cpp
diff --git a/sortix/x86/x86.cpp b/kernel/x86/x86.cpp
similarity index 100%
rename from sortix/x86/x86.cpp
rename to kernel/x86/x86.cpp
diff --git a/libc/sys/mman/mmap.cpp b/libc/sys/mman/mmap.cpp
index da1944b0..d7ed379c 100644
--- a/libc/sys/mman/mmap.cpp
+++ b/libc/sys/mman/mmap.cpp
@@ -31,7 +31,7 @@
 //       values portably - then we'll make a new mmap system call that uses this
 //       mechanism if needed.
 
-struct mmap_request /* duplicated in sortix/mmap.cpp */
+struct mmap_request /* duplicated in kernel/mmap.cpp */
 {
 	void* addr;
 	size_t size;
diff --git a/mkinitrd/Makefile b/mkinitrd/Makefile
index 310507d2..989ca9dd 100644
--- a/mkinitrd/Makefile
+++ b/mkinitrd/Makefile
@@ -10,7 +10,7 @@ ifndef CXXFLAGS
   CXXFLAGS:=$(OPTLEVEL)
 endif
 
-SORTIXKERNEL=../sortix
+SORTIXKERNEL=../kernel
 
 CPPFLAGS:=$(CPPFLAGS) -I$(SORTIXKERNEL)/include -I.
 CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra -fno-exceptions -fno-rtti
diff --git a/system/Makefile b/system/Makefile
index 7e312477..45e2e290 100644
--- a/system/Makefile
+++ b/system/Makefile
@@ -27,7 +27,7 @@ clean:
 	$(MAKE) -B -C $(SRCDIR)/utils clean
 	$(MAKE) -B -C $(SRCDIR)/ext clean
 	$(MAKE) -B -C $(SRCDIR)/mbr clean
-	$(MAKE) -B -C $(SRCDIR)/sortix clean
+	$(MAKE) -B -C $(SRCDIR)/kernel clean
 
 # Set up the base filesystem.
 fsh:
@@ -55,7 +55,7 @@ system-headers:
 	$(MAKE) system-headers_internal ROOT=$(ROOT)
 
 system-headers_internal:
-	$(MAKE) -B -C $(SRCDIR)/sortix install-headers DESTDIR=$(ROOT)
+	$(MAKE) -B -C $(SRCDIR)/kernel install-headers DESTDIR=$(ROOT)
 	$(MAKE) -B -C $(SRCDIR)/libc install-headers DESTDIR=$(ROOT)
 	$(MAKE) -B -C $(SRCDIR)/libm install-headers DESTDIR=$(ROOT)
 
@@ -74,12 +74,12 @@ system:
 	$(MAKE) -B -C $(SRCDIR)/bench install DESTDIR=$(ROOT) C_INCLUDE_PATH=$(ROOT)/include CPLUS_INCLUDE_PATH=$(ROOT)/include LIBRARY_PATH=$(ROOT)/$(cputype)/lib
 	$(MAKE) -B -C $(SRCDIR)/ext install DESTDIR=$(ROOT) C_INCLUDE_PATH=$(ROOT)/include CPLUS_INCLUDE_PATH=$(ROOT)/include LIBRARY_PATH=$(ROOT)/$(cputype)/lib
 	$(MAKE) -B -C $(SRCDIR)/mbr install DESTDIR=$(ROOT) C_INCLUDE_PATH=$(ROOT)/include CPLUS_INCLUDE_PATH=$(ROOT)/include LIBRARY_PATH=$(ROOT)/$(cputype)/lib
-	$(MAKE) -B -C $(SRCDIR)/sortix install DESTDIR=$(ROOT) C_INCLUDE_PATH=$(ROOT)/include CPLUS_INCLUDE_PATH=$(ROOT)/include LIBRARY_PATH=$(ROOT)/$(cputype)/libs
+	$(MAKE) -B -C $(SRCDIR)/kernel install DESTDIR=$(ROOT) C_INCLUDE_PATH=$(ROOT)/include CPLUS_INCLUDE_PATH=$(ROOT)/include LIBRARY_PATH=$(ROOT)/$(cputype)/libs
 
 # Rebuild and install the kernel
 kernel:
-	$(MAKE) -B -C $(SRCDIR)/sortix install-headers DESTDIR=$(ROOT)
-	$(MAKE) -B -C $(SRCDIR)/sortix install DESTDIR=$(ROOT) C_INCLUDE_PATH=$(ROOT)/include CPLUS_INCLUDE_PATH=$(ROOT)/include LIBRARY_PATH=$(ROOT)/$(cputype)/libs
+	$(MAKE) -B -C $(SRCDIR)/kernel install-headers DESTDIR=$(ROOT)
+	$(MAKE) -B -C $(SRCDIR)/kernel install DESTDIR=$(ROOT) C_INCLUDE_PATH=$(ROOT)/include CPLUS_INCLUDE_PATH=$(ROOT)/include LIBRARY_PATH=$(ROOT)/$(cputype)/libs
 
 # Rebuild the initrd and the kernel.
 boot-files: initrd kernel