diff --git a/ros/src/simulation/lgsvl_simulator_bridge/.gitignore b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/.gitignore similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/.gitignore rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/.gitignore diff --git a/ros/src/simulation/lgsvl_simulator_bridge/CHANGELOG.rst b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/CHANGELOG.rst similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/CHANGELOG.rst rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/CHANGELOG.rst diff --git a/ros/src/simulation/lgsvl_simulator_bridge/CMakeLists.txt b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/CMakeLists.txt similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/CMakeLists.txt rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/CMakeLists.txt diff --git a/ros/src/simulation/lgsvl_simulator_bridge/README.md b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/README.md similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/README.md rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/README.md diff --git a/ros/src/simulation/lgsvl_simulator_bridge/bin/.gitignore b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/bin/.gitignore similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/bin/.gitignore rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/bin/.gitignore diff --git a/ros/src/simulation/lgsvl_simulator_bridge/config/sample.json b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/config/sample.json similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/config/sample.json rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/config/sample.json diff --git a/ros/src/simulation/lgsvl_simulator_bridge/launch/bridge.launch b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/launch/bridge.launch similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/launch/bridge.launch rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/launch/bridge.launch diff --git a/ros/src/simulation/lgsvl_simulator_bridge/launch/lgsvl_simulator.launch b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/launch/lgsvl_simulator.launch similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/launch/lgsvl_simulator.launch rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/launch/lgsvl_simulator.launch diff --git a/ros/src/simulation/lgsvl_simulator_bridge/media/autoware.png b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/media/autoware.png similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/media/autoware.png rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/media/autoware.png diff --git a/ros/src/simulation/lgsvl_simulator_bridge/media/lgsvl_simulator_bridge.png b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/media/lgsvl_simulator_bridge.png similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/media/lgsvl_simulator_bridge.png rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/media/lgsvl_simulator_bridge.png diff --git a/ros/src/simulation/lgsvl_simulator_bridge/package.xml b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/package.xml similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/package.xml rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/package.xml diff --git a/ros/src/simulation/lgsvl_simulator_bridge/plugin.xml b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/plugin.xml similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/plugin.xml rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/plugin.xml diff --git a/ros/src/simulation/lgsvl_simulator_bridge/quick_setup_sim.bash b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/quick_setup_sim.bash similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/quick_setup_sim.bash rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/quick_setup_sim.bash diff --git a/ros/src/simulation/lgsvl_simulator_bridge/resource/LgsvlSimulatorConfigratorPlugin.ui b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/resource/LgsvlSimulatorConfigratorPlugin.ui similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/resource/LgsvlSimulatorConfigratorPlugin.ui rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/resource/LgsvlSimulatorConfigratorPlugin.ui diff --git a/ros/src/simulation/lgsvl_simulator_bridge/rviz/lgsvl_simulator.rviz b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/rviz/lgsvl_simulator.rviz similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/rviz/lgsvl_simulator.rviz rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/rviz/lgsvl_simulator.rviz diff --git a/ros/src/simulation/lgsvl_simulator_bridge/scripts/launch_sim.bash b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/scripts/launch_sim.bash similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/scripts/launch_sim.bash rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/scripts/launch_sim.bash diff --git a/ros/src/simulation/lgsvl_simulator_bridge/scripts/rqt_lgsvl_simulator_configurator b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/scripts/rqt_lgsvl_simulator_configurator similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/scripts/rqt_lgsvl_simulator_configurator rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/scripts/rqt_lgsvl_simulator_configurator diff --git a/ros/src/simulation/lgsvl_simulator_bridge/setup.py b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/setup.py similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/setup.py rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/setup.py diff --git a/ros/src/simulation/lgsvl_simulator_bridge/src/lgsvl_simulator_bridge/__init__.py b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/src/lgsvl_simulator_bridge/__init__.py similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/src/lgsvl_simulator_bridge/__init__.py rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/src/lgsvl_simulator_bridge/__init__.py diff --git a/ros/src/simulation/lgsvl_simulator_bridge/src/lgsvl_simulator_bridge/configurator.py b/ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/src/lgsvl_simulator_bridge/configurator.py similarity index 100% rename from ros/src/simulation/lgsvl_simulator_bridge/src/lgsvl_simulator_bridge/configurator.py rename to ros/src/simulation/lgsvl_simulator/lgsvl_simulator_bridge/src/lgsvl_simulator_bridge/configurator.py