diff --git a/zion/CMakeLists.txt b/zion/CMakeLists.txt
index 2c2e538..9d3efc5 100644
--- a/zion/CMakeLists.txt
+++ b/zion/CMakeLists.txt
@@ -15,12 +15,12 @@ add_executable(zion
   memory/physical_memory.cpp
   memory/user_stack_manager.cpp
   memory/virtual_memory.cpp
+  object/process.cpp
+  object/thread.cpp
   scheduler/context_switch.s
   scheduler/jump_user_space.s
-  scheduler/process.cpp
   scheduler/process_manager.cpp
   scheduler/scheduler.cpp
-  scheduler/thread.cpp
   syscall/syscall.cpp
   syscall/syscall_enter.s
   zion.cpp)
diff --git a/zion/capability/capability.cpp b/zion/capability/capability.cpp
index 71708fa..ced4bda 100644
--- a/zion/capability/capability.cpp
+++ b/zion/capability/capability.cpp
@@ -1,7 +1,7 @@
 #include "capability/capability.h"
 
-#include "scheduler/process.h"
-#include "scheduler/thread.h"
+#include "object/process.h"
+#include "object/thread.h"
 
 template <>
 Process& Capability::obj<Process>() {
diff --git a/zion/loader/elf_loader.h b/zion/loader/elf_loader.h
index 8e497da..b2072db 100644
--- a/zion/loader/elf_loader.h
+++ b/zion/loader/elf_loader.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 
-#include "scheduler/process.h"
+#include "object/process.h"
 
 // Loads the elf program and returns its entry point.
 uint64_t LoadElfProgram(Process& dest_proc, uint64_t base, uint64_t length);
diff --git a/zion/loader/init_loader.cpp b/zion/loader/init_loader.cpp
index 80e0d98..0470122 100644
--- a/zion/loader/init_loader.cpp
+++ b/zion/loader/init_loader.cpp
@@ -5,9 +5,9 @@
 #include "lib/ref_ptr.h"
 #include "loader/elf_loader.h"
 #include "memory/paging_util.h"
-#include "scheduler/process.h"
+#include "object/process.h"
+#include "object/thread.h"
 #include "scheduler/process_manager.h"
-#include "scheduler/thread.h"
 
 namespace {
 
diff --git a/zion/memory/paging_util.h b/zion/memory/paging_util.h
index c9c4f10..0bdae7c 100644
--- a/zion/memory/paging_util.h
+++ b/zion/memory/paging_util.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 
-#include "scheduler/process.h"
+#include "object/process.h"
 
 void InitializePml4(uint64_t pml4_physical_addr);
 
diff --git a/zion/scheduler/process.cpp b/zion/object/process.cpp
similarity index 96%
rename from zion/scheduler/process.cpp
rename to zion/object/process.cpp
index be4cd82..8e4d1e4 100644
--- a/zion/scheduler/process.cpp
+++ b/zion/object/process.cpp
@@ -1,11 +1,11 @@
-#include "scheduler/process.h"
+#include "object/process.h"
 
 #include "debug/debug.h"
 #include "include/zcall.h"
 #include "memory/paging_util.h"
 #include "memory/physical_memory.h"
+#include "object/thread.h"
 #include "scheduler/scheduler.h"
-#include "scheduler/thread.h"
 
 namespace {
 
diff --git a/zion/scheduler/process.h b/zion/object/process.h
similarity index 100%
rename from zion/scheduler/process.h
rename to zion/object/process.h
diff --git a/zion/scheduler/thread.cpp b/zion/object/thread.cpp
similarity index 96%
rename from zion/scheduler/thread.cpp
rename to zion/object/thread.cpp
index ac35b2e..1ad6e65 100644
--- a/zion/scheduler/thread.cpp
+++ b/zion/object/thread.cpp
@@ -1,10 +1,10 @@
-#include "scheduler/thread.h"
+#include "object/thread.h"
 
 #include "common/gdt.h"
 #include "debug/debug.h"
 #include "loader/elf_loader.h"
 #include "memory/paging_util.h"
-#include "scheduler/process.h"
+#include "object/process.h"
 #include "scheduler/scheduler.h"
 
 namespace {
diff --git a/zion/scheduler/thread.h b/zion/object/thread.h
similarity index 100%
rename from zion/scheduler/thread.h
rename to zion/object/thread.h
diff --git a/zion/scheduler/process_manager.h b/zion/scheduler/process_manager.h
index 60c1dac..1f233df 100644
--- a/zion/scheduler/process_manager.h
+++ b/zion/scheduler/process_manager.h
@@ -2,7 +2,7 @@
 
 #include "lib/linked_list.h"
 #include "lib/ref_ptr.h"
-#include "scheduler/process.h"
+#include "object/process.h"
 
 class ProcessManager {
  public:
diff --git a/zion/scheduler/scheduler.h b/zion/scheduler/scheduler.h
index 697e778..2502277 100644
--- a/zion/scheduler/scheduler.h
+++ b/zion/scheduler/scheduler.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "scheduler/process.h"
-#include "scheduler/thread.h"
+#include "object/process.h"
+#include "object/thread.h"
 
 class Scheduler {
  public:
diff --git a/zion/syscall/syscall.cpp b/zion/syscall/syscall.cpp
index 4702f1a..374fe87 100644
--- a/zion/syscall/syscall.cpp
+++ b/zion/syscall/syscall.cpp
@@ -6,7 +6,7 @@
 #include "include/zcall.h"
 #include "include/zerrors.h"
 #include "loader/elf_loader.h"
-#include "scheduler/process.h"
+#include "object/process.h"
 #include "scheduler/process_manager.h"
 #include "scheduler/scheduler.h"