diff --git a/stm-firmware/include/reflow-controller/button.h b/stm-firmware/include/reflow-controller/ui/button.h
similarity index 100%
rename from stm-firmware/include/reflow-controller/button.h
rename to stm-firmware/include/reflow-controller/ui/button.h
diff --git a/stm-firmware/include/reflow-controller/ui/menu.h b/stm-firmware/include/reflow-controller/ui/menu.h
index 1cc5068..8a18b82 100644
--- a/stm-firmware/include/reflow-controller/ui/menu.h
+++ b/stm-firmware/include/reflow-controller/ui/menu.h
@@ -22,7 +22,7 @@
 #define __MENU_H__
 
 #include <stdint.h>
-#include <reflow-controller/button.h>
+#include <reflow-controller/ui/button.h>
 #include <stdbool.h>
 
 struct lcd_menu;
diff --git a/stm-firmware/include/reflow-controller/rotary-encoder.h b/stm-firmware/include/reflow-controller/ui/rotary-encoder.h
similarity index 100%
rename from stm-firmware/include/reflow-controller/rotary-encoder.h
rename to stm-firmware/include/reflow-controller/ui/rotary-encoder.h
diff --git a/stm-firmware/shell.c b/stm-firmware/shell.c
index 65b6036..06bb4b8 100644
--- a/stm-firmware/shell.c
+++ b/stm-firmware/shell.c
@@ -34,10 +34,10 @@
 #include <reflow-controller/temp-converter.h>
 #include <fatfs/ff.h>
 #include <reflow-controller/safety/stack-check.h>
-#include <reflow-controller/rotary-encoder.h>
+#include <reflow-controller/ui/rotary-encoder.h>
 #include <reflow-controller/safety/safety-controller.h>
 #include <reflow-controller/settings/settings.h>
-#include <reflow-controller/button.h>
+#include <reflow-controller/ui/button.h>
 #include <reflow-controller/safety/fault.h>
 #include <reflow-controller/safety/safety-memory.h>
 #include <reflow-controller/hw-version-detect.h>
diff --git a/stm-firmware/button.c b/stm-firmware/ui/button.c
similarity index 98%
rename from stm-firmware/button.c
rename to stm-firmware/ui/button.c
index 6a856ac..1bf8c85 100644
--- a/stm-firmware/button.c
+++ b/stm-firmware/ui/button.c
@@ -19,7 +19,7 @@
 */
 
 #include <stm32/stm32f4xx.h>
-#include <reflow-controller/button.h>
+#include <reflow-controller/ui/button.h>
 #include <stm-periph/stm32-gpio-macros.h>
 #include <stm-periph/rcc-manager.h>
 #include <stdint.h>
diff --git a/stm-firmware/ui/gui.c b/stm-firmware/ui/gui.c
index 8d42138..809300c 100644
--- a/stm-firmware/ui/gui.c
+++ b/stm-firmware/ui/gui.c
@@ -22,7 +22,7 @@
 #include <reflow-controller/ui/gui-config.h>
 #include <reflow-controller/ui/menu.h>
 #include <reflow-controller/ui/lcd.h>
-#include <reflow-controller/rotary-encoder.h>
+#include <reflow-controller/ui/rotary-encoder.h>
 #include <reflow-controller/systick.h>
 #include <reflow-controller/adc-meas.h>
 #include <reflow-controller/safety/safety-controller.h>
diff --git a/stm-firmware/rotary-encoder.c b/stm-firmware/ui/rotary-encoder.c
similarity index 98%
rename from stm-firmware/rotary-encoder.c
rename to stm-firmware/ui/rotary-encoder.c
index 053fa8a..c19ecb3 100644
--- a/stm-firmware/rotary-encoder.c
+++ b/stm-firmware/ui/rotary-encoder.c
@@ -18,7 +18,7 @@
 * If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <reflow-controller/rotary-encoder.h>
+#include <reflow-controller/ui/rotary-encoder.h>
 #include <stm-periph/rcc-manager.h>
 #include <stm-periph/stm32-gpio-macros.h>
 #include <helper-macros/helper-macros.h>