diff --git a/Kernel/Devices/Device.h b/Kernel/Devices/Device.h
index 2e1c291d1f..fd9e2a5d1d 100644
--- a/Kernel/Devices/Device.h
+++ b/Kernel/Devices/Device.h
@@ -2,7 +2,7 @@
 
 #include <AK/Retainable.h>
 #include <AK/Types.h>
-#include "FileDescriptor.h"
+#include <Kernel/FileSystem/FileDescriptor.h>
 
 class Process;
 
diff --git a/Kernel/FIFO.cpp b/Kernel/FileSystem/FIFO.cpp
similarity index 97%
rename from Kernel/FIFO.cpp
rename to Kernel/FileSystem/FIFO.cpp
index ed4d6503e4..f742df4449 100644
--- a/Kernel/FIFO.cpp
+++ b/Kernel/FileSystem/FIFO.cpp
@@ -1,4 +1,4 @@
-#include "FIFO.h"
+#include <Kernel/FileSystem/FIFO.h>
 #include <AK/StdLibExtras.h>
 
 //#define FIFO_DEBUG
diff --git a/Kernel/FIFO.h b/Kernel/FileSystem/FIFO.h
similarity index 100%
rename from Kernel/FIFO.h
rename to Kernel/FileSystem/FIFO.h
diff --git a/Kernel/FileDescriptor.cpp b/Kernel/FileSystem/FileDescriptor.cpp
similarity index 99%
rename from Kernel/FileDescriptor.cpp
rename to Kernel/FileSystem/FileDescriptor.cpp
index 86c60d447d..c546d5545d 100644
--- a/Kernel/FileDescriptor.cpp
+++ b/Kernel/FileSystem/FileDescriptor.cpp
@@ -4,10 +4,10 @@
 #include <LibC/errno_numbers.h>
 #include "UnixTypes.h"
 #include <AK/BufferStream.h>
-#include "FIFO.h"
+#include <Kernel/FileSystem/FIFO.h>
 #include <Kernel/TTY/TTY.h>
 #include <Kernel/TTY/MasterPTY.h>
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 #include <Kernel/Process.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/VM/MemoryManager.h>
diff --git a/Kernel/FileDescriptor.h b/Kernel/FileSystem/FileDescriptor.h
similarity index 98%
rename from Kernel/FileDescriptor.h
rename to Kernel/FileSystem/FileDescriptor.h
index 566015221d..fb0a4b6f31 100644
--- a/Kernel/FileDescriptor.h
+++ b/Kernel/FileSystem/FileDescriptor.h
@@ -2,13 +2,13 @@
 
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/FileSystem/InodeMetadata.h>
+#include <Kernel/FileSystem/FIFO.h>
 #include <Kernel/LinearAddress.h>
-#include <Kernel/FIFO.h>
 #include <AK/ByteBuffer.h>
 #include <AK/CircularQueue.h>
 #include <AK/Retainable.h>
 #include <AK/Badge.h>
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 
 class TTY;
 class MasterPTY;
diff --git a/Kernel/FileSystem/FileSystem.cpp b/Kernel/FileSystem/FileSystem.cpp
index da82a87234..93d8d8d256 100644
--- a/Kernel/FileSystem/FileSystem.cpp
+++ b/Kernel/FileSystem/FileSystem.cpp
@@ -4,7 +4,7 @@
 #include <LibC/errno_numbers.h>
 #include "FileSystem.h"
 #include <Kernel/VM/MemoryManager.h>
-#include <Kernel/LocalSocket.h>
+#include <Kernel/Net/LocalSocket.h>
 
 static dword s_lastFileSystemID;
 static HashMap<dword, FS*>* s_fs_map;
diff --git a/Kernel/FileSystem/SyntheticFileSystem.cpp b/Kernel/FileSystem/SyntheticFileSystem.cpp
index d0cabdc209..e55d31f061 100644
--- a/Kernel/FileSystem/SyntheticFileSystem.cpp
+++ b/Kernel/FileSystem/SyntheticFileSystem.cpp
@@ -1,5 +1,5 @@
 #include <Kernel/FileSystem/SyntheticFileSystem.h>
-#include <Kernel/FileDescriptor.h>
+#include <Kernel/FileSystem/FileDescriptor.h>
 #include <LibC/errno_numbers.h>
 #include <AK/StdLibExtras.h>
 
diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp
index 8def1c799e..e1665c5efb 100644
--- a/Kernel/FileSystem/VirtualFileSystem.cpp
+++ b/Kernel/FileSystem/VirtualFileSystem.cpp
@@ -1,5 +1,5 @@
 #include "VirtualFileSystem.h"
-#include "FileDescriptor.h"
+#include <Kernel/FileSystem/FileDescriptor.h>
 #include "FileSystem.h"
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>
diff --git a/Kernel/Makefile b/Kernel/Makefile
index 847674111a..6e83aff6d6 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -25,7 +25,7 @@ KERNEL_OBJS = \
        TTY/MasterPTY.o \
        TTY/SlavePTY.o \
        TTY/VirtualConsole.o \
-       FIFO.o \
+       FileSystem/FIFO.o \
        Scheduler.o \
        DoubleBuffer.o \
        ELF/ELFImage.o \
@@ -35,8 +35,8 @@ KERNEL_OBJS = \
        Devices/BXVGADevice.o \
        PCI.o \
        Devices/PS2MouseDevice.o \
-       Socket.o \
-       LocalSocket.o \
+       Net/Socket.o \
+       Net/LocalSocket.o \
        Net/IPv4Socket.o \
        Net/TCPSocket.o \
        Net/UDPSocket.o \
diff --git a/Kernel/Net/IPv4Socket.h b/Kernel/Net/IPv4Socket.h
index 1cae3b17ed..d090a7730e 100644
--- a/Kernel/Net/IPv4Socket.h
+++ b/Kernel/Net/IPv4Socket.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 #include <Kernel/DoubleBuffer.h>
 #include <Kernel/Net/IPv4.h>
 #include <AK/HashMap.h>
diff --git a/Kernel/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp
similarity index 99%
rename from Kernel/LocalSocket.cpp
rename to Kernel/Net/LocalSocket.cpp
index d9f543a99f..906f9500fd 100644
--- a/Kernel/LocalSocket.cpp
+++ b/Kernel/Net/LocalSocket.cpp
@@ -1,4 +1,4 @@
-#include <Kernel/LocalSocket.h>
+#include <Kernel/Net/LocalSocket.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/Process.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
diff --git a/Kernel/LocalSocket.h b/Kernel/Net/LocalSocket.h
similarity index 97%
rename from Kernel/LocalSocket.h
rename to Kernel/Net/LocalSocket.h
index 1b56b0a33b..dd161d36a0 100644
--- a/Kernel/LocalSocket.h
+++ b/Kernel/Net/LocalSocket.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 #include <Kernel/DoubleBuffer.h>
 
 class FileDescriptor;
diff --git a/Kernel/Socket.cpp b/Kernel/Net/Socket.cpp
similarity index 98%
rename from Kernel/Socket.cpp
rename to Kernel/Net/Socket.cpp
index 78adac287a..83c7256d00 100644
--- a/Kernel/Socket.cpp
+++ b/Kernel/Net/Socket.cpp
@@ -1,5 +1,5 @@
-#include <Kernel/Socket.h>
-#include <Kernel/LocalSocket.h>
+#include <Kernel/Net/Socket.h>
+#include <Kernel/Net/LocalSocket.h>
 #include <Kernel/Net/IPv4Socket.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/Process.h>
diff --git a/Kernel/Socket.h b/Kernel/Net/Socket.h
similarity index 100%
rename from Kernel/Socket.h
rename to Kernel/Net/Socket.h
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index b700f54275..261062e5f9 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -4,7 +4,7 @@
 #include "StdLib.h"
 #include "i386.h"
 #include "system.h"
-#include <Kernel/FileDescriptor.h>
+#include <Kernel/FileSystem/FileDescriptor.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/Devices/NullDevice.h>
 #include <Kernel/ELF/ELFLoader.h>
@@ -16,9 +16,9 @@
 #include <LibC/errno_numbers.h>
 #include "Syscall.h"
 #include "Scheduler.h"
-#include "FIFO.h"
+#include <Kernel/FileSystem/FIFO.h>
 #include "KSyms.h"
-#include <Kernel/Socket.h>
+#include <Kernel/Net/Socket.h>
 #include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/ELF/exec_elf.h>
 #include <AK/StringBuilder.h>