diff --git a/lib/mammoth/CMakeLists.txt b/lib/mammoth/CMakeLists.txt
index 0b4b002..225221b 100644
--- a/lib/mammoth/CMakeLists.txt
+++ b/lib/mammoth/CMakeLists.txt
@@ -7,11 +7,11 @@ add_library(mammoth STATIC
   src/debug.cpp
   src/init.cpp
   src/memory_region.cpp
-  src/mutex.cpp
   src/new.cpp
   src/process.cpp
-  src/semaphore.cpp
   src/thread.cpp
+  sync/mutex.cpp
+  sync/semaphore.cpp
   )
 
 target_include_directories(mammoth
diff --git a/lib/mammoth/src/mutex.cpp b/lib/mammoth/sync/mutex.cpp
similarity index 95%
rename from lib/mammoth/src/mutex.cpp
rename to lib/mammoth/sync/mutex.cpp
index dd49ce5..8ae04c0 100644
--- a/lib/mammoth/src/mutex.cpp
+++ b/lib/mammoth/sync/mutex.cpp
@@ -1,4 +1,4 @@
-#include "mammoth/mutex.h"
+#include "sync/mutex.h"
 
 #include <zcall.h>
 
diff --git a/lib/mammoth/include/mammoth/mutex.h b/lib/mammoth/sync/mutex.h
similarity index 100%
rename from lib/mammoth/include/mammoth/mutex.h
rename to lib/mammoth/sync/mutex.h
diff --git a/lib/mammoth/src/semaphore.cpp b/lib/mammoth/sync/semaphore.cpp
similarity index 91%
rename from lib/mammoth/src/semaphore.cpp
rename to lib/mammoth/sync/semaphore.cpp
index f6e348d..5979902 100644
--- a/lib/mammoth/src/semaphore.cpp
+++ b/lib/mammoth/sync/semaphore.cpp
@@ -1,4 +1,4 @@
-#include "mammoth/semaphore.h"
+#include "sync/semaphore.h"
 
 #include <zcall.h>
 
diff --git a/lib/mammoth/include/mammoth/semaphore.h b/lib/mammoth/sync/semaphore.h
similarity index 100%
rename from lib/mammoth/include/mammoth/semaphore.h
rename to lib/mammoth/sync/semaphore.h
diff --git a/sys/denali/ahci/command.h b/sys/denali/ahci/command.h
index 50316b8..2f85d82 100644
--- a/sys/denali/ahci/command.h
+++ b/sys/denali/ahci/command.h
@@ -2,7 +2,7 @@
 
 #include <mammoth/memory_region.h>
 #include <mammoth/response_context.h>
-#include <mammoth/semaphore.h>
+#include <mammoth/sync/semaphore.h>
 #include <stdint.h>
 
 #include "ahci/ahci.h"
diff --git a/sys/yellowstone/yellowstone_server.h b/sys/yellowstone/yellowstone_server.h
index 5c36369..e3608fb 100644
--- a/sys/yellowstone/yellowstone_server.h
+++ b/sys/yellowstone/yellowstone_server.h
@@ -4,7 +4,7 @@
 #include <glacier/memory/shared_ptr.h>
 #include <glacier/memory/unique_ptr.h>
 #include <glacier/status/error_or.h>
-#include <mammoth/semaphore.h>
+#include <mammoth/sync/semaphore.h>
 #include <mammoth/thread.h>
 #include <victoriafalls/victoriafalls.yunq.client.h>