diff --git a/client/better_radiobutton.cpp b/client/ui/better_radiobutton.cpp
similarity index 100%
rename from client/better_radiobutton.cpp
rename to client/ui/better_radiobutton.cpp
diff --git a/client/better_radiobutton.hpp b/client/ui/better_radiobutton.hpp
similarity index 100%
rename from client/better_radiobutton.hpp
rename to client/ui/better_radiobutton.hpp
diff --git a/client/can_transceive.cpp b/client/ui/can_transceive.cpp
similarity index 100%
rename from client/can_transceive.cpp
rename to client/ui/can_transceive.cpp
diff --git a/client/can_transceive.hpp b/client/ui/can_transceive.hpp
similarity index 100%
rename from client/can_transceive.hpp
rename to client/ui/can_transceive.hpp
diff --git a/client/can_transceive.ui b/client/ui/can_transceive.ui
similarity index 100%
rename from client/can_transceive.ui
rename to client/ui/can_transceive.ui
diff --git a/client/hex_spinbox.cpp b/client/ui/hex_spinbox.cpp
similarity index 100%
rename from client/hex_spinbox.cpp
rename to client/ui/hex_spinbox.cpp
diff --git a/client/hex_spinbox.hpp b/client/ui/hex_spinbox.hpp
similarity index 100%
rename from client/hex_spinbox.hpp
rename to client/ui/hex_spinbox.hpp
diff --git a/client/led.cpp b/client/ui/led.cpp
similarity index 100%
rename from client/led.cpp
rename to client/ui/led.cpp
diff --git a/client/led.hpp b/client/ui/led.hpp
similarity index 100%
rename from client/led.hpp
rename to client/ui/led.hpp
diff --git a/client/plot_wrapper.cpp b/client/ui/plot_wrapper.cpp
similarity index 100%
rename from client/plot_wrapper.cpp
rename to client/ui/plot_wrapper.cpp
diff --git a/client/plot_wrapper.hpp b/client/ui/plot_wrapper.hpp
similarity index 100%
rename from client/plot_wrapper.hpp
rename to client/ui/plot_wrapper.hpp