diff --git a/src/waveform.cpp b/src/signal_processing/waveform.cpp
similarity index 100%
rename from src/waveform.cpp
rename to src/signal_processing/waveform.cpp
diff --git a/src/waveform.hpp b/src/signal_processing/waveform.hpp
similarity index 82%
rename from src/waveform.hpp
rename to src/signal_processing/waveform.hpp
index 104448a..3a6d0a3 100644
--- a/src/waveform.hpp
+++ b/src/signal_processing/waveform.hpp
@@ -4,8 +4,8 @@
 #include <cstdint>
 #include <vector>
 
-#include "bitmap/bitmap.hpp"
-#include "buffer/buffer.hpp"
+#include "utility/bitmap.hpp"
+#include "utility/buffer.hpp"
 
 
 void waveform_generate(
diff --git a/src/bitmap/bitmap.cpp b/src/utility/bitmap.cpp
similarity index 100%
rename from src/bitmap/bitmap.cpp
rename to src/utility/bitmap.cpp
diff --git a/src/bitmap/bitmap.hpp b/src/utility/bitmap.hpp
similarity index 100%
rename from src/bitmap/bitmap.hpp
rename to src/utility/bitmap.hpp
diff --git a/src/buffer/buffer.cpp b/src/utility/buffer.cpp
similarity index 100%
rename from src/buffer/buffer.cpp
rename to src/utility/buffer.cpp
diff --git a/src/buffer/buffer.hpp b/src/utility/buffer.hpp
similarity index 100%
rename from src/buffer/buffer.hpp
rename to src/utility/buffer.hpp
diff --git a/src/buffer/rollingbuffer.hpp b/src/utility/rollingbuffer.hpp
similarity index 100%
rename from src/buffer/rollingbuffer.hpp
rename to src/utility/rollingbuffer.hpp