diff --git a/stm-firmware/include/stm-periph/uart/dma-ring-buffer.h b/stm-firmware/include/stm-periph/dma-ring-buffer.h
similarity index 100%
rename from stm-firmware/include/stm-periph/uart/dma-ring-buffer.h
rename to stm-firmware/include/stm-periph/dma-ring-buffer.h
diff --git a/stm-firmware/include/stm-periph/uart/uart.h b/stm-firmware/include/stm-periph/uart.h
similarity index 100%
rename from stm-firmware/include/stm-periph/uart/uart.h
rename to stm-firmware/include/stm-periph/uart.h
diff --git a/stm-firmware/main.c b/stm-firmware/main.c
index 193a5fb..7129b1f 100644
--- a/stm-firmware/main.c
+++ b/stm-firmware/main.c
@@ -17,7 +17,7 @@
 #include <reflow-controller/digio.h>
 #include <stm-periph/stm32-gpio-macros.h>
 #include <stm-periph/clock-enable-manager.h>
-#include <stm-periph/uart/uart.h>
+#include <stm-periph/uart.h>
 
 static void setup_nvic_priorities()
 {
diff --git a/stm-firmware/shell.c b/stm-firmware/shell.c
index a548c02..02c64d6 100644
--- a/stm-firmware/shell.c
+++ b/stm-firmware/shell.c
@@ -1,5 +1,5 @@
 #include <reflow-controller/shell.h>
-#include <stm-periph/uart/uart.h>
+#include <stm-periph/uart.h>
 #include <string.h>
 #include <reflow-controller/adc-meas.h>
 #include <reflow-controller/digio.h>
diff --git a/stm-firmware/clock-enable-manager.c b/stm-firmware/stm-periph/clock-enable-manager.c
similarity index 100%
rename from stm-firmware/clock-enable-manager.c
rename to stm-firmware/stm-periph/clock-enable-manager.c
diff --git a/stm-firmware/uart/dma-ring-buffer.c b/stm-firmware/stm-periph/dma-ring-buffer.c
similarity index 99%
rename from stm-firmware/uart/dma-ring-buffer.c
rename to stm-firmware/stm-periph/dma-ring-buffer.c
index 2bdc405..76eee75 100644
--- a/stm-firmware/uart/dma-ring-buffer.c
+++ b/stm-firmware/stm-periph/dma-ring-buffer.c
@@ -1,4 +1,4 @@
-#include <stm-periph/uart/dma-ring-buffer.h>
+#include <stm-periph/dma-ring-buffer.h>
 #include <stm-periph/clock-enable-manager.h>
 #include <stdbool.h>
 #include <string.h>
diff --git a/stm-firmware/uart/uart.c b/stm-firmware/stm-periph/uart.c
similarity index 93%
rename from stm-firmware/uart/uart.c
rename to stm-firmware/stm-periph/uart.c
index f384532..5643b7c 100644
--- a/stm-firmware/uart/uart.c
+++ b/stm-firmware/stm-periph/uart.c
@@ -8,11 +8,11 @@
 //PA2 => TX
 //PA3 => RX
 //Alternate Function 7
-#include <stm-periph/uart/uart.h>
+#include <stm-periph/uart.h>
 #include <stm32/stm32f4xx.h>
 #include <stm-periph/clock-enable-manager.h>
 #include <stm-periph/stm32-gpio-macros.h>
-#include <stm-periph/uart/dma-ring-buffer.h>
+#include <stm-periph/dma-ring-buffer.h>
 #include <string.h>
 
 static struct dma_ring_buffer_to_mem ring_buff_rx;
diff --git a/stm-firmware/syscalls.c b/stm-firmware/syscalls.c
index 69aabc6..1747e47 100644
--- a/stm-firmware/syscalls.c
+++ b/stm-firmware/syscalls.c
@@ -1,4 +1,4 @@
-#include <stm-periph/uart/uart.h>
+#include <stm-periph/uart.h>
 
 char* _sbrk(int incr) {
             extern char heap_low;    // Defined by the linker