diff --git a/Makefile b/Makefile
index 94533c5..3d5fc3b 100644
--- a/Makefile
+++ b/Makefile
@@ -25,9 +25,6 @@ C_SOURCES = $(wildcard $(SRC_DIR)/core/*.c) \
             $(wildcard $(SRC_DIR)/net/nic/*.c) \
             $(wildcard $(SRC_DIR)/fs/*.c) \
             $(wildcard $(SRC_DIR)/wm/*.c) \
-            $(SRC_DIR)/cmd.c \
-            $(SRC_DIR)/stb_image.c \
-            $(SRC_DIR)/lwip_port.c \
             $(wildcard $(SRC_DIR)/net/lwip/core/*.c) \
             $(wildcard $(SRC_DIR)/net/lwip/core/ipv4/*.c) \
 			$(SRC_DIR)/net/lwip/netif/ethernet.c \
@@ -42,9 +39,6 @@ OBJ_FILES = $(patsubst $(SRC_DIR)/core/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_D
             $(patsubst $(SRC_DIR)/net/nic/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/net/nic/*.c)) \
             $(patsubst $(SRC_DIR)/fs/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/fs/*.c)) \
             $(patsubst $(SRC_DIR)/wm/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/wm/*.c)) \
-            $(BUILD_DIR)/cmd.o \
-            $(BUILD_DIR)/stb_image.o \
-            $(BUILD_DIR)/lwip_port.o \
             $(patsubst $(SRC_DIR)/net/lwip/%.c, $(BUILD_DIR)/lwip/%.o, $(filter $(SRC_DIR)/net/lwip/%.c, $(C_SOURCES))) \
             $(patsubst $(SRC_DIR)/arch/%.asm, $(BUILD_DIR)/%.o, $(ASM_SOURCES))
 
@@ -75,9 +69,9 @@ limine-setup:
 		rm -rf limine; \
 		git clone https://github.com/limine-bootloader/limine.git --branch=v$(LIMINE_VERSION)-binary --depth=1 limine; \
 	fi
-	@if [ ! -f $(SRC_DIR)/limine.h ]; then \
+	@if [ ! -f $(SRC_DIR)/core/limine.h ]; then \
 		echo "Copying limine.h..."; \
-		cp limine/limine.h $(SRC_DIR)/limine.h; \
+		cp limine/limine.h $(SRC_DIR)/core/limine.h; \
 	fi
 	@echo "Building Limine host utility..."; \
 	$(MAKE) -C limine
diff --git a/boredos.iso b/boredos.iso
index 3f0796e..edc03de 100644
Binary files a/boredos.iso and b/boredos.iso differ
diff --git a/build/cmd.o b/build/cmd.o
index dfd4c7d..807b9ae 100644
Binary files a/build/cmd.o and b/build/cmd.o differ
diff --git a/build/disk_manager.o b/build/disk_manager.o
index b81b17b..aefb928 100644
Binary files a/build/disk_manager.o and b/build/disk_manager.o differ
diff --git a/build/explorer.o b/build/explorer.o
index ec99072..1061d30 100644
Binary files a/build/explorer.o and b/build/explorer.o differ
diff --git a/build/fat32.o b/build/fat32.o
index 39066ba..24ec4d1 100644
Binary files a/build/fat32.o and b/build/fat32.o differ
diff --git a/build/graphics.o b/build/graphics.o
index b221c33..f655f68 100644
Binary files a/build/graphics.o and b/build/graphics.o differ
diff --git a/build/idt.o b/build/idt.o
index bf5d9c2..9631f77 100644
Binary files a/build/idt.o and b/build/idt.o differ
diff --git a/build/main.o b/build/main.o
index 3eb2732..ac39f51 100644
Binary files a/build/main.o and b/build/main.o differ
diff --git a/build/memory_manager.o b/build/memory_manager.o
index 506844b..257c7b5 100644
Binary files a/build/memory_manager.o and b/build/memory_manager.o differ
diff --git a/build/pci.o b/build/pci.o
index e787bd2..714a26e 100644
Binary files a/build/pci.o and b/build/pci.o differ
diff --git a/build/platform.o b/build/platform.o
index ffe7029..fbbc7ce 100644
Binary files a/build/platform.o and b/build/platform.o differ
diff --git a/build/ps2.o b/build/ps2.o
index 742bf10..e2309cb 100644
Binary files a/build/ps2.o and b/build/ps2.o differ
diff --git a/build/rtc.o b/build/rtc.o
index 84011fe..124f166 100644
Binary files a/build/rtc.o and b/build/rtc.o differ
diff --git a/src/kernel/cmd.c b/src/kernel/core/cmd.c
similarity index 100%
rename from src/kernel/cmd.c
rename to src/kernel/core/cmd.c
diff --git a/src/kernel/cmd.h b/src/kernel/core/cmd.h
similarity index 100%
rename from src/kernel/cmd.h
rename to src/kernel/core/cmd.h
diff --git a/src/kernel/io.h b/src/kernel/core/io.h
similarity index 100%
rename from src/kernel/io.h
rename to src/kernel/core/io.h
diff --git a/src/kernel/limine.h b/src/kernel/core/limine.h
similarity index 100%
rename from src/kernel/limine.h
rename to src/kernel/core/limine.h
diff --git a/src/kernel/man_entries.h b/src/kernel/core/man_entries.h
similarity index 100%
rename from src/kernel/man_entries.h
rename to src/kernel/core/man_entries.h
diff --git a/src/kernel/icmp.h b/src/kernel/net/icmp.h
similarity index 100%
rename from src/kernel/icmp.h
rename to src/kernel/net/icmp.h
diff --git a/src/kernel/lwip_port.c b/src/kernel/net/lwip_port.c
similarity index 100%
rename from src/kernel/lwip_port.c
rename to src/kernel/net/lwip_port.c
diff --git a/src/kernel/lwipopts.h b/src/kernel/net/lwipopts.h
similarity index 100%
rename from src/kernel/lwipopts.h
rename to src/kernel/net/lwipopts.h
diff --git a/src/kernel/font.h b/src/kernel/wm/font.h
similarity index 100%
rename from src/kernel/font.h
rename to src/kernel/wm/font.h
diff --git a/src/kernel/stb_image.c b/src/kernel/wm/stb_image.c
similarity index 100%
rename from src/kernel/stb_image.c
rename to src/kernel/wm/stb_image.c
diff --git a/src/kernel/stb_truetype.h b/src/kernel/wm/stb_truetype.h
similarity index 100%
rename from src/kernel/stb_truetype.h
rename to src/kernel/wm/stb_truetype.h