diff --git a/simulator/autoware_auto_msgs_adapter/CMakeLists.txt b/system/autoware_auto_msgs_adapter/CMakeLists.txt
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/CMakeLists.txt
rename to system/autoware_auto_msgs_adapter/CMakeLists.txt
diff --git a/simulator/autoware_auto_msgs_adapter/README.md b/system/autoware_auto_msgs_adapter/README.md
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/README.md
rename to system/autoware_auto_msgs_adapter/README.md
diff --git a/simulator/autoware_auto_msgs_adapter/config/adapter_control.param.yaml b/system/autoware_auto_msgs_adapter/config/adapter_control.param.yaml
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/config/adapter_control.param.yaml
rename to system/autoware_auto_msgs_adapter/config/adapter_control.param.yaml
diff --git a/simulator/autoware_auto_msgs_adapter/include/adapter_base.hpp b/system/autoware_auto_msgs_adapter/include/adapter_base.hpp
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/include/adapter_base.hpp
rename to system/autoware_auto_msgs_adapter/include/adapter_base.hpp
diff --git a/simulator/autoware_auto_msgs_adapter/include/adapter_base_interface.hpp b/system/autoware_auto_msgs_adapter/include/adapter_base_interface.hpp
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/include/adapter_base_interface.hpp
rename to system/autoware_auto_msgs_adapter/include/adapter_base_interface.hpp
diff --git a/simulator/autoware_auto_msgs_adapter/include/adapter_control.hpp b/system/autoware_auto_msgs_adapter/include/adapter_control.hpp
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/include/adapter_control.hpp
rename to system/autoware_auto_msgs_adapter/include/adapter_control.hpp
diff --git a/simulator/autoware_auto_msgs_adapter/include/autoware_auto_msgs_adapter_core.hpp b/system/autoware_auto_msgs_adapter/include/autoware_auto_msgs_adapter_core.hpp
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/include/autoware_auto_msgs_adapter_core.hpp
rename to system/autoware_auto_msgs_adapter/include/autoware_auto_msgs_adapter_core.hpp
diff --git a/simulator/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml b/system/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml
rename to system/autoware_auto_msgs_adapter/launch/autoware_auto_msgs_adapter.launch.xml
diff --git a/simulator/autoware_auto_msgs_adapter/package.xml b/system/autoware_auto_msgs_adapter/package.xml
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/package.xml
rename to system/autoware_auto_msgs_adapter/package.xml
diff --git a/simulator/autoware_auto_msgs_adapter/src/autoware_auto_msgs_adapter_core.cpp b/system/autoware_auto_msgs_adapter/src/autoware_auto_msgs_adapter_core.cpp
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/src/autoware_auto_msgs_adapter_core.cpp
rename to system/autoware_auto_msgs_adapter/src/autoware_auto_msgs_adapter_core.cpp
diff --git a/simulator/autoware_auto_msgs_adapter/test/test_autoware_auto_msgs_adapter.cpp b/system/autoware_auto_msgs_adapter/test/test_autoware_auto_msgs_adapter.cpp
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/test/test_autoware_auto_msgs_adapter.cpp
rename to system/autoware_auto_msgs_adapter/test/test_autoware_auto_msgs_adapter.cpp
diff --git a/simulator/autoware_auto_msgs_adapter/test/test_msg_ackermann_control_command.cpp b/system/autoware_auto_msgs_adapter/test/test_msg_ackermann_control_command.cpp
similarity index 100%
rename from simulator/autoware_auto_msgs_adapter/test/test_msg_ackermann_control_command.cpp
rename to system/autoware_auto_msgs_adapter/test/test_msg_ackermann_control_command.cpp