diff --git a/Kernel/ELFImage.cpp b/Kernel/ELF/ELFImage.cpp
similarity index 100%
rename from Kernel/ELFImage.cpp
rename to Kernel/ELF/ELFImage.cpp
diff --git a/Kernel/ELFImage.h b/Kernel/ELF/ELFImage.h
similarity index 99%
rename from Kernel/ELFImage.h
rename to Kernel/ELF/ELFImage.h
index 20480a72b7..74fe4d90b1 100644
--- a/Kernel/ELFImage.h
+++ b/Kernel/ELF/ELFImage.h
@@ -3,7 +3,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/HashMap.h>
 #include <AK/AKString.h>
-#include <Kernel/exec_elf.h>
+#include <Kernel/ELF/exec_elf.h>
 #include <Kernel/types.h>
 
 class ELFImage {
diff --git a/Kernel/ELFLoader.cpp b/Kernel/ELF/ELFLoader.cpp
similarity index 100%
rename from Kernel/ELFLoader.cpp
rename to Kernel/ELF/ELFLoader.cpp
diff --git a/Kernel/ELFLoader.h b/Kernel/ELF/ELFLoader.h
similarity index 100%
rename from Kernel/ELFLoader.h
rename to Kernel/ELF/ELFLoader.h
diff --git a/Kernel/exec_elf.h b/Kernel/ELF/exec_elf.h
similarity index 100%
rename from Kernel/exec_elf.h
rename to Kernel/ELF/exec_elf.h
diff --git a/Kernel/Makefile b/Kernel/Makefile
index d64d65b097..f19d45cf6c 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -24,8 +24,8 @@ KERNEL_OBJS = \
        FIFO.o \
        Scheduler.o \
        DoubleBuffer.o \
-       ELFImage.o \
-       ELFLoader.o \
+       ELF/ELFImage.o \
+       ELF/ELFLoader.o \
        KSyms.o \
        FileSystem/DevPtsFS.o \
        BXVGADevice.o \
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index 4dfa5ddf23..0ea53ec172 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -7,7 +7,7 @@
 #include <Kernel/FileDescriptor.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/NullDevice.h>
-#include "ELFLoader.h"
+#include <Kernel/ELF/ELFLoader.h>
 #include "MemoryManager.h"
 #include "i8253.h"
 #include "RTC.h"
@@ -20,7 +20,7 @@
 #include "KSyms.h"
 #include <Kernel/Socket.h>
 #include <Kernel/TTY/MasterPTY.h>
-#include <Kernel/exec_elf.h>
+#include <Kernel/ELF/exec_elf.h>
 #include <AK/StringBuilder.h>
 
 //#define DEBUG_IO