26 files changed, 60 insertions, 62 deletions
diff --git a/Kernel/Makefile b/Kernel/Makefile
index 11cc3a4142..85ef1c7e55 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -34,14 +34,14 @@ KERNEL_OBJS = \
        PS2MouseDevice.o \
        Socket.o \
        LocalSocket.o \
-       IPv4Socket.o \
-       TCPSocket.o \
-       UDPSocket.o \
-       NetworkAdapter.o \
-       E1000NetworkAdapter.o \
+       Net/IPv4Socket.o \
+       Net/TCPSocket.o \
+       Net/UDPSocket.o \
+       Net/NetworkAdapter.o \
+       Net/E1000NetworkAdapter.o \
        Net/LoopbackAdapter.o \
        Net/Routing.o \
-       NetworkTask.o
+       Net/NetworkTask.o
 
 VFS_OBJS = \
     DiskDevice.o \
diff --git a/Kernel/ARP.h b/Kernel/Net/ARP.h
index 934995d440..ddfcd54f63 100644
--- a/Kernel/ARP.h
+++ b/Kernel/Net/ARP.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Kernel/MACAddress.h>
-#include <Kernel/IPv4.h>
-#include <Kernel/EtherType.h>
+#include <Kernel/Net/MACAddress.h>
+#include <Kernel/Net/IPv4.h>
+#include <Kernel/Net/EtherType.h>
 
 struct ARPOperation {
 enum : word {
diff --git a/Kernel/E1000NetworkAdapter.cpp b/Kernel/Net/E1000NetworkAdapter.cpp
index 05e1c79253..b73ddc70e2 100644
--- a/Kernel/E1000NetworkAdapter.cpp
+++ b/Kernel/Net/E1000NetworkAdapter.cpp
@@ -1,4 +1,4 @@
-#include <Kernel/E1000NetworkAdapter.h>
+#include <Kernel/Net/E1000NetworkAdapter.h>
 #include <Kernel/PCI.h>
 #include <Kernel/IO.h>
 
diff --git a/Kernel/E1000NetworkAdapter.h b/Kernel/Net/E1000NetworkAdapter.h
index 0bd47cda8b..c0afa4cc26 100644
--- a/Kernel/E1000NetworkAdapter.h
+++ b/Kernel/Net/E1000NetworkAdapter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/PCI.h>
 #include <Kernel/MemoryManager.h>
 #include <Kernel/IRQHandler.h>
diff --git a/Kernel/EtherType.h b/Kernel/Net/EtherType.h
index 027967ff77..027967ff77 100644
--- a/Kernel/EtherType.h
+++ b/Kernel/Net/EtherType.h
diff --git a/Kernel/EthernetFrameHeader.h b/Kernel/Net/EthernetFrameHeader.h
index af9713d30b..2b549497d9 100644
--- a/Kernel/EthernetFrameHeader.h
+++ b/Kernel/Net/EthernetFrameHeader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/MACAddress.h>
+#include <Kernel/Net/MACAddress.h>
 #include <Kernel/NetworkOrdered.h>
 
 class [[gnu::packed]] EthernetFrameHeader {
diff --git a/Kernel/ICMP.h b/Kernel/Net/ICMP.h
index c8dc818195..efc6cf4ca6 100644
--- a/Kernel/ICMP.h
+++ b/Kernel/Net/ICMP.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Kernel/MACAddress.h>
-#include <Kernel/IPv4.h>
+#include <Kernel/Net/MACAddress.h>
+#include <Kernel/Net/IPv4.h>
 
 struct ICMPType {
 enum {
diff --git a/Kernel/IPv4.h b/Kernel/Net/IPv4.h
index dc4e4dff3c..dc4e4dff3c 100644
--- a/Kernel/IPv4.h
+++ b/Kernel/Net/IPv4.h
diff --git a/Kernel/IPv4Socket.cpp b/Kernel/Net/IPv4Socket.cpp
index 3a327e1a4e..7c7b1fdb4f 100644
--- a/Kernel/IPv4Socket.cpp
+++ b/Kernel/Net/IPv4Socket.cpp
@@ -1,14 +1,14 @@
-#include <Kernel/IPv4Socket.h>
-#include <Kernel/TCPSocket.h>
-#include <Kernel/UDPSocket.h>
+#include <Kernel/Net/IPv4Socket.h>
+#include <Kernel/Net/TCPSocket.h>
+#include <Kernel/Net/UDPSocket.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/Process.h>
-#include <Kernel/NetworkAdapter.h>
-#include <Kernel/IPv4.h>
-#include <Kernel/ICMP.h>
-#include <Kernel/TCP.h>
-#include <Kernel/UDP.h>
-#include <Kernel/ARP.h>
+#include <Kernel/Net/NetworkAdapter.h>
+#include <Kernel/Net/IPv4.h>
+#include <Kernel/Net/ICMP.h>
+#include <Kernel/Net/TCP.h>
+#include <Kernel/Net/UDP.h>
+#include <Kernel/Net/ARP.h>
 #include <Kernel/Net/Routing.h>
 #include <LibC/errno_numbers.h>
 
diff --git a/Kernel/IPv4Socket.h b/Kernel/Net/IPv4Socket.h
index d4729dd7f0..1cae3b17ed 100644
--- a/Kernel/IPv4Socket.h
+++ b/Kernel/Net/IPv4Socket.h
@@ -2,7 +2,7 @@
 
 #include <Kernel/Socket.h>
 #include <Kernel/DoubleBuffer.h>
-#include <Kernel/IPv4.h>
+#include <Kernel/Net/IPv4.h>
 #include <AK/HashMap.h>
 #include <Kernel/Lock.h>
 #include <AK/SinglyLinkedList.h>
diff --git a/Kernel/Net/LoopbackAdapter.h b/Kernel/Net/LoopbackAdapter.h
index 56cf6c4283..a852123733 100644
--- a/Kernel/Net/LoopbackAdapter.h
+++ b/Kernel/Net/LoopbackAdapter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/NetworkAdapter.h>
 
 class LoopbackAdapter final : public NetworkAdapter {
 public:
diff --git a/Kernel/MACAddress.h b/Kernel/Net/MACAddress.h
index 0c2de93b27..0c2de93b27 100644
--- a/Kernel/MACAddress.h
+++ b/Kernel/Net/MACAddress.h
diff --git a/Kernel/NetworkAdapter.cpp b/Kernel/Net/NetworkAdapter.cpp
index aa4d45b9b1..a1e5e31c9d 100644
--- a/Kernel/NetworkAdapter.cpp
+++ b/Kernel/Net/NetworkAdapter.cpp
@@ -1,8 +1,8 @@
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/NetworkAdapter.h>
+#include <Kernel/Net/EthernetFrameHeader.h>
+#include <Kernel/Net/EtherType.h>
 #include <Kernel/StdLib.h>
-#include <Kernel/EthernetFrameHeader.h>
 #include <Kernel/kmalloc.h>
-#include <Kernel/EtherType.h>
 #include <AK/HashTable.h>
 #include <Kernel/Lock.h>
 
diff --git a/Kernel/NetworkAdapter.h b/Kernel/Net/NetworkAdapter.h
index a040aaced2..3a7d0755c7 100644
--- a/Kernel/NetworkAdapter.h
+++ b/Kernel/Net/NetworkAdapter.h
@@ -3,10 +3,10 @@
 #include <AK/ByteBuffer.h>
 #include <AK/SinglyLinkedList.h>
 #include <AK/Types.h>
-#include <Kernel/MACAddress.h>
-#include <Kernel/IPv4.h>
-#include <Kernel/ARP.h>
-#include <Kernel/ICMP.h>
+#include <Kernel/Net/MACAddress.h>
+#include <Kernel/Net/IPv4.h>
+#include <Kernel/Net/ARP.h>
+#include <Kernel/Net/ICMP.h>
 #include <Kernel/Alarm.h>
 
 class NetworkAdapter;
diff --git a/Kernel/NetworkTask.cpp b/Kernel/Net/NetworkTask.cpp
index 9132765dc3..fbd73671af 100644
--- a/Kernel/NetworkTask.cpp
+++ b/Kernel/Net/NetworkTask.cpp
@@ -1,17 +1,18 @@
-#include <Kernel/E1000NetworkAdapter.h>
-#include <Kernel/EthernetFrameHeader.h>
-#include <Kernel/ARP.h>
-#include <Kernel/ICMP.h>
-#include <Kernel/UDP.h>
-#include <Kernel/TCP.h>
-#include <Kernel/IPv4.h>
-#include <Kernel/IPv4Socket.h>
-#include <Kernel/TCPSocket.h>
-#include <Kernel/UDPSocket.h>
+#include <Kernel/Net/E1000NetworkAdapter.h>
+#include <Kernel/Net/EthernetFrameHeader.h>
+#include <Kernel/Net/ARP.h>
+#include <Kernel/Net/ICMP.h>
+#include <Kernel/Net/UDP.h>
+#include <Kernel/Net/TCP.h>
+#include <Kernel/Net/IPv4.h>
+#include <Kernel/Net/IPv4Socket.h>
+#include <Kernel/Net/TCPSocket.h>
+#include <Kernel/Net/UDPSocket.h>
+#include <Kernel/Net/LoopbackAdapter.h>
 #include <Kernel/Process.h>
-#include <Kernel/EtherType.h>
+#include <Kernel/Net/EtherType.h>
 #include <Kernel/Lock.h>
-#include <Kernel/Net/LoopbackAdapter.h>
+
 
 //#define ETHERNET_DEBUG
 #define IPV4_DEBUG
diff --git a/Kernel/NetworkTask.h b/Kernel/Net/NetworkTask.h
index 16d8817309..16d8817309 100644
--- a/Kernel/NetworkTask.h
+++ b/Kernel/Net/NetworkTask.h
diff --git a/Kernel/Net/Routing.h b/Kernel/Net/Routing.h
index 85eb72a116..48143520eb 100644
--- a/Kernel/Net/Routing.h
+++ b/Kernel/Net/Routing.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/NetworkAdapter.h>
 
 NetworkAdapter* adapter_for_route_to(const IPv4Address&);
diff --git a/Kernel/TCP.h b/Kernel/Net/TCP.h
index 989f7b3739..e2eac61449 100644
--- a/Kernel/TCP.h
+++ b/Kernel/Net/TCP.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/IPv4.h>
+#include <Kernel/Net/IPv4.h>
 
 struct TCPFlags {
 enum : word {
diff --git a/Kernel/TCPSocket.cpp b/Kernel/Net/TCPSocket.cpp
index dd856314e4..af37186395 100644
--- a/Kernel/TCPSocket.cpp
+++ b/Kernel/Net/TCPSocket.cpp
@@ -1,8 +1,8 @@
-#include <Kernel/TCPSocket.h>
-#include <Kernel/TCP.h>
-#include <Kernel/NetworkAdapter.h>
-#include <Kernel/Process.h>
+#include <Kernel/Net/TCPSocket.h>
+#include <Kernel/Net/TCP.h>
+#include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Net/Routing.h>
+#include <Kernel/Process.h>
 #include <Kernel/RandomDevice.h>
 
 Lockable<HashMap<word, TCPSocket*>>& TCPSocket::sockets_by_port()
diff --git a/Kernel/TCPSocket.h b/Kernel/Net/TCPSocket.h
index 1d59a41e83..5a1d88b2f7 100644
--- a/Kernel/TCPSocket.h
+++ b/Kernel/Net/TCPSocket.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/IPv4Socket.h>
+#include <Kernel/Net/IPv4Socket.h>
 
 class TCPSocket final : public IPv4Socket {
 public:
diff --git a/Kernel/UDP.h b/Kernel/Net/UDP.h
index c4da36b7a5..ba6d02af37 100644
--- a/Kernel/UDP.h
+++ b/Kernel/Net/UDP.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/IPv4.h>
+#include <Kernel/Net/IPv4.h>
 
 class [[gnu::packed]] UDPPacket {
 public:
diff --git a/Kernel/UDPSocket.cpp b/Kernel/Net/UDPSocket.cpp
index c54d94a16f..ff8c2baa82 100644
--- a/Kernel/UDPSocket.cpp
+++ b/Kernel/Net/UDPSocket.cpp
@@ -1,6 +1,6 @@
-#include <Kernel/UDPSocket.h>
-#include <Kernel/UDP.h>
-#include <Kernel/NetworkAdapter.h>
+#include <Kernel/Net/UDPSocket.h>
+#include <Kernel/Net/UDP.h>
+#include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Process.h>
 #include <Kernel/RandomDevice.h>
 #include <Kernel/Net/Routing.h>
diff --git a/Kernel/UDPSocket.h b/Kernel/Net/UDPSocket.h
index 69c3a66a24..904243db34 100644
--- a/Kernel/UDPSocket.h
+++ b/Kernel/Net/UDPSocket.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/IPv4Socket.h>
+#include <Kernel/Net/IPv4Socket.h>
 
 class UDPSocketHandle;
 
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index e4445667bd..e8781ab047 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -22,9 +22,6 @@
 #include "MasterPTY.h"
 #include "elf.h"
 #include <AK/StringBuilder.h>
-#include <Kernel/E1000NetworkAdapter.h>
-#include <Kernel/EthernetFrameHeader.h>
-#include <Kernel/ARP.h>
 
 //#define DEBUG_IO
 //#define TASK_DEBUG
diff --git a/Kernel/Socket.cpp b/Kernel/Socket.cpp
index e6e26114b6..78adac287a 100644
--- a/Kernel/Socket.cpp
+++ b/Kernel/Socket.cpp
@@ -1,6 +1,6 @@
 #include <Kernel/Socket.h>
 #include <Kernel/LocalSocket.h>
-#include <Kernel/IPv4Socket.h>
+#include <Kernel/Net/IPv4Socket.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/Process.h>
 #include <LibC/errno_numbers.h>
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index d31ce1013a..e896dce1dc 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -23,8 +23,8 @@
 #include "PTYMultiplexer.h"
 #include "DevPtsFS.h"
 #include "BXVGADevice.h"
-#include "E1000NetworkAdapter.h"
-#include <Kernel/NetworkTask.h>
+#include <Kernel/Net/E1000NetworkAdapter.h>
+#include <Kernel/Net/NetworkTask.h>
 
 #define SPAWN_LAUNCHER
 //#define SPAWN_GUITEST2