diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 55449dc70c..57569be4d1 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -41,8 +41,6 @@ set(KERNEL_SOURCES
     Bus/VirtIO/Queue.cpp
     Bus/VirtIO/RNG.cpp
     CommandLine.cpp
-    Coredump.cpp
-    CrashHandler.cpp
     Devices/AsyncDeviceRequest.cpp
     Devices/Audio/AC97.cpp
     Devices/Audio/Channel.cpp
@@ -344,6 +342,8 @@ set(KERNEL_SOURCES
     TTY/SlavePTY.cpp
     TTY/TTY.cpp
     TTY/VirtualConsole.cpp
+    Tasks/Coredump.cpp
+    Tasks/CrashHandler.cpp
     Tasks/FinalizerTask.cpp
     Tasks/FutexQueue.cpp
     Tasks/Process.cpp
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.cpp
index ab133b25b0..592e3426cb 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Coredump.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Variables/CoredumpDirectory.h>
 #include <Kernel/Sections.h>
+#include <Kernel/Tasks/Coredump.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Syscalls/profiling.cpp b/Kernel/Syscalls/profiling.cpp
index 01d5fcd576..c21d4c4afa 100644
--- a/Kernel/Syscalls/profiling.cpp
+++ b/Kernel/Syscalls/profiling.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Coredump.h>
 #include <Kernel/PerformanceManager.h>
+#include <Kernel/Tasks/Coredump.h>
 #include <Kernel/Tasks/Process.h>
 #include <Kernel/Tasks/Scheduler.h>
 #include <Kernel/Time/TimeManagement.h>
diff --git a/Kernel/Coredump.cpp b/Kernel/Tasks/Coredump.cpp
similarity index 99%
rename from Kernel/Coredump.cpp
rename to Kernel/Tasks/Coredump.cpp
index 4cad41a12c..4a55aae3cd 100644
--- a/Kernel/Coredump.cpp
+++ b/Kernel/Tasks/Coredump.cpp
@@ -10,7 +10,6 @@
 #include <AK/ByteBuffer.h>
 #include <AK/JsonObjectSerializer.h>
 #include <AK/Singleton.h>
-#include <Kernel/Coredump.h>
 #include <Kernel/FileSystem/Custody.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
@@ -18,6 +17,7 @@
 #include <Kernel/KLexicalPath.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/ScopedAddressSpaceSwitcher.h>
+#include <Kernel/Tasks/Coredump.h>
 #include <Kernel/Tasks/Process.h>
 #include <LibC/elf.h>
 #include <LibELF/Core.h>
diff --git a/Kernel/Coredump.h b/Kernel/Tasks/Coredump.h
similarity index 100%
rename from Kernel/Coredump.h
rename to Kernel/Tasks/Coredump.h
diff --git a/Kernel/CrashHandler.cpp b/Kernel/Tasks/CrashHandler.cpp
similarity index 100%
rename from Kernel/CrashHandler.cpp
rename to Kernel/Tasks/CrashHandler.cpp
diff --git a/Kernel/Tasks/Process.cpp b/Kernel/Tasks/Process.cpp
index d5af388705..c95c022ff7 100644
--- a/Kernel/Tasks/Process.cpp
+++ b/Kernel/Tasks/Process.cpp
@@ -10,11 +10,11 @@
 #include <AK/Time.h>
 #include <AK/Types.h>
 #include <Kernel/API/Syscall.h>
-#include <Kernel/Coredump.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/Security/Credentials.h>
+#include <Kernel/Tasks/Coredump.h>
 #ifdef ENABLE_KERNEL_COVERAGE_COLLECTION
 #    include <Kernel/Devices/KCOVDevice.h>
 #endif