diff --git a/include/sta/atomic_mutex.hpp b/include/sta/atomic/mutex.hpp
similarity index 100%
rename from include/sta/atomic_mutex.hpp
rename to include/sta/atomic/mutex.hpp
diff --git a/include/sta/atomic_signal.hpp b/include/sta/atomic/signal.hpp
similarity index 100%
rename from include/sta/atomic_signal.hpp
rename to include/sta/atomic/signal.hpp
diff --git a/src/atomic_mutex.cpp b/src/atomic/mutex.cpp
similarity index 87%
rename from src/atomic_mutex.cpp
rename to src/atomic/mutex.cpp
index 87b9be3..7aff61a 100644
--- a/src/atomic_mutex.cpp
+++ b/src/atomic/mutex.cpp
@@ -1,4 +1,4 @@
-#include <sta/atomic_mutex.hpp>
+#include <sta/atomic/mutex.hpp>
 
 
 namespace sta
diff --git a/src/atomic_signal.cpp b/src/atomic/signal.cpp
similarity index 91%
rename from src/atomic_signal.cpp
rename to src/atomic/signal.cpp
index 280aa30..98b37da 100644
--- a/src/atomic_signal.cpp
+++ b/src/atomic/signal.cpp
@@ -1,4 +1,4 @@
-#include <sta/atomic_signal.hpp>
+#include <sta/atomic/signal.hpp>
 
 
 namespace sta