diff --git a/include/sta/intf/gpio_pin.hpp b/include/sta/gpio_pin.hpp
similarity index 100%
rename from include/sta/intf/gpio_pin.hpp
rename to include/sta/gpio_pin.hpp
diff --git a/include/sta/intf/mutex.hpp b/include/sta/mutex.hpp
similarity index 100%
rename from include/sta/intf/mutex.hpp
rename to include/sta/mutex.hpp
diff --git a/include/sta/intf/signal.hpp b/include/sta/signal.hpp
similarity index 100%
rename from include/sta/intf/signal.hpp
rename to include/sta/signal.hpp
diff --git a/include/sta/intf/time.hpp b/include/sta/time.hpp
similarity index 100%
rename from include/sta/intf/time.hpp
rename to include/sta/time.hpp
diff --git a/include/sta/intf/uart.hpp b/include/sta/uart.hpp
similarity index 100%
rename from include/sta/intf/uart.hpp
rename to include/sta/uart.hpp
diff --git a/src/intf/mutex.cpp b/src/mutex.cpp
similarity index 100%
rename from src/intf/mutex.cpp
rename to src/mutex.cpp
diff --git a/src/intf/uart.cpp b/src/uart.cpp
similarity index 100%
rename from src/intf/uart.cpp
rename to src/uart.cpp