diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1f5796f2c0f88094f28281031db6e69ffce80bc..478d2431d078007fc009c4968ffc7ae1dee97d31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,7 @@ add_executable(automated-antennas-entry src/entrypoints/Groundstation/AutomatedA
 target_include_directories(automated-antennas-entry PRIVATE ${OBSW_INCLUDE_DIRS})
 sbs_target(automated-antennas-entry stm32f407vg_stm32f4discovery)
 
-add_executable(test-steps src/entrypoints/Groundstation/AutomatedAntennas/test-steps.cpp ${ANTENNAS})
+add_executable(test-steps src/entrypoints/Groundstation/Automated/test-steps.cpp ${ANTENNAS})
 target_include_directories(test-steps PRIVATE ${OBSW_INCLUDE_DIRS})
 # target_compile_definitions(test-steps PRIVATE NO_SD_LOGGING)
 sbs_target(test-steps stm32f767zi_automated_antennas)
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index cab11e955d35ac64e92d4ff207d559daca3ac5ac..b24fa9aa3e7fd8622d36ea62d6575630760db944 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -140,6 +140,6 @@ set(GROUNDSTATION_BASE
 )
 
 set(ANTENNAS
-    src/boards/AutomatedAntennas/Actuators.cpp
-    src/boards/AutomatedAntennas/Sensors.cpp
+    src/boards/Groundstation/Automated/Actuators/Actuators.cpp
+    src/boards/Groundstation/Automated/Sensors/Sensors.cpp
 )
\ No newline at end of file
diff --git a/src/boards/AutomatedAntennas/Actuators.cpp b/src/boards/Groundstation/Automated/Actuators/Actuators.cpp
similarity index 100%
rename from src/boards/AutomatedAntennas/Actuators.cpp
rename to src/boards/Groundstation/Automated/Actuators/Actuators.cpp
diff --git a/src/boards/AutomatedAntennas/Actuators.h b/src/boards/Groundstation/Automated/Actuators/Actuators.h
similarity index 100%
rename from src/boards/AutomatedAntennas/Actuators.h
rename to src/boards/Groundstation/Automated/Actuators/Actuators.h
diff --git a/src/boards/AutomatedAntennas/ActuatorsConfig.h b/src/boards/Groundstation/Automated/Actuators/ActuatorsConfig.h
similarity index 100%
rename from src/boards/AutomatedAntennas/ActuatorsConfig.h
rename to src/boards/Groundstation/Automated/Actuators/ActuatorsConfig.h
diff --git a/src/boards/AutomatedAntennas/ActuatorsData.h b/src/boards/Groundstation/Automated/Actuators/ActuatorsData.h
similarity index 100%
rename from src/boards/AutomatedAntennas/ActuatorsData.h
rename to src/boards/Groundstation/Automated/Actuators/ActuatorsData.h
diff --git a/src/boards/AutomatedAntennas/Buses.h b/src/boards/Groundstation/Automated/Buses.h
similarity index 100%
rename from src/boards/AutomatedAntennas/Buses.h
rename to src/boards/Groundstation/Automated/Buses.h
diff --git a/src/boards/AutomatedAntennas/Sensors.cpp b/src/boards/Groundstation/Automated/Sensors/Sensors.cpp
similarity index 100%
rename from src/boards/AutomatedAntennas/Sensors.cpp
rename to src/boards/Groundstation/Automated/Sensors/Sensors.cpp
diff --git a/src/boards/AutomatedAntennas/Sensors.h b/src/boards/Groundstation/Automated/Sensors/Sensors.h
similarity index 97%
rename from src/boards/AutomatedAntennas/Sensors.h
rename to src/boards/Groundstation/Automated/Sensors/Sensors.h
index 281eb763ab2e5b3d83261ebbefc452d57de5300d..b73fda8e773987bc1ece8e59bcb9c978343e82a8 100644
--- a/src/boards/AutomatedAntennas/Sensors.h
+++ b/src/boards/Groundstation/Automated/Sensors/Sensors.h
@@ -23,7 +23,7 @@
 
 #include <utils/ModuleManager/ModuleManager.hpp>
 
-#include "Buses.h"
+#include "Groundstation/Automated/Buses.h"
 #include "sensors/SensorManager.h"
 #include "sensors/Vectornav/VN300/VN300.h"
 
diff --git a/src/entrypoints/Groundstation/AutomatedAntennas/Converter.h b/src/entrypoints/Groundstation/Automated/Converter.h
similarity index 100%
rename from src/entrypoints/Groundstation/AutomatedAntennas/Converter.h
rename to src/entrypoints/Groundstation/Automated/Converter.h
diff --git a/src/entrypoints/Groundstation/AutomatedAntennas/automated-antennas-entry.cpp b/src/entrypoints/Groundstation/Automated/automated-antennas-entry.cpp
similarity index 100%
rename from src/entrypoints/Groundstation/AutomatedAntennas/automated-antennas-entry.cpp
rename to src/entrypoints/Groundstation/Automated/automated-antennas-entry.cpp
diff --git a/src/entrypoints/Groundstation/AutomatedAntennas/test-steps.cpp b/src/entrypoints/Groundstation/Automated/test-steps.cpp
similarity index 97%
rename from src/entrypoints/Groundstation/AutomatedAntennas/test-steps.cpp
rename to src/entrypoints/Groundstation/Automated/test-steps.cpp
index 3e1e9a7b7acc3a4dc41ef4571429f29e5a420567..00262c9310378d515b4c9c04f1c90542bb1d0bb6 100644
--- a/src/entrypoints/Groundstation/AutomatedAntennas/test-steps.cpp
+++ b/src/entrypoints/Groundstation/Automated/test-steps.cpp
@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-#include <AutomatedAntennas/Actuators.h>
-#include <AutomatedAntennas/Buses.h>
-#include <AutomatedAntennas/Sensors.h>
+#include <Groundstation/Automated/Actuators/Actuators.h>
+#include <Groundstation/Automated/Buses.h>
+#include <Groundstation/Automated/Sensors/Sensors.h>
 #include <diagnostic/CpuMeter/CpuMeter.h>
 #include <diagnostic/PrintLogger.h>
 #include <diagnostic/StackLogger.h>
diff --git a/src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp b/src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp
index b88ccb653acb91e859e0d7c0eecfbd072475fc84..8c9b537f4cd8ba6d428884e16b7277b417376f67 100644
--- a/src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp
+++ b/src/scripts/logdecoder/AutomatedAntennas/logdecoder.cpp
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include <AutomatedAntennas/ActuatorsData.h>
+#include <Groundstation/Automated/Actuators/ActuatorsData.h>
 #include <logger/Deserializer.h>
 #include <logger/LogTypes.h>
 #include <tscpp/stream.h>