diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 958bf951..fb56e7ef 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -45,8 +45,8 @@ set(SOURCES
     src/fs/devices/ZeroDevice.cpp
     src/fs/devices/ConsoleDevice.cpp
     src/fs/devices/FramebufferDevice.cpp
-    src/InitRD.cpp
-    src/ELF.cpp
+    src/fs/InitRD.cpp
+    src/thread/ELF.cpp
 )
 
 if("${LUNA_ARCH}" MATCHES "x86_64")
diff --git a/kernel/src/boot/Init.cpp b/kernel/src/boot/Init.cpp
index 139cddaa..4f291585 100644
--- a/kernel/src/boot/Init.cpp
+++ b/kernel/src/boot/Init.cpp
@@ -1,8 +1,8 @@
 #include "boot/Init.h"
-#include "InitRD.h"
 #include "Log.h"
 #include "arch/CPU.h"
 #include "boot/bootboot.h"
+#include "fs/InitRD.h"
 #include "memory/MemoryManager.h"
 #include "video/Framebuffer.h"
 #include <luna/CString.h>
diff --git a/kernel/src/InitRD.cpp b/kernel/src/fs/InitRD.cpp
similarity index 100%
rename from kernel/src/InitRD.cpp
rename to kernel/src/fs/InitRD.cpp
diff --git a/kernel/src/InitRD.h b/kernel/src/fs/InitRD.h
similarity index 100%
rename from kernel/src/InitRD.h
rename to kernel/src/fs/InitRD.h
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index 97962402..a879e770 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -1,5 +1,3 @@
-#include "ELF.h"
-#include "InitRD.h"
 #include "Log.h"
 #include "arch/CPU.h"
 #include "arch/MMU.h"
@@ -7,6 +5,7 @@
 #include "arch/Timer.h"
 #include "boot/Init.h"
 #include "config.h"
+#include "fs/InitRD.h"
 #include "fs/devices/DeviceRegistry.h"
 #include "fs/tmpfs/FileSystem.h"
 #include "memory/Heap.h"
diff --git a/kernel/src/sys/exec.cpp b/kernel/src/sys/exec.cpp
index cfa9e248..4259b8a8 100644
--- a/kernel/src/sys/exec.cpp
+++ b/kernel/src/sys/exec.cpp
@@ -1,8 +1,8 @@
-#include "ELF.h"
 #include "Log.h"
 #include "fs/VFS.h"
 #include "memory/MemoryManager.h"
 #include "sys/Syscall.h"
+#include "thread/ELF.h"
 #include "thread/Scheduler.h"
 #include "thread/ThreadImage.h"
 #include <bits/modes.h>
diff --git a/kernel/src/ELF.cpp b/kernel/src/thread/ELF.cpp
similarity index 100%
rename from kernel/src/ELF.cpp
rename to kernel/src/thread/ELF.cpp
diff --git a/kernel/src/ELF.h b/kernel/src/thread/ELF.h
similarity index 100%
rename from kernel/src/ELF.h
rename to kernel/src/thread/ELF.h