diff --git a/bitbots_misc/bitbots_bringup/launch/simulator_teamplayer.launch b/bitbots_misc/bitbots_bringup/launch/simulator_teamplayer.launch
index d77b7e573..309a20155 100644
--- a/bitbots_misc/bitbots_bringup/launch/simulator_teamplayer.launch
+++ b/bitbots_misc/bitbots_bringup/launch/simulator_teamplayer.launch
@@ -12,7 +12,7 @@
     <arg name="world_model" default="true" description="Whether the world model should be started"/>
 
     <!-- load the general simulator -->
-    <include file="$(find-pkg-share wolfgang_webots_sim)/launch/simulation.launch" />
+    <include file="$(find-pkg-share bitbots_webots_sim)/launch/simulation.launch" />
 
     <!-- load teamplayer software stack -->
     <include file="$(find-pkg-share bitbots_bringup)/launch/teamplayer.launch">
diff --git a/bitbots_misc/bitbots_bringup/package.xml b/bitbots_misc/bitbots_bringup/package.xml
index 90bd36016..30fbedae9 100644
--- a/bitbots_misc/bitbots_bringup/package.xml
+++ b/bitbots_misc/bitbots_bringup/package.xml
@@ -16,7 +16,7 @@
 
     <depend>bitbots_docs</depend>
 
-    <exec_depend condition="$IS_ROBOT != True">wolfgang_webots_sim</exec_depend>
+    <exec_depend condition="$IS_ROBOT != True">bitbots_webots_sim</exec_depend>
     <exec_depend>audio_common</exec_depend>
     <exec_depend>bitbots_basler_camera</exec_depend>
     <exec_depend>bitbots_body_behavior</exec_depend>
diff --git a/bitbots_misc/bitbots_containers/hlvs/Dockerfile b/bitbots_misc/bitbots_containers/hlvs/Dockerfile
index c51e74415..206b10d1e 100644
--- a/bitbots_misc/bitbots_containers/hlvs/Dockerfile
+++ b/bitbots_misc/bitbots_containers/hlvs/Dockerfile
@@ -62,10 +62,10 @@ RUN cd src/bitbots_main && \
     make pull-all && \
     rm -rf lib/udp_bridge bitbots_misc/bitbots_containers \
     lib/dynamic_stack_decider/dynamic_stack_decider_visualization bitbots_lowlevel \
-    bitbots_wolfgang/wolfgang_pybullet_sim lib/DynamixelSDK lib/dynamixel-workbench \
+    bitbots_robot/bitbots_pybullet_sim lib/DynamixelSDK lib/dynamixel-workbench \
     bitbots_misc/bitbots_basler_camera && \
     sed -i '/plotjuggler/d' bitbots_motion/bitbots_quintic_walk/package.xml && \
-    sed -i '/run_depend/d' bitbots_wolfgang/wolfgang_moveit_config/package.xml
+    sed -i '/run_depend/d' bitbots_robot/wolfgang_moveit_config/package.xml
 
 # Install ros dependencies with rosdep
 RUN sudo apt update && rosdep update
@@ -75,7 +75,7 @@ RUN . /opt/ros/iron/setup.sh && colcon build --cmake-args -DBUILD_TESTING=OFF
 
 # TODO execute tests
 
-RUN cp src/bitbots_main/bitbots_wolfgang/wolfgang_robocup_api/scripts/start.sh .local/bin/start
+RUN cp src/bitbots_main/bitbots_robot/bitbots_robocup_api/scripts/start.sh .local/bin/start
 
 # Volume for logs
 VOLUME /robocup-logs
diff --git a/bitbots_misc/bitbots_docs/docs/manual/testing/sim_test.rst b/bitbots_misc/bitbots_docs/docs/manual/testing/sim_test.rst
index e1ae1e649..9d3b21b10 100644
--- a/bitbots_misc/bitbots_docs/docs/manual/testing/sim_test.rst
+++ b/bitbots_misc/bitbots_docs/docs/manual/testing/sim_test.rst
@@ -6,7 +6,7 @@ Test Motion
 
 .. code-block:: bash
 
-    ros2 launch wolfgang_webots_sim simulation.launch
+    ros2 launch bitbots_webots_sim simulation.launch
     ros2 launch bitbots_bringup motion_standalone.launch sim:=true
 
 To control walking of the robot, teleop needs to be startet as well:
diff --git a/bitbots_wolfgang/README.md b/bitbots_robot/README.md
similarity index 100%
rename from bitbots_wolfgang/README.md
rename to bitbots_robot/README.md
diff --git a/bitbots_wolfgang/wolfgang_animations/CMakeLists.txt b/bitbots_robot/wolfgang_animations/CMakeLists.txt
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/CMakeLists.txt
rename to bitbots_robot/wolfgang_animations/CMakeLists.txt
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/falling/falling_back.json b/bitbots_robot/wolfgang_animations/animations/falling/falling_back.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/falling/falling_back.json
rename to bitbots_robot/wolfgang_animations/animations/falling/falling_back.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/falling/falling_front.json b/bitbots_robot/wolfgang_animations/animations/falling/falling_front.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/falling/falling_front.json
rename to bitbots_robot/wolfgang_animations/animations/falling/falling_front.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/falling/falling_left.json b/bitbots_robot/wolfgang_animations/animations/falling/falling_left.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/falling/falling_left.json
rename to bitbots_robot/wolfgang_animations/animations/falling/falling_left.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/falling/falling_right.json b/bitbots_robot/wolfgang_animations/animations/falling/falling_right.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/falling/falling_right.json
rename to bitbots_robot/wolfgang_animations/animations/falling/falling_right.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/goalie/goalie_falling_center.json b/bitbots_robot/wolfgang_animations/animations/goalie/goalie_falling_center.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/goalie/goalie_falling_center.json
rename to bitbots_robot/wolfgang_animations/animations/goalie/goalie_falling_center.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/goalie/goalie_falling_left.json b/bitbots_robot/wolfgang_animations/animations/goalie/goalie_falling_left.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/goalie/goalie_falling_left.json
rename to bitbots_robot/wolfgang_animations/animations/goalie/goalie_falling_left.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/goalie/goalie_falling_right.json b/bitbots_robot/wolfgang_animations/animations/goalie/goalie_falling_right.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/goalie/goalie_falling_right.json
rename to bitbots_robot/wolfgang_animations/animations/goalie/goalie_falling_right.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/goalie/goalie_prepare_arms.json b/bitbots_robot/wolfgang_animations/animations/goalie/goalie_prepare_arms.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/goalie/goalie_prepare_arms.json
rename to bitbots_robot/wolfgang_animations/animations/goalie/goalie_prepare_arms.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/kick/kick_left.json b/bitbots_robot/wolfgang_animations/animations/kick/kick_left.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/kick/kick_left.json
rename to bitbots_robot/wolfgang_animations/animations/kick/kick_left.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/kick/kick_right.json b/bitbots_robot/wolfgang_animations/animations/kick/kick_right.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/kick/kick_right.json
rename to bitbots_robot/wolfgang_animations/animations/kick/kick_right.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/misc/cheering.json b/bitbots_robot/wolfgang_animations/animations/misc/cheering.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/misc/cheering.json
rename to bitbots_robot/wolfgang_animations/animations/misc/cheering.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/misc/init.json b/bitbots_robot/wolfgang_animations/animations/misc/init.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/misc/init.json
rename to bitbots_robot/wolfgang_animations/animations/misc/init.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/misc/init_sim.json b/bitbots_robot/wolfgang_animations/animations/misc/init_sim.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/misc/init_sim.json
rename to bitbots_robot/wolfgang_animations/animations/misc/init_sim.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/misc/startup.json b/bitbots_robot/wolfgang_animations/animations/misc/startup.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/misc/startup.json
rename to bitbots_robot/wolfgang_animations/animations/misc/startup.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/misc/verbeugen.json b/bitbots_robot/wolfgang_animations/animations/misc/verbeugen.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/misc/verbeugen.json
rename to bitbots_robot/wolfgang_animations/animations/misc/verbeugen.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/standup/stand_up_back.json b/bitbots_robot/wolfgang_animations/animations/standup/stand_up_back.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/standup/stand_up_back.json
rename to bitbots_robot/wolfgang_animations/animations/standup/stand_up_back.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/standup/stand_up_front.json b/bitbots_robot/wolfgang_animations/animations/standup/stand_up_front.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/standup/stand_up_front.json
rename to bitbots_robot/wolfgang_animations/animations/standup/stand_up_front.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/standup/turning_front_left.json b/bitbots_robot/wolfgang_animations/animations/standup/turning_front_left.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/standup/turning_front_left.json
rename to bitbots_robot/wolfgang_animations/animations/standup/turning_front_left.json
diff --git a/bitbots_wolfgang/wolfgang_animations/animations/standup/turning_front_right.json b/bitbots_robot/wolfgang_animations/animations/standup/turning_front_right.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/animations/standup/turning_front_right.json
rename to bitbots_robot/wolfgang_animations/animations/standup/turning_front_right.json
diff --git a/bitbots_wolfgang/wolfgang_animations/docs/_static/logo.png b/bitbots_robot/wolfgang_animations/docs/_static/logo.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/docs/_static/logo.png
rename to bitbots_robot/wolfgang_animations/docs/_static/logo.png
diff --git a/bitbots_wolfgang/wolfgang_animations/docs/conf.py b/bitbots_robot/wolfgang_animations/docs/conf.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/docs/conf.py
rename to bitbots_robot/wolfgang_animations/docs/conf.py
diff --git a/bitbots_wolfgang/wolfgang_animations/docs/index.rst b/bitbots_robot/wolfgang_animations/docs/index.rst
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/docs/index.rst
rename to bitbots_robot/wolfgang_animations/docs/index.rst
diff --git a/bitbots_wolfgang/wolfgang_animations/package.xml b/bitbots_robot/wolfgang_animations/package.xml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/package.xml
rename to bitbots_robot/wolfgang_animations/package.xml
diff --git a/bitbots_wolfgang/wolfgang_animations/rosdoc.yaml b/bitbots_robot/wolfgang_animations/rosdoc.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_animations/rosdoc.yaml
rename to bitbots_robot/wolfgang_animations/rosdoc.yaml
diff --git a/bitbots_wolfgang/wolfgang_description/CMakeLists.txt b/bitbots_robot/wolfgang_description/CMakeLists.txt
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/CMakeLists.txt
rename to bitbots_robot/wolfgang_description/CMakeLists.txt
diff --git a/bitbots_wolfgang/wolfgang_description/README.md b/bitbots_robot/wolfgang_description/README.md
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/README.md
rename to bitbots_robot/wolfgang_description/README.md
diff --git a/bitbots_wolfgang/wolfgang_description/config/fake_controllers.yaml b/bitbots_robot/wolfgang_description/config/fake_controllers.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/config/fake_controllers.yaml
rename to bitbots_robot/wolfgang_description/config/fake_controllers.yaml
diff --git a/bitbots_wolfgang/wolfgang_description/config/wolfgang.rviz b/bitbots_robot/wolfgang_description/config/wolfgang.rviz
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/config/wolfgang.rviz
rename to bitbots_robot/wolfgang_description/config/wolfgang.rviz
diff --git a/bitbots_wolfgang/wolfgang_description/config/wolfgang_control.yaml b/bitbots_robot/wolfgang_description/config/wolfgang_control.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/config/wolfgang_control.yaml
rename to bitbots_robot/wolfgang_description/config/wolfgang_control.yaml
diff --git a/bitbots_wolfgang/wolfgang_description/config/wolfgang_control_simple_physics.yaml b/bitbots_robot/wolfgang_description/config/wolfgang_control_simple_physics.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/config/wolfgang_control_simple_physics.yaml
rename to bitbots_robot/wolfgang_description/config/wolfgang_control_simple_physics.yaml
diff --git a/bitbots_wolfgang/wolfgang_description/docs/_static/logo.png b/bitbots_robot/wolfgang_description/docs/_static/logo.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/docs/_static/logo.png
rename to bitbots_robot/wolfgang_description/docs/_static/logo.png
diff --git a/bitbots_wolfgang/wolfgang_description/docs/conf.py b/bitbots_robot/wolfgang_description/docs/conf.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/docs/conf.py
rename to bitbots_robot/wolfgang_description/docs/conf.py
diff --git a/bitbots_wolfgang/wolfgang_description/docs/index.rst b/bitbots_robot/wolfgang_description/docs/index.rst
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/docs/index.rst
rename to bitbots_robot/wolfgang_description/docs/index.rst
diff --git a/bitbots_wolfgang/wolfgang_description/launch/rviz.launch b/bitbots_robot/wolfgang_description/launch/rviz.launch
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/launch/rviz.launch
rename to bitbots_robot/wolfgang_description/launch/rviz.launch
diff --git a/bitbots_wolfgang/wolfgang_description/launch/standalone.launch b/bitbots_robot/wolfgang_description/launch/standalone.launch
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/launch/standalone.launch
rename to bitbots_robot/wolfgang_description/launch/standalone.launch
diff --git a/bitbots_wolfgang/wolfgang_description/package.xml b/bitbots_robot/wolfgang_description/package.xml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/package.xml
rename to bitbots_robot/wolfgang_description/package.xml
diff --git a/bitbots_wolfgang/wolfgang_description/rosdoc.yaml b/bitbots_robot/wolfgang_description/rosdoc.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/rosdoc.yaml
rename to bitbots_robot/wolfgang_description/rosdoc.yaml
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/additionalURDF.txt b/bitbots_robot/wolfgang_description/urdf/additionalURDF.txt
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/additionalURDF.txt
rename to bitbots_robot/wolfgang_description/urdf/additionalURDF.txt
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/ankle.scad b/bitbots_robot/wolfgang_description/urdf/ankle.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/ankle.scad
rename to bitbots_robot/wolfgang_description/urdf/ankle.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/ankle.stl b/bitbots_robot/wolfgang_description/urdf/ankle.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/ankle.stl
rename to bitbots_robot/wolfgang_description/urdf/ankle.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/baseplate_odroid_xu4_core.scad b/bitbots_robot/wolfgang_description/urdf/baseplate_odroid_xu4_core.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/baseplate_odroid_xu4_core.scad
rename to bitbots_robot/wolfgang_description/urdf/baseplate_odroid_xu4_core.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/baseplate_odroid_xu4_core.stl b/bitbots_robot/wolfgang_description/urdf/baseplate_odroid_xu4_core.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/baseplate_odroid_xu4_core.stl
rename to bitbots_robot/wolfgang_description/urdf/baseplate_odroid_xu4_core.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/basler_ace_gige_c-mount_v01.scad b/bitbots_robot/wolfgang_description/urdf/basler_ace_gige_c-mount_v01.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/basler_ace_gige_c-mount_v01.scad
rename to bitbots_robot/wolfgang_description/urdf/basler_ace_gige_c-mount_v01.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/basler_ace_gige_c-mount_v01.stl b/bitbots_robot/wolfgang_description/urdf/basler_ace_gige_c-mount_v01.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/basler_ace_gige_c-mount_v01.stl
rename to bitbots_robot/wolfgang_description/urdf/basler_ace_gige_c-mount_v01.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/battery.scad b/bitbots_robot/wolfgang_description/urdf/battery.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/battery.scad
rename to bitbots_robot/wolfgang_description/urdf/battery.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/battery.stl b/bitbots_robot/wolfgang_description/urdf/battery.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/battery.stl
rename to bitbots_robot/wolfgang_description/urdf/battery.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/battery_cage.scad b/bitbots_robot/wolfgang_description/urdf/battery_cage.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/battery_cage.scad
rename to bitbots_robot/wolfgang_description/urdf/battery_cage.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/battery_cage.stl b/bitbots_robot/wolfgang_description/urdf/battery_cage.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/battery_cage.stl
rename to bitbots_robot/wolfgang_description/urdf/battery_cage.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/battery_clip.scad b/bitbots_robot/wolfgang_description/urdf/battery_clip.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/battery_clip.scad
rename to bitbots_robot/wolfgang_description/urdf/battery_clip.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/battery_clip.stl b/bitbots_robot/wolfgang_description/urdf/battery_clip.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/battery_clip.stl
rename to bitbots_robot/wolfgang_description/urdf/battery_clip.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/camera_lower_basler_wolfgang_imu_v2.2.scad b/bitbots_robot/wolfgang_description/urdf/camera_lower_basler_wolfgang_imu_v2.2.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/camera_lower_basler_wolfgang_imu_v2.2.scad
rename to bitbots_robot/wolfgang_description/urdf/camera_lower_basler_wolfgang_imu_v2.2.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/camera_lower_basler_wolfgang_imu_v2.2.stl b/bitbots_robot/wolfgang_description/urdf/camera_lower_basler_wolfgang_imu_v2.2.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/camera_lower_basler_wolfgang_imu_v2.2.stl
rename to bitbots_robot/wolfgang_description/urdf/camera_lower_basler_wolfgang_imu_v2.2.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_left.scad b/bitbots_robot/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_left.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_left.scad
rename to bitbots_robot/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_left.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_left.stl b/bitbots_robot/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_left.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_left.stl
rename to bitbots_robot/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_left.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_right.scad b/bitbots_robot/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_right.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_right.scad
rename to bitbots_robot/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_right.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_right.stl b/bitbots_robot/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_right.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_right.stl
rename to bitbots_robot/wolfgang_description/urdf/camera_side_basler_wolfgang_v2.2_right.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/config.json b/bitbots_robot/wolfgang_description/urdf/config.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/config.json
rename to bitbots_robot/wolfgang_description/urdf/config.json
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/connector_shoulder.scad b/bitbots_robot/wolfgang_description/urdf/connector_shoulder.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/connector_shoulder.scad
rename to bitbots_robot/wolfgang_description/urdf/connector_shoulder.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/connector_shoulder.stl b/bitbots_robot/wolfgang_description/urdf/connector_shoulder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/connector_shoulder.stl
rename to bitbots_robot/wolfgang_description/urdf/connector_shoulder.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/core.scad b/bitbots_robot/wolfgang_description/urdf/core.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/core.scad
rename to bitbots_robot/wolfgang_description/urdf/core.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/core.stl b/bitbots_robot/wolfgang_description/urdf/core.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/core.stl
rename to bitbots_robot/wolfgang_description/urdf/core.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/dummy_speaker.scad b/bitbots_robot/wolfgang_description/urdf/dummy_speaker.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/dummy_speaker.scad
rename to bitbots_robot/wolfgang_description/urdf/dummy_speaker.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/dummy_speaker.stl b/bitbots_robot/wolfgang_description/urdf/dummy_speaker.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/dummy_speaker.stl
rename to bitbots_robot/wolfgang_description/urdf/dummy_speaker.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/flex_stollen.scad b/bitbots_robot/wolfgang_description/urdf/flex_stollen.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/flex_stollen.scad
rename to bitbots_robot/wolfgang_description/urdf/flex_stollen.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/flex_stollen.stl b/bitbots_robot/wolfgang_description/urdf/flex_stollen.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/flex_stollen.stl
rename to bitbots_robot/wolfgang_description/urdf/flex_stollen.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/foot_cover.scad b/bitbots_robot/wolfgang_description/urdf/foot_cover.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/foot_cover.scad
rename to bitbots_robot/wolfgang_description/urdf/foot_cover.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/foot_cover.stl b/bitbots_robot/wolfgang_description/urdf/foot_cover.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/foot_cover.stl
rename to bitbots_robot/wolfgang_description/urdf/foot_cover.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/foot_printed_left.scad b/bitbots_robot/wolfgang_description/urdf/foot_printed_left.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/foot_printed_left.scad
rename to bitbots_robot/wolfgang_description/urdf/foot_printed_left.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/foot_printed_left.stl b/bitbots_robot/wolfgang_description/urdf/foot_printed_left.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/foot_printed_left.stl
rename to bitbots_robot/wolfgang_description/urdf/foot_printed_left.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/foot_printed_right.scad b/bitbots_robot/wolfgang_description/urdf/foot_printed_right.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/foot_printed_right.scad
rename to bitbots_robot/wolfgang_description/urdf/foot_printed_right.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/foot_printed_right.stl b/bitbots_robot/wolfgang_description/urdf/foot_printed_right.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/foot_printed_right.stl
rename to bitbots_robot/wolfgang_description/urdf/foot_printed_right.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/hand.scad b/bitbots_robot/wolfgang_description/urdf/hand.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/hand.scad
rename to bitbots_robot/wolfgang_description/urdf/hand.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/hand.stl b/bitbots_robot/wolfgang_description/urdf/hand.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/hand.stl
rename to bitbots_robot/wolfgang_description/urdf/hand.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/hip_u_connector.scad b/bitbots_robot/wolfgang_description/urdf/hip_u_connector.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/hip_u_connector.scad
rename to bitbots_robot/wolfgang_description/urdf/hip_u_connector.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/hip_u_connector.stl b/bitbots_robot/wolfgang_description/urdf/hip_u_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/hip_u_connector.stl
rename to bitbots_robot/wolfgang_description/urdf/hip_u_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/imu_holder.scad b/bitbots_robot/wolfgang_description/urdf/imu_holder.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/imu_holder.scad
rename to bitbots_robot/wolfgang_description/urdf/imu_holder.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/imu_holder.stl b/bitbots_robot/wolfgang_description/urdf/imu_holder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/imu_holder.stl
rename to bitbots_robot/wolfgang_description/urdf/imu_holder.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/knee_connector.scad b/bitbots_robot/wolfgang_description/urdf/knee_connector.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/knee_connector.scad
rename to bitbots_robot/wolfgang_description/urdf/knee_connector.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/knee_connector.stl b/bitbots_robot/wolfgang_description/urdf/knee_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/knee_connector.stl
rename to bitbots_robot/wolfgang_description/urdf/knee_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/knee_spacer.scad b/bitbots_robot/wolfgang_description/urdf/knee_spacer.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/knee_spacer.scad
rename to bitbots_robot/wolfgang_description/urdf/knee_spacer.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/knee_spacer.stl b/bitbots_robot/wolfgang_description/urdf/knee_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/knee_spacer.stl
rename to bitbots_robot/wolfgang_description/urdf/knee_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/lense.scad b/bitbots_robot/wolfgang_description/urdf/lense.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/lense.scad
rename to bitbots_robot/wolfgang_description/urdf/lense.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/lense.stl b/bitbots_robot/wolfgang_description/urdf/lense.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/lense.stl
rename to bitbots_robot/wolfgang_description/urdf/lense.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/load_cell.scad b/bitbots_robot/wolfgang_description/urdf/load_cell.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/load_cell.scad
rename to bitbots_robot/wolfgang_description/urdf/load_cell.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/load_cell.stl b/bitbots_robot/wolfgang_description/urdf/load_cell.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/load_cell.stl
rename to bitbots_robot/wolfgang_description/urdf/load_cell.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/lower_arm.scad b/bitbots_robot/wolfgang_description/urdf/lower_arm.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/lower_arm.scad
rename to bitbots_robot/wolfgang_description/urdf/lower_arm.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/lower_arm.stl b/bitbots_robot/wolfgang_description/urdf/lower_arm.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/lower_arm.stl
rename to bitbots_robot/wolfgang_description/urdf/lower_arm.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/lower_leg.scad b/bitbots_robot/wolfgang_description/urdf/lower_leg.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/lower_leg.scad
rename to bitbots_robot/wolfgang_description/urdf/lower_leg.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/lower_leg.stl b/bitbots_robot/wolfgang_description/urdf/lower_leg.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/lower_leg.stl
rename to bitbots_robot/wolfgang_description/urdf/lower_leg.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/lower_leg_spacer.scad b/bitbots_robot/wolfgang_description/urdf/lower_leg_spacer.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/lower_leg_spacer.scad
rename to bitbots_robot/wolfgang_description/urdf/lower_leg_spacer.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/lower_leg_spacer.stl b/bitbots_robot/wolfgang_description/urdf/lower_leg_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/lower_leg_spacer.stl
rename to bitbots_robot/wolfgang_description/urdf/lower_leg_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/motor_connector.scad b/bitbots_robot/wolfgang_description/urdf/motor_connector.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/motor_connector.scad
rename to bitbots_robot/wolfgang_description/urdf/motor_connector.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/motor_connector.stl b/bitbots_robot/wolfgang_description/urdf/motor_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/motor_connector.stl
rename to bitbots_robot/wolfgang_description/urdf/motor_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/mx-106_body.scad b/bitbots_robot/wolfgang_description/urdf/mx-106_body.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/mx-106_body.scad
rename to bitbots_robot/wolfgang_description/urdf/mx-106_body.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/mx-106_body.stl b/bitbots_robot/wolfgang_description/urdf/mx-106_body.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/mx-106_body.stl
rename to bitbots_robot/wolfgang_description/urdf/mx-106_body.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/mx-64-body.scad b/bitbots_robot/wolfgang_description/urdf/mx-64-body.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/mx-64-body.scad
rename to bitbots_robot/wolfgang_description/urdf/mx-64-body.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/mx-64-body.stl b/bitbots_robot/wolfgang_description/urdf/mx-64-body.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/mx-64-body.stl
rename to bitbots_robot/wolfgang_description/urdf/mx-64-body.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_left_back.scad b/bitbots_robot/wolfgang_description/urdf/nuc_holder_left_back.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_left_back.scad
rename to bitbots_robot/wolfgang_description/urdf/nuc_holder_left_back.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_left_back.stl b/bitbots_robot/wolfgang_description/urdf/nuc_holder_left_back.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_left_back.stl
rename to bitbots_robot/wolfgang_description/urdf/nuc_holder_left_back.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_left_front.scad b/bitbots_robot/wolfgang_description/urdf/nuc_holder_left_front.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_left_front.scad
rename to bitbots_robot/wolfgang_description/urdf/nuc_holder_left_front.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_left_front.stl b/bitbots_robot/wolfgang_description/urdf/nuc_holder_left_front.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_left_front.stl
rename to bitbots_robot/wolfgang_description/urdf/nuc_holder_left_front.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_right_back.scad b/bitbots_robot/wolfgang_description/urdf/nuc_holder_right_back.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_right_back.scad
rename to bitbots_robot/wolfgang_description/urdf/nuc_holder_right_back.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_right_back.stl b/bitbots_robot/wolfgang_description/urdf/nuc_holder_right_back.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_right_back.stl
rename to bitbots_robot/wolfgang_description/urdf/nuc_holder_right_back.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_right_front.scad b/bitbots_robot/wolfgang_description/urdf/nuc_holder_right_front.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_right_front.scad
rename to bitbots_robot/wolfgang_description/urdf/nuc_holder_right_front.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_right_front.stl b/bitbots_robot/wolfgang_description/urdf/nuc_holder_right_front.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_holder_right_front.stl
rename to bitbots_robot/wolfgang_description/urdf/nuc_holder_right_front.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_main.scad b/bitbots_robot/wolfgang_description/urdf/nuc_main.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_main.scad
rename to bitbots_robot/wolfgang_description/urdf/nuc_main.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/nuc_main.stl b/bitbots_robot/wolfgang_description/urdf/nuc_main.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/nuc_main.stl
rename to bitbots_robot/wolfgang_description/urdf/nuc_main.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/robot.urdf b/bitbots_robot/wolfgang_description/urdf/robot.urdf
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/robot.urdf
rename to bitbots_robot/wolfgang_description/urdf/robot.urdf
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/sea_connector.scad b/bitbots_robot/wolfgang_description/urdf/sea_connector.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/sea_connector.scad
rename to bitbots_robot/wolfgang_description/urdf/sea_connector.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/sea_connector.stl b/bitbots_robot/wolfgang_description/urdf/sea_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/sea_connector.stl
rename to bitbots_robot/wolfgang_description/urdf/sea_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/sea_ninjaflex.scad b/bitbots_robot/wolfgang_description/urdf/sea_ninjaflex.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/sea_ninjaflex.scad
rename to bitbots_robot/wolfgang_description/urdf/sea_ninjaflex.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/sea_ninjaflex.stl b/bitbots_robot/wolfgang_description/urdf/sea_ninjaflex.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/sea_ninjaflex.stl
rename to bitbots_robot/wolfgang_description/urdf/sea_ninjaflex.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/shoulder_connector.scad b/bitbots_robot/wolfgang_description/urdf/shoulder_connector.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/shoulder_connector.scad
rename to bitbots_robot/wolfgang_description/urdf/shoulder_connector.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/shoulder_connector.stl b/bitbots_robot/wolfgang_description/urdf/shoulder_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/shoulder_connector.stl
rename to bitbots_robot/wolfgang_description/urdf/shoulder_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/speaker_holder.scad b/bitbots_robot/wolfgang_description/urdf/speaker_holder.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/speaker_holder.scad
rename to bitbots_robot/wolfgang_description/urdf/speaker_holder.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/speaker_holder.stl b/bitbots_robot/wolfgang_description/urdf/speaker_holder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/speaker_holder.stl
rename to bitbots_robot/wolfgang_description/urdf/speaker_holder.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/spring_holder_lower.scad b/bitbots_robot/wolfgang_description/urdf/spring_holder_lower.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/spring_holder_lower.scad
rename to bitbots_robot/wolfgang_description/urdf/spring_holder_lower.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/spring_holder_lower.stl b/bitbots_robot/wolfgang_description/urdf/spring_holder_lower.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/spring_holder_lower.stl
rename to bitbots_robot/wolfgang_description/urdf/spring_holder_lower.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/spring_holder_upper.scad b/bitbots_robot/wolfgang_description/urdf/spring_holder_upper.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/spring_holder_upper.scad
rename to bitbots_robot/wolfgang_description/urdf/spring_holder_upper.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/spring_holder_upper.stl b/bitbots_robot/wolfgang_description/urdf/spring_holder_upper.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/spring_holder_upper.stl
rename to bitbots_robot/wolfgang_description/urdf/spring_holder_upper.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/springholder_bottom.scad b/bitbots_robot/wolfgang_description/urdf/springholder_bottom.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/springholder_bottom.scad
rename to bitbots_robot/wolfgang_description/urdf/springholder_bottom.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/springholder_bottom.stl b/bitbots_robot/wolfgang_description/urdf/springholder_bottom.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/springholder_bottom.stl
rename to bitbots_robot/wolfgang_description/urdf/springholder_bottom.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/springholder_new.scad b/bitbots_robot/wolfgang_description/urdf/springholder_new.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/springholder_new.scad
rename to bitbots_robot/wolfgang_description/urdf/springholder_new.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/springholder_new.stl b/bitbots_robot/wolfgang_description/urdf/springholder_new.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/springholder_new.stl
rename to bitbots_robot/wolfgang_description/urdf/springholder_new.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/thrustbearingholder.scad b/bitbots_robot/wolfgang_description/urdf/thrustbearingholder.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/thrustbearingholder.scad
rename to bitbots_robot/wolfgang_description/urdf/thrustbearingholder.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/thrustbearingholder.stl b/bitbots_robot/wolfgang_description/urdf/thrustbearingholder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/thrustbearingholder.stl
rename to bitbots_robot/wolfgang_description/urdf/thrustbearingholder.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/torso_bottom.scad b/bitbots_robot/wolfgang_description/urdf/torso_bottom.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/torso_bottom.scad
rename to bitbots_robot/wolfgang_description/urdf/torso_bottom.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/torso_bottom.stl b/bitbots_robot/wolfgang_description/urdf/torso_bottom.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/torso_bottom.stl
rename to bitbots_robot/wolfgang_description/urdf/torso_bottom.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/torso_bumper_left.scad b/bitbots_robot/wolfgang_description/urdf/torso_bumper_left.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/torso_bumper_left.scad
rename to bitbots_robot/wolfgang_description/urdf/torso_bumper_left.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/torso_bumper_left.stl b/bitbots_robot/wolfgang_description/urdf/torso_bumper_left.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/torso_bumper_left.stl
rename to bitbots_robot/wolfgang_description/urdf/torso_bumper_left.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/torso_bumper_right.scad b/bitbots_robot/wolfgang_description/urdf/torso_bumper_right.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/torso_bumper_right.scad
rename to bitbots_robot/wolfgang_description/urdf/torso_bumper_right.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/torso_bumper_right.stl b/bitbots_robot/wolfgang_description/urdf/torso_bumper_right.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/torso_bumper_right.stl
rename to bitbots_robot/wolfgang_description/urdf/torso_bumper_right.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/torso_top.scad b/bitbots_robot/wolfgang_description/urdf/torso_top.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/torso_top.scad
rename to bitbots_robot/wolfgang_description/urdf/torso_top.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/torso_top.stl b/bitbots_robot/wolfgang_description/urdf/torso_top.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/torso_top.stl
rename to bitbots_robot/wolfgang_description/urdf/torso_top.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/upper_arm.scad b/bitbots_robot/wolfgang_description/urdf/upper_arm.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/upper_arm.scad
rename to bitbots_robot/wolfgang_description/urdf/upper_arm.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/upper_arm.stl b/bitbots_robot/wolfgang_description/urdf/upper_arm.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/upper_arm.stl
rename to bitbots_robot/wolfgang_description/urdf/upper_arm.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/upper_arm_spacer.scad b/bitbots_robot/wolfgang_description/urdf/upper_arm_spacer.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/upper_arm_spacer.scad
rename to bitbots_robot/wolfgang_description/urdf/upper_arm_spacer.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/upper_arm_spacer.stl b/bitbots_robot/wolfgang_description/urdf/upper_arm_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/upper_arm_spacer.stl
rename to bitbots_robot/wolfgang_description/urdf/upper_arm_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/upper_leg.scad b/bitbots_robot/wolfgang_description/urdf/upper_leg.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/upper_leg.scad
rename to bitbots_robot/wolfgang_description/urdf/upper_leg.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/upper_leg.stl b/bitbots_robot/wolfgang_description/urdf/upper_leg.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/upper_leg.stl
rename to bitbots_robot/wolfgang_description/urdf/upper_leg.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/upper_leg_spacer.scad b/bitbots_robot/wolfgang_description/urdf/upper_leg_spacer.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/upper_leg_spacer.scad
rename to bitbots_robot/wolfgang_description/urdf/upper_leg_spacer.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/upper_leg_spacer.stl b/bitbots_robot/wolfgang_description/urdf/upper_leg_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/upper_leg_spacer.stl
rename to bitbots_robot/wolfgang_description/urdf/upper_leg_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/xh-540.scad b/bitbots_robot/wolfgang_description/urdf/xh-540.scad
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/xh-540.scad
rename to bitbots_robot/wolfgang_description/urdf/xh-540.scad
diff --git a/bitbots_wolfgang/wolfgang_description/urdf/xh-540.stl b/bitbots_robot/wolfgang_description/urdf/xh-540.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_description/urdf/xh-540.stl
rename to bitbots_robot/wolfgang_description/urdf/xh-540.stl
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/.setup_assistant b/bitbots_robot/wolfgang_moveit_config/.setup_assistant
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/.setup_assistant
rename to bitbots_robot/wolfgang_moveit_config/.setup_assistant
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/CMakeLists.txt b/bitbots_robot/wolfgang_moveit_config/CMakeLists.txt
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/CMakeLists.txt
rename to bitbots_robot/wolfgang_moveit_config/CMakeLists.txt
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/config/fake_controllers.yaml b/bitbots_robot/wolfgang_moveit_config/config/fake_controllers.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/config/fake_controllers.yaml
rename to bitbots_robot/wolfgang_moveit_config/config/fake_controllers.yaml
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/config/joint_limits.yaml b/bitbots_robot/wolfgang_moveit_config/config/joint_limits.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/config/joint_limits.yaml
rename to bitbots_robot/wolfgang_moveit_config/config/joint_limits.yaml
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/config/kinematics.yaml b/bitbots_robot/wolfgang_moveit_config/config/kinematics.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/config/kinematics.yaml
rename to bitbots_robot/wolfgang_moveit_config/config/kinematics.yaml
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/config/ompl_planning.yaml b/bitbots_robot/wolfgang_moveit_config/config/ompl_planning.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/config/ompl_planning.yaml
rename to bitbots_robot/wolfgang_moveit_config/config/ompl_planning.yaml
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/config/sensors_3d.yaml b/bitbots_robot/wolfgang_moveit_config/config/sensors_3d.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/config/sensors_3d.yaml
rename to bitbots_robot/wolfgang_moveit_config/config/sensors_3d.yaml
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/config/wolfgang.srdf b/bitbots_robot/wolfgang_moveit_config/config/wolfgang.srdf
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/config/wolfgang.srdf
rename to bitbots_robot/wolfgang_moveit_config/config/wolfgang.srdf
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/package.xml b/bitbots_robot/wolfgang_moveit_config/package.xml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/package.xml
rename to bitbots_robot/wolfgang_moveit_config/package.xml
diff --git a/bitbots_wolfgang/wolfgang_moveit_config/rosdoc.yaml b/bitbots_robot/wolfgang_moveit_config/rosdoc.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_moveit_config/rosdoc.yaml
rename to bitbots_robot/wolfgang_moveit_config/rosdoc.yaml
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/CMakeLists.txt b/bitbots_simulation/bitbots_pybullet_sim/CMakeLists.txt
similarity index 98%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/CMakeLists.txt
rename to bitbots_simulation/bitbots_pybullet_sim/CMakeLists.txt
index 0ab119830..8bf69dfe2 100644
--- a/bitbots_wolfgang/wolfgang_pybullet_sim/CMakeLists.txt
+++ b/bitbots_simulation/bitbots_pybullet_sim/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(wolfgang_pybullet_sim)
+project(bitbots_pybullet_sim)
 
 # Add support for C++17
 if(NOT CMAKE_CXX_STANDARD)
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/README.md b/bitbots_simulation/bitbots_pybullet_sim/README.md
similarity index 56%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/README.md
rename to bitbots_simulation/bitbots_pybullet_sim/README.md
index 50207aabf..c6390a6f7 100644
--- a/bitbots_wolfgang/wolfgang_pybullet_sim/README.md
+++ b/bitbots_simulation/bitbots_pybullet_sim/README.md
@@ -1,8 +1,8 @@
-This package provides a PyBullet simulation environment with ROS topic support for the Wolfgang Robot.
+This package provides a PyBullet simulation environment with ROS topic support.
 
 There are different options to use this:
-1. Start the simulation with interface `rosrun wolfgang_pybullet_sim simulation_with_gui.py`
-2. Start the simulation without interface `rosrun wolfgang_pybullet_sim simulation_headless.py`
+1. Start the simulation with interface `rosrun bitbots_pybullet_sim simulation_with_gui.py`
+2. Start the simulation without interface `rosrun bitbots_pybullet_sim simulation_headless.py`
 3. Use the python class `Simulation` in `simulation.py` to directly run a simulation without using ROS
 
 Shortcuts in gui:
@@ -15,4 +15,4 @@ Shortcuts in gui:
 
 `s` hold to step while pausing
 
-`n` gravity on/off
\ No newline at end of file
+`n` gravity on/off
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/wolfgang_pybullet_sim/__init__.py b/bitbots_simulation/bitbots_pybullet_sim/bitbots_pybullet_sim/__init__.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/wolfgang_pybullet_sim/__init__.py
rename to bitbots_simulation/bitbots_pybullet_sim/bitbots_pybullet_sim/__init__.py
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/wolfgang_pybullet_sim/ros_interface.py b/bitbots_simulation/bitbots_pybullet_sim/bitbots_pybullet_sim/ros_interface.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/wolfgang_pybullet_sim/ros_interface.py
rename to bitbots_simulation/bitbots_pybullet_sim/bitbots_pybullet_sim/ros_interface.py
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/wolfgang_pybullet_sim/simulation.py b/bitbots_simulation/bitbots_pybullet_sim/bitbots_pybullet_sim/simulation.py
similarity index 99%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/wolfgang_pybullet_sim/simulation.py
rename to bitbots_simulation/bitbots_pybullet_sim/bitbots_pybullet_sim/simulation.py
index 824b84914..8c79474f6 100644
--- a/bitbots_wolfgang/wolfgang_pybullet_sim/wolfgang_pybullet_sim/simulation.py
+++ b/bitbots_simulation/bitbots_pybullet_sim/bitbots_pybullet_sim/simulation.py
@@ -14,7 +14,7 @@
 from transforms3d.euler import euler2quat, quat2euler
 from transforms3d.quaternions import qinverse, quat2mat, rotate_vector
 
-from wolfgang_pybullet_sim.terrain import Terrain
+from bitbots_pybullet_sim.terrain import Terrain
 
 
 class Simulation:
@@ -177,7 +177,7 @@ def load_models(self):
             # Load field
 
             rospack = rospkg.RosPack()
-            path = os.path.join(rospack.get_path("wolfgang_pybullet_sim"), "models")
+            path = os.path.join(rospack.get_path("bitbots_pybullet_sim"), "models")
             p.setAdditionalSearchPath(path)  # needed to find field model
             self.field_index = p.loadURDF("field/field.urdf")
 
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/wolfgang_pybullet_sim/terrain.py b/bitbots_simulation/bitbots_pybullet_sim/bitbots_pybullet_sim/terrain.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/wolfgang_pybullet_sim/terrain.py
rename to bitbots_simulation/bitbots_pybullet_sim/bitbots_pybullet_sim/terrain.py
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/config/config.yaml b/bitbots_simulation/bitbots_pybullet_sim/config/config.yaml
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/config/config.yaml
rename to bitbots_simulation/bitbots_pybullet_sim/config/config.yaml
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/docs/_static/logo.png b/bitbots_simulation/bitbots_pybullet_sim/docs/_static/logo.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/docs/_static/logo.png
rename to bitbots_simulation/bitbots_pybullet_sim/docs/_static/logo.png
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/docs/conf.py b/bitbots_simulation/bitbots_pybullet_sim/docs/conf.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/docs/conf.py
rename to bitbots_simulation/bitbots_pybullet_sim/docs/conf.py
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/docs/index.rst b/bitbots_simulation/bitbots_pybullet_sim/docs/index.rst
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/docs/index.rst
rename to bitbots_simulation/bitbots_pybullet_sim/docs/index.rst
diff --git a/bitbots_simulation/bitbots_pybullet_sim/launch/simulation.launch b/bitbots_simulation/bitbots_pybullet_sim/launch/simulation.launch
new file mode 100644
index 000000000..1421e403f
--- /dev/null
+++ b/bitbots_simulation/bitbots_pybullet_sim/launch/simulation.launch
@@ -0,0 +1,17 @@
+<launch>
+    <arg name="gui" default="true"/>
+
+    <group if="$(var gui)">
+        <node pkg="bitbots_pybullet_sim" exec="simulation_with_gui.py" name="pybullet_sim" output="screen">
+            <param from="$(find-pkg-share bitbots_pybullet_sim)/config/config.yaml"/>
+        </node>
+    </group>
+    <group unless="$(var gui)">
+        <node pkg="bitbots_pybullet_sim" exec="simulation_headless.py" name="pybullet_sim" output="screen">
+            <param from="$(find-pkg-share bitbots_pybullet_sim)/config/config.yaml"/>
+        </node>
+    </group>
+    <include file="$(find-pkg-share bitbots_webots_sim)/launch/imu_filter_sim.launch">
+        <arg name="sim" value="true"/>
+    </include>
+</launch>
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/config.json b/bitbots_simulation/bitbots_pybullet_sim/models/field/config.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/config.json
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/config.json
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/field.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/field.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/field.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/field.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/field.urdf b/bitbots_simulation/bitbots_pybullet_sim/models/field/field.urdf
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/field.urdf
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/field.urdf
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/goalsally.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/goalsally.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/goalsally.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/goalsally.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/goalsallyback.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/goalsallyback.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/goalsallyback.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/goalsallyback.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/goalsopponent.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/goalsopponent.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/goalsopponent.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/goalsopponent.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/goalsopponentback.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/goalsopponentback.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/goalsopponentback.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/goalsopponentback.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/lines.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/lines.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/lines.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/lines.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/penaltyally.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/penaltyally.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/penaltyally.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/penaltyally.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/penaltyopponent.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/penaltyopponent.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/penaltyopponent.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/penaltyopponent.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/table.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/table.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/table.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/table.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/table2.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/table2.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/table2.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/table2.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/table3.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/table3.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/table3.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/table3.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/models/field/table4.stl b/bitbots_simulation/bitbots_pybullet_sim/models/field/table4.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/models/field/table4.stl
rename to bitbots_simulation/bitbots_pybullet_sim/models/field/table4.stl
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/package.xml b/bitbots_simulation/bitbots_pybullet_sim/package.xml
similarity index 75%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/package.xml
rename to bitbots_simulation/bitbots_pybullet_sim/package.xml
index e7870fe2e..f39988600 100644
--- a/bitbots_wolfgang/wolfgang_pybullet_sim/package.xml
+++ b/bitbots_simulation/bitbots_pybullet_sim/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>wolfgang_pybullet_sim</name>
+  <name>bitbots_pybullet_sim</name>
   <version>1.3.0</version>
-  <description>Simulation environment using PyBullet for Wolfgang robot.</description>
+  <description>Simulation environment using PyBullet.</description>
 
   <maintainer email="bestmann@informatik.uni-hamburg.de">Marc Bestmann </maintainer>
   <maintainer email="info@bit-bots.de">Hamburg Bit-Bots</maintainer>
@@ -21,15 +21,15 @@
   <depend>rosgraph_msgs</depend>
   <depend>std_msgs</depend>
   <depend>bitbots_docs</depend>
-  <depend>wolfgang_webots_sim</depend>
+  <depend>bitbots_webots_sim</depend>
   <depend>tf_transformations</depend>
   <depend>python3-transforms3d</depend>
   <depend>python3-numpy</depend>
 
   <export>
-      <bitbots_documentation>
-        <status>unknown</status>
-        <language>python</language>
-      </bitbots_documentation>
+    <bitbots_documentation>
+      <status>unknown</status>
+      <language>python</language>
+    </bitbots_documentation>
   </export>
 </package>
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/scripts/simulation_headless.py b/bitbots_simulation/bitbots_pybullet_sim/scripts/simulation_headless.py
similarity index 78%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/scripts/simulation_headless.py
rename to bitbots_simulation/bitbots_pybullet_sim/scripts/simulation_headless.py
index 5a7f699cd..ee9e5c9f0 100755
--- a/bitbots_wolfgang/wolfgang_pybullet_sim/scripts/simulation_headless.py
+++ b/bitbots_simulation/bitbots_pybullet_sim/scripts/simulation_headless.py
@@ -2,9 +2,9 @@
 import threading
 
 import rclpy
+from bitbots_pybullet_sim.ros_interface import ROSInterface
+from bitbots_pybullet_sim.simulation import Simulation
 from rclpy.node import Node
-from wolfgang_pybullet_sim.ros_interface import ROSInterface
-from wolfgang_pybullet_sim.simulation import Simulation
 
 if __name__ == "__main__":
     rclpy.init(args=None)
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/scripts/simulation_with_gui.py b/bitbots_simulation/bitbots_pybullet_sim/scripts/simulation_with_gui.py
similarity index 78%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/scripts/simulation_with_gui.py
rename to bitbots_simulation/bitbots_pybullet_sim/scripts/simulation_with_gui.py
index d5cb5b66d..5e7f2c89f 100755
--- a/bitbots_wolfgang/wolfgang_pybullet_sim/scripts/simulation_with_gui.py
+++ b/bitbots_simulation/bitbots_pybullet_sim/scripts/simulation_with_gui.py
@@ -2,9 +2,9 @@
 import threading
 
 import rclpy
+from bitbots_pybullet_sim.ros_interface import ROSInterface
+from bitbots_pybullet_sim.simulation import Simulation
 from rclpy.node import Node
-from wolfgang_pybullet_sim.ros_interface import ROSInterface
-from wolfgang_pybullet_sim.simulation import Simulation
 
 if __name__ == "__main__":
     rclpy.init(args=None)
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/setup.py b/bitbots_simulation/bitbots_pybullet_sim/setup.py
similarity index 83%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/setup.py
rename to bitbots_simulation/bitbots_pybullet_sim/setup.py
index fc4a872a6..f4df7a765 100644
--- a/bitbots_wolfgang/wolfgang_pybullet_sim/setup.py
+++ b/bitbots_simulation/bitbots_pybullet_sim/setup.py
@@ -3,7 +3,7 @@
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(
-    packages=["wolfgang_pybullet_sim"],
+    packages=["bitbots_pybullet_sim"],
     # scripts=['bin/myscript'],
     package_dir={"": "src"},
 )
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/src/wolfgang_pybullet_sim/ros_interface.py b/bitbots_simulation/bitbots_pybullet_sim/src/bitbots_pybullet_sim/ros_interface.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_pybullet_sim/src/wolfgang_pybullet_sim/ros_interface.py
rename to bitbots_simulation/bitbots_pybullet_sim/src/bitbots_pybullet_sim/ros_interface.py
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/.gitignore b/bitbots_simulation/bitbots_robocup_api/.gitignore
similarity index 100%
rename from bitbots_wolfgang/wolfgang_robocup_api/.gitignore
rename to bitbots_simulation/bitbots_robocup_api/.gitignore
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/README.md b/bitbots_simulation/bitbots_robocup_api/README.md
similarity index 67%
rename from bitbots_wolfgang/wolfgang_robocup_api/README.md
rename to bitbots_simulation/bitbots_robocup_api/README.md
index bcad66f6f..1021d8b1f 100644
--- a/bitbots_wolfgang/wolfgang_robocup_api/README.md
+++ b/bitbots_simulation/bitbots_robocup_api/README.md
@@ -1 +1 @@
-This package bridges between the [official Humanoid League RoboCup Proto3 API](https://cdn.robocup.org/hl/wp/2021/05/v-hsc_simulator_api_v1.0.pdf) and our ROS topics for the Wolfgang Robot.
+This package bridges between the [official Humanoid League RoboCup Proto3 API](https://cdn.robocup.org/hl/wp/2021/05/v-hsc_simulator_api_v1.0.pdf) and our ROS topics.
diff --git a/bitbots_simulation/bitbots_robocup_api/config/bitbots_walk.json b/bitbots_simulation/bitbots_robocup_api/config/bitbots_walk.json
new file mode 100644
index 000000000..ce9a44088
--- /dev/null
+++ b/bitbots_simulation/bitbots_robocup_api/config/bitbots_walk.json
@@ -0,0 +1,62 @@
+{
+  "name": "Bit-Bots",
+  "players": {
+    "1": {
+      "proto": "Wolfgang",
+      "dockerTag": "latest",
+      "dockerCmd": "roslaunch bitbots_robocup_api robocup_walk.launch",
+      "halfTimeStartingPose": {
+        "translation": [
+          -3.6,
+          -3.20,
+          0.43
+        ],
+        "rotation": [
+          0.13,
+          -0.13,
+          -0.98,
+          -1.57
+        ]
+      },
+      "reentryStartingPose": {
+        "translation": [
+          -3.6,
+          -3.20,
+          0.43
+        ],
+        "rotation": [
+          0.0,
+          -0.0,
+          -1.0,
+          -1.57
+        ]
+      },
+      "shootoutStartingPose": {
+        "translation": [
+          2.6,
+          0,
+          0.43
+        ],
+        "rotation": [
+          0,
+          0.98,
+          0.13,
+          0.26
+        ]
+      },
+      "goalKeeperStartingPose": {
+        "translation": [
+          -4.47,
+          0,
+          0.43
+        ],
+        "rotation": [
+          -0.13,
+          0,
+          0.98,
+          3.14
+        ]
+      }
+    }
+  }
+}
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/config/devices.json b/bitbots_simulation/bitbots_robocup_api/config/devices.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_robocup_api/config/devices.json
rename to bitbots_simulation/bitbots_robocup_api/config/devices.json
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/config/team.json b/bitbots_simulation/bitbots_robocup_api/config/team.json
similarity index 100%
rename from bitbots_wolfgang/wolfgang_robocup_api/config/team.json
rename to bitbots_simulation/bitbots_robocup_api/config/team.json
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/launch/wolfgang_robocup_api_bridge.launch b/bitbots_simulation/bitbots_robocup_api/launch/bitbots_robocup_api_bridge.launch
similarity index 68%
rename from bitbots_wolfgang/wolfgang_robocup_api/launch/wolfgang_robocup_api_bridge.launch
rename to bitbots_simulation/bitbots_robocup_api/launch/bitbots_robocup_api_bridge.launch
index eb6350905..903bd8543 100644
--- a/bitbots_wolfgang/wolfgang_robocup_api/launch/wolfgang_robocup_api_bridge.launch
+++ b/bitbots_simulation/bitbots_robocup_api/launch/bitbots_robocup_api_bridge.launch
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <launch>
     <node pkg="hlvs_player" exec="hlvs_player" output="screen">
-        <param name="devices_file" value="$(find-pkg-share wolfgang_robocup_api)/config/devices.json"/>
+        <param name="devices_file" value="$(find-pkg-share bitbots_robocup_api)/config/devices.json"/>
         <remap from="camera/image_raw" to="camera/image_proc"/>
         <remap from="imu/data" to="imu/data_raw"/>
     </node>
     <!-- The hlvs_player expects the joint command positions as a 'JointState' message.
     We therfore need to convert the messages from our custom 'JointCommand' message to the
     more common 'JointState' layout. -->
-    <node pkg="wolfgang_robocup_api" exec="command_proxy" output="screen">
+    <node pkg="bitbots_robocup_api" exec="command_proxy" output="screen">
         <remap from="input" to="DynamixelController/command"/>
         <remap from="output" to="joint_command"/>
     </node>
-    <include file="$(find-pkg-share wolfgang_webots_sim)/launch/imu_filter_sim.launch" />
+    <include file="$(find-pkg-share bitbots_webots_sim)/launch/imu_filter_sim.launch" />
 </launch>
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/launch/robocup_teamplayer.launch b/bitbots_simulation/bitbots_robocup_api/launch/robocup_teamplayer.launch
similarity index 89%
rename from bitbots_wolfgang/wolfgang_robocup_api/launch/robocup_teamplayer.launch
rename to bitbots_simulation/bitbots_robocup_api/launch/robocup_teamplayer.launch
index 8b4fb2534..7c145e37a 100644
--- a/bitbots_wolfgang/wolfgang_robocup_api/launch/robocup_teamplayer.launch
+++ b/bitbots_simulation/bitbots_robocup_api/launch/robocup_teamplayer.launch
@@ -10,7 +10,7 @@
     </group>
 
     <!-- load the robocup api -->
-    <include file="$(find-pkg-share wolfgang_robocup_api)/launch/wolfgang_robocup_api_bridge.launch" />
+    <include file="$(find-pkg-share bitbots_robocup_api)/launch/bitbots_robocup_api_bridge.launch" />
 
     <!-- launch the team player -->
     <include file="$(find-pkg-share bitbots_bringup)/launch/teamplayer.launch">
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/launch/robocup_walk.launch b/bitbots_simulation/bitbots_robocup_api/launch/robocup_walk.launch
similarity index 79%
rename from bitbots_wolfgang/wolfgang_robocup_api/launch/robocup_walk.launch
rename to bitbots_simulation/bitbots_robocup_api/launch/robocup_walk.launch
index 9fb758d90..ec8b05e69 100644
--- a/bitbots_wolfgang/wolfgang_robocup_api/launch/robocup_walk.launch
+++ b/bitbots_simulation/bitbots_robocup_api/launch/robocup_walk.launch
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <launch>
-    <include file="$(find wolfgang_robocup_api)/launch/wolfgang_robocup_api_bridge.launch" />
+    <include file="$(find bitbots_robocup_api)/launch/bitbots_robocup_api_bridge.launch" />
 
     <include file="$(find bitbots_bringup)/launch/motion_standalone.launch">
         <arg name="sim" value="true" />
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/package.xml b/bitbots_simulation/bitbots_robocup_api/package.xml
similarity index 94%
rename from bitbots_wolfgang/wolfgang_robocup_api/package.xml
rename to bitbots_simulation/bitbots_robocup_api/package.xml
index cdc392e07..b7b2c2954 100644
--- a/bitbots_wolfgang/wolfgang_robocup_api/package.xml
+++ b/bitbots_simulation/bitbots_robocup_api/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>wolfgang_robocup_api</name>
+  <name>bitbots_robocup_api</name>
   <version>0.0.0</version>
   <description>Bridge between the official Humanoid League RoboCup Proto3 API
     and our ROS topics for the Wolfgang Robot
@@ -23,7 +23,7 @@
   <depend>hlvs_player</depend>
   <depend>rclpy</depend>
   <depend>sensor_msgs</depend>
-  <depend>wolfgang_webots_sim</depend>
+  <depend>bitbots_webots_sim</depend>
   <depend>protobuf-dev</depend>
   <depend>urdfdom_py</depend>
   <depend>topic_tools</depend>
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/resource/wolfgang_robocup_api b/bitbots_simulation/bitbots_robocup_api/resource/bitbots_robocup_api
similarity index 100%
rename from bitbots_wolfgang/wolfgang_robocup_api/resource/wolfgang_robocup_api
rename to bitbots_simulation/bitbots_robocup_api/resource/bitbots_robocup_api
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/scripts/start.sh b/bitbots_simulation/bitbots_robocup_api/scripts/start.sh
similarity index 97%
rename from bitbots_wolfgang/wolfgang_robocup_api/scripts/start.sh
rename to bitbots_simulation/bitbots_robocup_api/scripts/start.sh
index 5793d5586..ec5cbe0a3 100755
--- a/bitbots_wolfgang/wolfgang_robocup_api/scripts/start.sh
+++ b/bitbots_simulation/bitbots_robocup_api/scripts/start.sh
@@ -138,4 +138,4 @@ sed -i "/^    target_ip:/s/^.*$/    target_ip: $ROBOCUP_MIRROR_SERVER_IP/" $TEAM
 # Start ROS #
 #############
 
-exec ros2 launch wolfgang_robocup_api robocup_teamplayer.launch record:=$RECORD
+exec ros2 launch bitbots_robocup_api robocup_teamplayer.launch record:=$RECORD
diff --git a/bitbots_simulation/bitbots_robocup_api/setup.cfg b/bitbots_simulation/bitbots_robocup_api/setup.cfg
new file mode 100644
index 000000000..dddd43c45
--- /dev/null
+++ b/bitbots_simulation/bitbots_robocup_api/setup.cfg
@@ -0,0 +1,4 @@
+[develop]
+script_dir=$base/lib/bitbots_robocup_api
+[install]
+install_scripts=$base/lib/bitbots_robocup_api
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/setup.py b/bitbots_simulation/bitbots_robocup_api/setup.py
similarity index 95%
rename from bitbots_wolfgang/wolfgang_robocup_api/setup.py
rename to bitbots_simulation/bitbots_robocup_api/setup.py
index 702ab9448..94fdf23af 100644
--- a/bitbots_wolfgang/wolfgang_robocup_api/setup.py
+++ b/bitbots_simulation/bitbots_robocup_api/setup.py
@@ -3,7 +3,7 @@
 
 from setuptools import find_packages, setup
 
-package_name = "wolfgang_robocup_api"
+package_name = "bitbots_robocup_api"
 
 setup(
     name=package_name,
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/wolfgang_robocup_api/__init__.py b/bitbots_simulation/bitbots_robocup_api/wolfgang_robocup_api/__init__.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_robocup_api/wolfgang_robocup_api/__init__.py
rename to bitbots_simulation/bitbots_robocup_api/wolfgang_robocup_api/__init__.py
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/wolfgang_robocup_api/command_proxy.py b/bitbots_simulation/bitbots_robocup_api/wolfgang_robocup_api/command_proxy.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_robocup_api/wolfgang_robocup_api/command_proxy.py
rename to bitbots_simulation/bitbots_robocup_api/wolfgang_robocup_api/command_proxy.py
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/.gitignore b/bitbots_simulation/bitbots_webots_sim/.gitignore
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/.gitignore
rename to bitbots_simulation/bitbots_webots_sim/.gitignore
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/CMakeLists.txt b/bitbots_simulation/bitbots_webots_sim/CMakeLists.txt
similarity index 98%
rename from bitbots_wolfgang/wolfgang_webots_sim/CMakeLists.txt
rename to bitbots_simulation/bitbots_webots_sim/CMakeLists.txt
index e93ad4a15..2562bc709 100644
--- a/bitbots_wolfgang/wolfgang_webots_sim/CMakeLists.txt
+++ b/bitbots_simulation/bitbots_webots_sim/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(wolfgang_webots_sim)
+project(bitbots_webots_sim)
 
 # Add support for C++17
 if(NOT CMAKE_CXX_STANDARD)
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/README.md b/bitbots_simulation/bitbots_webots_sim/README.md
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/README.md
rename to bitbots_simulation/bitbots_webots_sim/README.md
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/wolfgang_webots_sim/__init__.py b/bitbots_simulation/bitbots_webots_sim/bitbots_webots_sim/__init__.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/wolfgang_webots_sim/__init__.py
rename to bitbots_simulation/bitbots_webots_sim/bitbots_webots_sim/__init__.py
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/wolfgang_webots_sim/webots_robot_controller.py b/bitbots_simulation/bitbots_webots_sim/bitbots_webots_sim/webots_robot_controller.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/wolfgang_webots_sim/webots_robot_controller.py
rename to bitbots_simulation/bitbots_webots_sim/bitbots_webots_sim/webots_robot_controller.py
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/wolfgang_webots_sim/webots_robot_supervisor_controller.py b/bitbots_simulation/bitbots_webots_sim/bitbots_webots_sim/webots_robot_supervisor_controller.py
similarity index 91%
rename from bitbots_wolfgang/wolfgang_webots_sim/wolfgang_webots_sim/webots_robot_supervisor_controller.py
rename to bitbots_simulation/bitbots_webots_sim/bitbots_webots_sim/webots_robot_supervisor_controller.py
index 48bcd47b5..e9c80b80a 100644
--- a/bitbots_wolfgang/wolfgang_webots_sim/wolfgang_webots_sim/webots_robot_supervisor_controller.py
+++ b/bitbots_simulation/bitbots_webots_sim/bitbots_webots_sim/webots_robot_supervisor_controller.py
@@ -1,5 +1,5 @@
-from wolfgang_webots_sim.webots_robot_controller import RobotController
-from wolfgang_webots_sim.webots_supervisor_controller import SupervisorController
+from bitbots_webots_sim.webots_robot_controller import RobotController
+from bitbots_webots_sim.webots_supervisor_controller import SupervisorController
 
 
 class RobotSupervisorController(SupervisorController, RobotController):
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/wolfgang_webots_sim/webots_supervisor_controller.py b/bitbots_simulation/bitbots_webots_sim/bitbots_webots_sim/webots_supervisor_controller.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/wolfgang_webots_sim/webots_supervisor_controller.py
rename to bitbots_simulation/bitbots_webots_sim/bitbots_webots_sim/webots_supervisor_controller.py
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/docs/_static/logo.png b/bitbots_simulation/bitbots_webots_sim/docs/_static/logo.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/docs/_static/logo.png
rename to bitbots_simulation/bitbots_webots_sim/docs/_static/logo.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/docs/conf.py b/bitbots_simulation/bitbots_webots_sim/docs/conf.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/docs/conf.py
rename to bitbots_simulation/bitbots_webots_sim/docs/conf.py
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/docs/index.rst b/bitbots_simulation/bitbots_webots_sim/docs/index.rst
similarity index 98%
rename from bitbots_wolfgang/wolfgang_webots_sim/docs/index.rst
rename to bitbots_simulation/bitbots_webots_sim/docs/index.rst
index b44687ef4..f7ce365dc 100644
--- a/bitbots_wolfgang/wolfgang_webots_sim/docs/index.rst
+++ b/bitbots_simulation/bitbots_webots_sim/docs/index.rst
@@ -28,7 +28,7 @@ Run the script to adapt the urdf to be usable by webots2urdf
 
 .. code-block:: bash
 
-  roscd wolfgang_webots_sim
+  roscd bitbots_webots_sim
   python scripts/fix_urdf_for_webots.py ../wolfgang_description/urdf/robot.urdf webots_robot.urdf
 
 Run the conversion script from urdf to proto file
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/launch/fake_localization.launch b/bitbots_simulation/bitbots_webots_sim/launch/fake_localization.launch
similarity index 85%
rename from bitbots_wolfgang/wolfgang_webots_sim/launch/fake_localization.launch
rename to bitbots_simulation/bitbots_webots_sim/launch/fake_localization.launch
index b0f4e9674..61964745c 100644
--- a/bitbots_wolfgang/wolfgang_webots_sim/launch/fake_localization.launch
+++ b/bitbots_simulation/bitbots_webots_sim/launch/fake_localization.launch
@@ -6,5 +6,5 @@
     <node pkg="tf2_ros" exec="static_transform_publisher" name="donna_map" args="0 0 0 0 0 0 1 map donna/map" />
     <node pkg="tf2_ros" exec="static_transform_publisher" name="melody_map" args="0 0 0 0 0 0 1 map melody/map" />
 
-    <node pkg="wolfgang_webots_sim" exec="localization_faker.py" name="localization_faker"/>
-</launch>
\ No newline at end of file
+    <node pkg="bitbots_webots_sim" exec="localization_faker.py" name="localization_faker"/>
+</launch>
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/launch/imu_filter_sim.launch b/bitbots_simulation/bitbots_webots_sim/launch/imu_filter_sim.launch
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/launch/imu_filter_sim.launch
rename to bitbots_simulation/bitbots_webots_sim/launch/imu_filter_sim.launch
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/launch/simulation.launch b/bitbots_simulation/bitbots_webots_sim/launch/simulation.launch
similarity index 70%
rename from bitbots_wolfgang/wolfgang_webots_sim/launch/simulation.launch
rename to bitbots_simulation/bitbots_webots_sim/launch/simulation.launch
index b9511ea3f..65d452475 100644
--- a/bitbots_wolfgang/wolfgang_webots_sim/launch/simulation.launch
+++ b/bitbots_simulation/bitbots_webots_sim/launch/simulation.launch
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <launch>
     <arg name="gui" default="true" description="Whether or not to launch webots with rendering"/>
-    <arg name="headless" default="false"
-         description="If true, launches webots completely headless with a virtual frame buffer"/>
-    <arg name="num_robots" default="4"
-         description="Number of robots for which a ROS controller is started. 1 if multi_robot=True "/>
+    <arg name="headless" default="false" description="If true, launches webots completely headless with a virtual frame buffer"/>
+    <arg name="num_robots" default="4" description="Number of robots for which a ROS controller is started. 1 if multi_robot=True "/>
     <arg name="multi_robot" default="false" description="Start world with either one or four robots"/>
     <arg name="sim_port" default="1234" description="Port used for the simulator communication. Relevant if multiple simulations are run at the same time"/>
     <arg name="camera" default="true" description="Turn on or off the camera (to speed up if only motion is required)"/>
@@ -22,18 +20,17 @@
     <set_env name="PYTHONPATH" value="$(env PYTHONPATH):$(env WEBOTS_HOME)/lib/controller/python310"/>
 
     <!-- start simulation and supervisor either with or without gui -->
-    <node pkg="wolfgang_webots_sim" exec="start_simulator.py" name="webots_sim"
-          output="screen" args="$(var multi_robot_flag) $(var gui_flag) $(var headless_flag) --sim-port $(var sim_port) --robot-type $(var robot_type)"/>
-    <node pkg="wolfgang_webots_sim" exec="start_webots_ros_supervisor.py" name="webots_ros_supervisor" output="screen" args="--sim-port $(var sim_port)"/>
+    <node pkg="bitbots_webots_sim" exec="start_simulator.py" name="webots_sim" output="screen" args="$(var multi_robot_flag) $(var gui_flag) $(var headless_flag) --sim-port $(var sim_port) --robot-type $(var robot_type)"/>
+    <node pkg="bitbots_webots_sim" exec="start_webots_ros_supervisor.py" name="webots_ros_supervisor" output="screen" args="--sim-port $(var sim_port)"/>
 
     <group unless="$(var multi_robot)">
-        <include file="$(find-pkg-share wolfgang_webots_sim)/launch/single_robot_controller.launch">
+        <include file="$(find-pkg-share bitbots_webots_sim)/launch/single_robot_controller.launch">
             <arg name="camera" value="$(var camera)"/>
             <arg name="sim_port" value="$(var sim_port)"/>
             <arg name="recognition" value="$(var recognition)"/>
             <arg name="robot_type" value="$(var robot_type)"/>
         </include>
-        <include file="$(find-pkg-share wolfgang_webots_sim)/launch/imu_filter_sim.launch"/>
+        <include file="$(find-pkg-share bitbots_webots_sim)/launch/imu_filter_sim.launch"/>
     </group>
 
     <!-- case for multiple robots -->
@@ -41,7 +38,7 @@
         <!-- start single controllers based on num_robots as ros or void controller -->
         <group>
             <push_ros_namespace namespace="amy"/>
-            <include file="$(find-pkg-share wolfgang_webots_sim)/launch/single_robot_controller.launch">
+            <include file="$(find-pkg-share bitbots_webots_sim)/launch/single_robot_controller.launch">
                 <arg name="robot_name" value="amy"/>
                 <arg name="tf_prefix" value="amy/"/>
                 <arg name="sim_port" value="$(var sim_port)"/>
@@ -49,11 +46,11 @@
                 <arg name="camera" value="$(var camera)"/>
                 <arg name="recognition" value="$(var recognition)"/>
             </include>
-            <include file="$(find-pkg-share wolfgang_webots_sim)/launch/imu_filter_sim.launch" />
+            <include file="$(find-pkg-share bitbots_webots_sim)/launch/imu_filter_sim.launch" />
         </group>
         <group>
             <push_ros_namespace namespace="rory"/>
-            <include file="$(find-pkg-share wolfgang_webots_sim)/launch/single_robot_controller.launch">
+            <include file="$(find-pkg-share bitbots_webots_sim)/launch/single_robot_controller.launch">
                 <arg name="robot_name" value="rory"/>
                 <arg name="tf_prefix" value="rory/"/>
                 <arg name="sim_port" value="$(var sim_port)"/>
@@ -61,11 +58,11 @@
                 <arg name="camera" value="$(var camera)"/>
                 <arg name="recognition" value="$(var recognition)"/>
             </include>
-            <include file="$(find-pkg-share wolfgang_webots_sim)/launch/imu_filter_sim.launch" />
+            <include file="$(find-pkg-share bitbots_webots_sim)/launch/imu_filter_sim.launch" />
         </group>
         <group>
             <push_ros_namespace namespace="jack"/>
-            <include file="$(find-pkg-share wolfgang_webots_sim)/launch/single_robot_controller.launch">
+            <include file="$(find-pkg-share bitbots_webots_sim)/launch/single_robot_controller.launch">
                 <arg name="robot_name" value="jack"/>
                 <arg name="tf_prefix" value="jack/"/>
                 <arg name="sim_port" value="$(var sim_port)"/>
@@ -73,11 +70,11 @@
                 <arg name="camera" value="$(var camera)"/>
                 <arg name="recognition" value="$(var recognition)"/>
             </include>
-            <include file="$(find-pkg-share wolfgang_webots_sim)/launch/imu_filter_sim.launch" />
+            <include file="$(find-pkg-share bitbots_webots_sim)/launch/imu_filter_sim.launch" />
         </group>
         <group>
             <push_ros_namespace namespace="donna"/>
-            <include file="$(find-pkg-share wolfgang_webots_sim)/launch/single_robot_controller.launch">
+            <include file="$(find-pkg-share bitbots_webots_sim)/launch/single_robot_controller.launch">
                 <arg name="robot_name" value="donna"/>
                 <arg name="tf_prefix" value="donna/"/>
                 <arg name="sim_port" value="$(var sim_port)"/>
@@ -85,7 +82,7 @@
                 <arg name="camera" value="$(var camera)"/>
                 <arg name="recognition" value="$(var recognition)"/>
             </include>
-            <include file="$(find-pkg-share wolfgang_webots_sim)/launch/imu_filter_sim.launch" />
+            <include file="$(find-pkg-share bitbots_webots_sim)/launch/imu_filter_sim.launch" />
         </group>
     </group>
 </launch>
diff --git a/bitbots_simulation/bitbots_webots_sim/launch/single_robot_controller.launch b/bitbots_simulation/bitbots_webots_sim/launch/single_robot_controller.launch
new file mode 100644
index 000000000..d51ff1a32
--- /dev/null
+++ b/bitbots_simulation/bitbots_webots_sim/launch/single_robot_controller.launch
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<launch>
+     <arg name="robot_name" default="amy" description="The name of the robot" />
+     <arg name="tf_prefix" default="" description="Prefix applied to the published frames in the headers"/>
+     <arg name="camera" default="false" description="Turn on or off the camera (to speed up if only motion is required)"/>
+     <arg name="recognition" default="false" description="Turn on or off automatic recognition for collection of training data"/>
+     <arg name="void_controller" default="false" description="If set to true, the robot is not controllable"/>
+     <arg name="robot_type" default="wolfgang" description="What type of robot should be used"/>
+     <arg name="sim_port" default="1234" description="Port used for the simulator communication. Relevant if multiple simulations are run at the same time"/>
+
+     <arg name="void_flag" default="$(eval '\'--void-controller\' if \'$(var void_controller)\'==\'true\' else \'\'')" description="do not set, used internally"/>
+     <arg name="recognition_flag" default="$(eval '\'--recognize\' if \'$(var recognition)\'==\'true\' else \'\'')" description="do not set, used internally"/>
+     <arg name="camera_disable_flag" default="$(eval '\'--disable-camera\' if not \'$(var camera)\'==\'true\' else \'\'')" description="do not set, used internally"/>
+
+     <node pkg="bitbots_webots_sim" exec="start_single.py" name="webots_ros_interface" respawn="true" output="screen" args="--robot_name $(var robot_name) $(var void_flag) $(var recognition_flag) $(var camera_disable_flag) --robot-type $(var robot_type) --sim-port $(var sim_port)">
+          <param name="base_link_frame" value="$(var tf_prefix)base_link"/>
+          <param name="r_sole_frame" value="$(var tf_prefix)r_sole"/>
+          <param name="l_sole_frame" value="$(var tf_prefix)l_sole"/>
+          <param name="camera_optical_frame" value="$(var tf_prefix)camera_optical_frame"/>
+          <param name="head_imu_frame" value="$(var tf_prefix)imu_frame_2"/>
+          <param name="imu_frame" value="$(var tf_prefix)imu_frame"/>
+     </node>
+</launch>
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/package.xml b/bitbots_simulation/bitbots_webots_sim/package.xml
similarity index 88%
rename from bitbots_wolfgang/wolfgang_webots_sim/package.xml
rename to bitbots_simulation/bitbots_webots_sim/package.xml
index 831610bd3..dc368db75 100644
--- a/bitbots_wolfgang/wolfgang_webots_sim/package.xml
+++ b/bitbots_simulation/bitbots_webots_sim/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>wolfgang_webots_sim</name>
+  <name>bitbots_webots_sim</name>
   <version>1.4.0</version>
   <description>Simulation environment using Webots for Wolfgang robot.</description>
 
@@ -34,10 +34,10 @@
 
 
   <export>
-      <bitbots_documentation>
-        <status>unknown</status>
-        <language>python</language>
-      </bitbots_documentation>
+    <bitbots_documentation>
+      <status>unknown</status>
+      <language>python</language>
+    </bitbots_documentation>
     <build_type>ament_cmake</build_type>
   </export>
 </package>
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/FreeCamera.proto b/bitbots_simulation/bitbots_webots_sim/protos/FreeCamera.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/FreeCamera.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/FreeCamera.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/RoboCupBackground.proto b/bitbots_simulation/bitbots_webots_sim/protos/RoboCupBackground.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/RoboCupBackground.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/RoboCupBackground.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/RobocupGoal.proto b/bitbots_simulation/bitbots_webots_sim/protos/RobocupGoal.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/RobocupGoal.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/RobocupGoal.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/RobocupSoccerField.proto b/bitbots_simulation/bitbots_webots_sim/protos/RobocupSoccerField.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/RobocupSoccerField.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/RobocupSoccerField.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/RobocupTexturedSoccerBall.proto b/bitbots_simulation/bitbots_webots_sim/protos/RobocupTexturedSoccerBall.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/RobocupTexturedSoccerBall.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/RobocupTexturedSoccerBall.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/ankle.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/ankle.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/ankle.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/ankle.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/baseplate_odroid_xu4_core.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/baseplate_odroid_xu4_core.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/baseplate_odroid_xu4_core.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/baseplate_odroid_xu4_core.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/basler_ace_gige_c-mount_v01.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/basler_ace_gige_c-mount_v01.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/basler_ace_gige_c-mount_v01.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/basler_ace_gige_c-mount_v01.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/battery.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/battery.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/battery.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/battery.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/battery_cage.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/battery_cage.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/battery_cage.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/battery_cage.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/battery_clip.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/battery_clip.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/battery_clip.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/battery_clip.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/camera_lower_basler_wolfgang_imu_v2.2.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/camera_lower_basler_wolfgang_imu_v2.2.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/camera_lower_basler_wolfgang_imu_v2.2.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/camera_lower_basler_wolfgang_imu_v2.2.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_left.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_left.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_left.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_left.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_right.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_right.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_right.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_right.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/connector_shoulder.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/connector_shoulder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/connector_shoulder.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/connector_shoulder.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/core.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/core.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/core.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/core.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/dummy_speaker.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/dummy_speaker.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/dummy_speaker.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/dummy_speaker.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/flex_stollen.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/flex_stollen.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/flex_stollen.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/flex_stollen.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/foot_cover.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/foot_cover.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/foot_cover.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/foot_cover.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/foot_printed_left.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/foot_printed_left.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/foot_printed_left.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/foot_printed_left.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/foot_printed_right.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/foot_printed_right.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/foot_printed_right.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/foot_printed_right.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/hand.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/hand.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/hand.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/hand.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/hip_u_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/hip_u_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/hip_u_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/hip_u_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/imu_holder.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/imu_holder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/imu_holder.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/imu_holder.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/knee_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/knee_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/knee_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/knee_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/knee_spacer.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/knee_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/knee_spacer.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/knee_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/lense.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/lense.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/lense.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/lense.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/load_cell.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/load_cell.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/load_cell.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/load_cell.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/lower_arm.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/lower_arm.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/lower_arm.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/lower_arm.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/lower_leg.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/lower_leg.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/lower_leg.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/lower_leg.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/lower_leg_spacer.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/lower_leg_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/lower_leg_spacer.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/lower_leg_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/motor_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/motor_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/motor_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/motor_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/mx-106_body.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/mx-106_body.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/mx-106_body.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/mx-106_body.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/mx-64-body.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/mx-64-body.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/mx-64-body.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/mx-64-body.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_holder_left_back.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_holder_left_back.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_holder_left_back.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_holder_left_back.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_holder_left_front.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_holder_left_front.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_holder_left_front.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_holder_left_front.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_holder_right_back.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_holder_right_back.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_holder_right_back.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_holder_right_back.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_holder_right_front.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_holder_right_front.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_holder_right_front.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_holder_right_front.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_main.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_main.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/nuc_main.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/nuc_main.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/sea_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/sea_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/sea_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/sea_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/sea_ninjaflex.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/sea_ninjaflex.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/sea_ninjaflex.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/sea_ninjaflex.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/shoulder_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/shoulder_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/shoulder_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/shoulder_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/speaker_holder.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/speaker_holder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/speaker_holder.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/speaker_holder.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/spring_holder_lower.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/spring_holder_lower.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/spring_holder_lower.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/spring_holder_lower.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/spring_holder_upper.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/spring_holder_upper.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/spring_holder_upper.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/spring_holder_upper.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/springholder_bottom.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/springholder_bottom.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/springholder_bottom.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/springholder_bottom.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/springholder_new.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/springholder_new.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/springholder_new.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/springholder_new.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/thrustbearingholder.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/thrustbearingholder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/thrustbearingholder.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/thrustbearingholder.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/torso_bottom.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/torso_bottom.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/torso_bottom.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/torso_bottom.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/torso_bumper_left.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/torso_bumper_left.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/torso_bumper_left.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/torso_bumper_left.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/torso_bumper_right.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/torso_bumper_right.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/torso_bumper_right.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/torso_bumper_right.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/torso_top.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/torso_top.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/torso_top.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/torso_top.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/upper_arm.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/upper_arm.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/upper_arm.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/upper_arm.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/upper_arm_spacer.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/upper_arm_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/upper_arm_spacer.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/upper_arm_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/upper_leg.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/upper_leg.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/upper_leg.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/upper_leg.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/upper_leg_spacer.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/upper_leg_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/upper_leg_spacer.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/upper_leg_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/xh-540.stl b/bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/xh-540.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/Wolfgang_meshes/xh-540.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/Wolfgang_meshes/xh-540.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_back.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_back.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_back.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_back.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_bottom.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_bottom.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_bottom.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_bottom.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_front.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_front.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_front.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_front.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_left.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_left.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_left.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_left.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_right.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_right.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_right.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_right.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_top.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_top.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/kiara_1_dawn_top.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/kiara_1_dawn_top.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_back.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_back.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_back.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_back.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_bottom.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_bottom.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_bottom.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_bottom.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_front.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_front.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_front.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_front.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_left.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_left.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_left.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_left.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_right.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_right.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_right.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_right.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_top.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_top.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/paul_lobe_haus_top.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/paul_lobe_haus_top.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_back.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_back.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_back.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_back.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_bottom.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_bottom.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_bottom.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_bottom.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_front.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_front.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_front.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_front.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_left.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_left.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_left.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_left.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_right.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_right.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_right.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_right.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_top.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_top.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_top.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sepulchral_chapel_rotunda_top.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_back.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_back.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_back.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_back.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_back.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_back.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_back.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_back.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_bottom.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_bottom.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_bottom.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_bottom.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_bottom.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_bottom.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_bottom.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_bottom.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_front.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_front.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_front.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_front.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_front.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_front.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_front.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_front.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_left.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_left.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_left.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_left.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_left.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_left.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_left.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_left.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_right.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_right.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_right.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_right.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_right.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_right.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_right.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_right.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_top.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_top.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_top.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_top.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_top.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_top.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/shanghai_riverside_top.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/shanghai_riverside_top.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_back.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_back.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_back.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_back.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_back.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_back.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_back.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_back.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_back.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_back.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_back.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_back.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_bottom.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_bottom.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_bottom.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_bottom.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_bottom.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_bottom.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_bottom.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_bottom.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_front.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_front.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_front.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_front.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_front.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_front.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_front.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_front.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_left.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_left.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_left.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_left.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_left.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_left.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_left.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_left.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_right.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_right.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_right.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_right.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_right.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_right.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_dry_right.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_dry_right.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_top.hdr b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_top.hdr
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_top.hdr
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_top.hdr
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_top.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_top.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/stadium_top.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/stadium_top.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_back.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_back.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_back.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_back.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_bottom.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_bottom.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_bottom.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_bottom.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_front.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_front.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_front.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_front.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_left.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_left.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_left.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_left.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_right.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_right.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_right.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_right.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_top.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_top.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/sunset_jhbcentral_top.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/sunset_jhbcentral_top.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_back.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_back.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_back.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_back.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_bottom.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_bottom.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_bottom.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_bottom.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_front.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_front.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_front.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_front.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_left.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_left.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_left.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_left.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_right.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_right.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_right.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_right.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_top.png b/bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_top.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/backgrounds/ulmer_muenster_top.png
rename to bitbots_simulation/bitbots_webots_sim/protos/backgrounds/ulmer_muenster_top.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/LICENSE b/bitbots_simulation/bitbots_webots_sim/protos/ball_textures/LICENSE
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/LICENSE
rename to bitbots_simulation/bitbots_webots_sim/protos/ball_textures/LICENSE
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/europass.jpg b/bitbots_simulation/bitbots_webots_sim/protos/ball_textures/europass.jpg
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/europass.jpg
rename to bitbots_simulation/bitbots_webots_sim/protos/ball_textures/europass.jpg
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/jabulani.jpg b/bitbots_simulation/bitbots_webots_sim/protos/ball_textures/jabulani.jpg
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/jabulani.jpg
rename to bitbots_simulation/bitbots_webots_sim/protos/ball_textures/jabulani.jpg
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/tango.jpg b/bitbots_simulation/bitbots_webots_sim/protos/ball_textures/tango.jpg
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/tango.jpg
rename to bitbots_simulation/bitbots_webots_sim/protos/ball_textures/tango.jpg
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/teamgeist.jpg b/bitbots_simulation/bitbots_webots_sim/protos/ball_textures/teamgeist.jpg
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/teamgeist.jpg
rename to bitbots_simulation/bitbots_webots_sim/protos/ball_textures/teamgeist.jpg
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/telstar.jpg b/bitbots_simulation/bitbots_webots_sim/protos/ball_textures/telstar.jpg
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/ball_textures/telstar.jpg
rename to bitbots_simulation/bitbots_webots_sim/protos/ball_textures/telstar.jpg
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/hl_supervisor/hl_supervisor.proto b/bitbots_simulation/bitbots_webots_sim/protos/hl_supervisor/hl_supervisor.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/hl_supervisor/hl_supervisor.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/hl_supervisor/hl_supervisor.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/RoboCupMainLight.proto b/bitbots_simulation/bitbots_webots_sim/protos/lighting/RoboCupMainLight.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/RoboCupMainLight.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/lighting/RoboCupMainLight.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/RoboCupOffLight.proto b/bitbots_simulation/bitbots_webots_sim/protos/lighting/RoboCupOffLight.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/RoboCupOffLight.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/lighting/RoboCupOffLight.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/RoboCupTopLight.proto b/bitbots_simulation/bitbots_webots_sim/protos/lighting/RoboCupTopLight.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/RoboCupTopLight.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/lighting/RoboCupTopLight.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/icons/RoboCupMainLight.png b/bitbots_simulation/bitbots_webots_sim/protos/lighting/icons/RoboCupMainLight.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/icons/RoboCupMainLight.png
rename to bitbots_simulation/bitbots_webots_sim/protos/lighting/icons/RoboCupMainLight.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/icons/RoboCupOffLight.png b/bitbots_simulation/bitbots_webots_sim/protos/lighting/icons/RoboCupOffLight.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/icons/RoboCupOffLight.png
rename to bitbots_simulation/bitbots_webots_sim/protos/lighting/icons/RoboCupOffLight.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/icons/RoboCupTopLight.png b/bitbots_simulation/bitbots_webots_sim/protos/lighting/icons/RoboCupTopLight.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/lighting/icons/RoboCupTopLight.png
rename to bitbots_simulation/bitbots_webots_sim/protos/lighting/icons/RoboCupTopLight.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/WolfgangOptimization.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/WolfgangOptimization.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/WolfgangOptimization.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/WolfgangOptimization.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/WolfgangRobocup.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/WolfgangRobocup.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/WolfgangRobocup.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/WolfgangRobocup.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_ankleMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_ankleMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_ankleMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_ankleMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_basler_ace_gige_c-mount_v01Mesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_basler_ace_gige_c-mount_v01Mesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_basler_ace_gige_c-mount_v01Mesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_basler_ace_gige_c-mount_v01Mesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_batteryMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_batteryMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_batteryMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_batteryMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_battery_cageMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_battery_cageMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_battery_cageMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_battery_cageMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_battery_clipMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_battery_clipMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_battery_clipMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_battery_clipMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_lower_basler_wolfgang_imu_v2_2Mesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_lower_basler_wolfgang_imu_v2_2Mesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_lower_basler_wolfgang_imu_v2_2Mesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_lower_basler_wolfgang_imu_v2_2Mesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_side_basler_wolfgang_v2_2_leftMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_side_basler_wolfgang_v2_2_leftMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_side_basler_wolfgang_v2_2_leftMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_side_basler_wolfgang_v2_2_leftMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_side_basler_wolfgang_v2_2_rightMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_side_basler_wolfgang_v2_2_rightMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_side_basler_wolfgang_v2_2_rightMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_camera_side_basler_wolfgang_v2_2_rightMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_connector_shoulderMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_connector_shoulderMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_connector_shoulderMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_connector_shoulderMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_coreMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_coreMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_coreMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_coreMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_dummy_speakerMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_dummy_speakerMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_dummy_speakerMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_dummy_speakerMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_flex_stollenMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_flex_stollenMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_flex_stollenMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_flex_stollenMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_coverMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_coverMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_coverMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_coverMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_printed_leftMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_printed_leftMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_printed_leftMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_printed_leftMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_printed_rightMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_printed_rightMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_printed_rightMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_foot_printed_rightMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_handMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_handMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_handMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_handMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_hip_u_connectorMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_hip_u_connectorMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_hip_u_connectorMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_hip_u_connectorMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_imu_holderMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_imu_holderMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_imu_holderMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_imu_holderMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_knee_connectorMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_knee_connectorMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_knee_connectorMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_knee_connectorMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_knee_spacerMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_knee_spacerMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_knee_spacerMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_knee_spacerMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lenseMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lenseMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lenseMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lenseMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_load_cellMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_load_cellMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_load_cellMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_load_cellMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_armMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_armMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_armMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_armMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_legMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_legMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_legMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_legMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_leg_spacerMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_leg_spacerMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_leg_spacerMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_lower_leg_spacerMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_motor_connectorMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_motor_connectorMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_motor_connectorMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_motor_connectorMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_mx-106_bodyMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_mx-106_bodyMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_mx-106_bodyMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_mx-106_bodyMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_mx-64-bodyMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_mx-64-bodyMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_mx-64-bodyMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_mx-64-bodyMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_left_backMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_left_backMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_left_backMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_left_backMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_left_frontMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_left_frontMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_left_frontMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_left_frontMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_right_backMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_right_backMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_right_backMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_right_backMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_right_frontMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_right_frontMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_right_frontMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_holder_right_frontMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_mainMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_mainMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_mainMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_nuc_mainMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_sea_connectorMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_sea_connectorMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_sea_connectorMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_sea_connectorMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_sea_ninjaflexMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_sea_ninjaflexMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_sea_ninjaflexMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_sea_ninjaflexMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_shoulder_connectorMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_shoulder_connectorMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_shoulder_connectorMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_shoulder_connectorMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_speaker_holderMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_speaker_holderMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_speaker_holderMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_speaker_holderMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_spring_holder_lowerMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_spring_holder_lowerMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_spring_holder_lowerMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_spring_holder_lowerMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_spring_holder_upperMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_spring_holder_upperMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_spring_holder_upperMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_spring_holder_upperMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_springholder_bottomMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_springholder_bottomMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_springholder_bottomMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_springholder_bottomMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_springholder_newMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_springholder_newMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_springholder_newMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_springholder_newMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_thrustbearingholderMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_thrustbearingholderMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_thrustbearingholderMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_thrustbearingholderMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bottomMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bottomMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bottomMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bottomMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bumper_leftMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bumper_leftMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bumper_leftMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bumper_leftMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bumper_rightMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bumper_rightMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bumper_rightMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_bumper_rightMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_topMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_topMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_topMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_torso_topMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_armMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_armMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_armMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_armMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_arm_spacerMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_arm_spacerMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_arm_spacerMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_arm_spacerMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_legMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_legMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_legMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_legMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_leg_spacerMesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_leg_spacerMesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_leg_spacerMesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_upper_leg_spacerMesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_xh-540Mesh.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_xh-540Mesh.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_xh-540Mesh.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/Wolfgang_xh-540Mesh.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/ankle.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/ankle.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/ankle.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/ankle.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/baseplate_odroid_xu4_core.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/baseplate_odroid_xu4_core.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/baseplate_odroid_xu4_core.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/baseplate_odroid_xu4_core.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/basler_ace_gige_c-mount_v01.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/basler_ace_gige_c-mount_v01.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/basler_ace_gige_c-mount_v01.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/basler_ace_gige_c-mount_v01.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery_cage.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery_cage.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery_cage.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery_cage.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery_clip.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery_clip.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery_clip.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/battery_clip.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_lower_basler_wolfgang_imu_v2.2.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_lower_basler_wolfgang_imu_v2.2.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_lower_basler_wolfgang_imu_v2.2.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_lower_basler_wolfgang_imu_v2.2.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_left.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_left.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_left.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_left.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_right.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_right.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_right.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/camera_side_basler_wolfgang_v2.2_right.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/connector_shoulder.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/connector_shoulder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/connector_shoulder.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/connector_shoulder.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/core.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/core.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/core.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/core.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/dummy_speaker.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/dummy_speaker.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/dummy_speaker.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/dummy_speaker.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/flex_stollen.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/flex_stollen.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/flex_stollen.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/flex_stollen.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_cover.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_cover.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_cover.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_cover.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_printed_left.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_printed_left.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_printed_left.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_printed_left.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_printed_right.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_printed_right.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_printed_right.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/foot_printed_right.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/hand.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/hand.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/hand.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/hand.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/hip_u_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/hip_u_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/hip_u_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/hip_u_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/imu_holder.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/imu_holder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/imu_holder.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/imu_holder.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/knee_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/knee_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/knee_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/knee_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/knee_spacer.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/knee_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/knee_spacer.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/knee_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lense.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lense.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lense.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lense.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/load_cell.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/load_cell.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/load_cell.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/load_cell.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_arm.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_arm.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_arm.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_arm.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_leg.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_leg.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_leg.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_leg.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_leg_spacer.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_leg_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_leg_spacer.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/lower_leg_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/motor_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/motor_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/motor_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/motor_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/mx-106_body.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/mx-106_body.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/mx-106_body.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/mx-106_body.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/mx-64-body.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/mx-64-body.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/mx-64-body.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/mx-64-body.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_left_back.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_left_back.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_left_back.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_left_back.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_left_front.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_left_front.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_left_front.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_left_front.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_right_back.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_right_back.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_right_back.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_right_back.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_right_front.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_right_front.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_right_front.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_holder_right_front.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_main.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_main.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_main.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/nuc_main.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/sea_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/sea_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/sea_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/sea_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/sea_ninjaflex.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/sea_ninjaflex.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/sea_ninjaflex.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/sea_ninjaflex.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/shoulder_connector.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/shoulder_connector.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/shoulder_connector.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/shoulder_connector.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/speaker_holder.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/speaker_holder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/speaker_holder.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/speaker_holder.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/spring_holder_lower.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/spring_holder_lower.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/spring_holder_lower.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/spring_holder_lower.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/spring_holder_upper.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/spring_holder_upper.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/spring_holder_upper.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/spring_holder_upper.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/springholder_bottom.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/springholder_bottom.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/springholder_bottom.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/springholder_bottom.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/springholder_new.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/springholder_new.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/springholder_new.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/springholder_new.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/thrustbearingholder.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/thrustbearingholder.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/thrustbearingholder.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/thrustbearingholder.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bottom.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bottom.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bottom.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bottom.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bumper_left.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bumper_left.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bumper_left.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bumper_left.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bumper_right.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bumper_right.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bumper_right.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_bumper_right.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_top.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_top.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_top.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/torso_top.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_arm.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_arm.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_arm.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_arm.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_arm_spacer.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_arm_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_arm_spacer.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_arm_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_leg.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_leg.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_leg.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_leg.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_leg_spacer.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_leg_spacer.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_leg_spacer.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/upper_leg_spacer.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/xh-540.stl b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/xh-540.stl
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/xh-540.stl
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_meshes/xh-540.stl
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangCarbonFiberAppearance.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangCarbonFiberAppearance.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangCarbonFiberAppearance.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangCarbonFiberAppearance.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMarker.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMarker.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMarker.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMarker.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMetal.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMetal.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMetal.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMetal.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMotor.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMotor.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMotor.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangMotor.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangNUC.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangNUC.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangNUC.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangNUC.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangPaintedMetal.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangPaintedMetal.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangPaintedMetal.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangPaintedMetal.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangPlastic.proto b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangPlastic.proto
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangPlastic.proto
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/WolfgangPlastic.proto
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/carbon_fiber.jpg b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/carbon_fiber.jpg
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/carbon_fiber.jpg
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/carbon_fiber.jpg
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_0.png b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_0.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_0.png
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_0.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_1.png b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_1.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_1.png
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_1.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_2.png b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_2.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_2.png
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_2.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_3.png b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_3.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_3.png
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_3.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_4.png b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_4.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_4.png
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_4.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_5.png b/bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_5.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_5.png
rename to bitbots_simulation/bitbots_webots_sim/protos/robots/Wolfgang/Wolfgang_textures/number_5.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/protos/textures/net.png b/bitbots_simulation/bitbots_webots_sim/protos/textures/net.png
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/protos/textures/net.png
rename to bitbots_simulation/bitbots_webots_sim/protos/textures/net.png
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/scripts/fix_urdf_for_webots.py b/bitbots_simulation/bitbots_webots_sim/scripts/fix_urdf_for_webots.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/scripts/fix_urdf_for_webots.py
rename to bitbots_simulation/bitbots_webots_sim/scripts/fix_urdf_for_webots.py
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/scripts/imu_lut_gen.py b/bitbots_simulation/bitbots_webots_sim/scripts/imu_lut_gen.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/scripts/imu_lut_gen.py
rename to bitbots_simulation/bitbots_webots_sim/scripts/imu_lut_gen.py
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/scripts/localization_faker.py b/bitbots_simulation/bitbots_webots_sim/scripts/localization_faker.py
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/scripts/localization_faker.py
rename to bitbots_simulation/bitbots_webots_sim/scripts/localization_faker.py
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/scripts/start_simulator.py b/bitbots_simulation/bitbots_webots_sim/scripts/start_simulator.py
similarity index 97%
rename from bitbots_wolfgang/wolfgang_webots_sim/scripts/start_simulator.py
rename to bitbots_simulation/bitbots_webots_sim/scripts/start_simulator.py
index 57d696dd6..f03caeec8 100755
--- a/bitbots_wolfgang/wolfgang_webots_sim/scripts/start_simulator.py
+++ b/bitbots_simulation/bitbots_webots_sim/scripts/start_simulator.py
@@ -12,7 +12,7 @@
 class WebotsSim(Node):
     def __init__(self, nogui, multi_robot, headless, sim_port, robot_type):
         super().__init__("webots_sim")
-        pkg_path = get_package_share_directory("wolfgang_webots_sim")
+        pkg_path = get_package_share_directory("bitbots_webots_sim")
 
         # construct arguments with which webots is started depending on this scripts args
         extra_args = set()
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/scripts/start_single.py b/bitbots_simulation/bitbots_webots_sim/scripts/start_single.py
similarity index 96%
rename from bitbots_wolfgang/wolfgang_webots_sim/scripts/start_single.py
rename to bitbots_simulation/bitbots_webots_sim/scripts/start_single.py
index 688388b41..9047ab0fc 100755
--- a/bitbots_wolfgang/wolfgang_webots_sim/scripts/start_single.py
+++ b/bitbots_simulation/bitbots_webots_sim/scripts/start_single.py
@@ -4,9 +4,9 @@
 import threading
 
 import rclpy
+from bitbots_webots_sim.webots_robot_controller import RobotController
 from controller import Robot
 from rclpy.node import Node
-from wolfgang_webots_sim.webots_robot_controller import RobotController
 
 
 class RobotNode:
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/scripts/start_webots_ros_supervisor.py b/bitbots_simulation/bitbots_webots_sim/scripts/start_webots_ros_supervisor.py
similarity index 92%
rename from bitbots_wolfgang/wolfgang_webots_sim/scripts/start_webots_ros_supervisor.py
rename to bitbots_simulation/bitbots_webots_sim/scripts/start_webots_ros_supervisor.py
index 30eb80bae..ac213c113 100755
--- a/bitbots_wolfgang/wolfgang_webots_sim/scripts/start_webots_ros_supervisor.py
+++ b/bitbots_simulation/bitbots_webots_sim/scripts/start_webots_ros_supervisor.py
@@ -4,8 +4,8 @@
 import threading
 
 import rclpy
+from bitbots_webots_sim.webots_supervisor_controller import SupervisorController
 from rclpy.node import Node
-from wolfgang_webots_sim.webots_supervisor_controller import SupervisorController
 
 
 class SupervisorNode:
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/setup.py b/bitbots_simulation/bitbots_webots_sim/setup.py
similarity index 84%
rename from bitbots_wolfgang/wolfgang_webots_sim/setup.py
rename to bitbots_simulation/bitbots_webots_sim/setup.py
index 2df2fb1d9..2a0353425 100644
--- a/bitbots_wolfgang/wolfgang_webots_sim/setup.py
+++ b/bitbots_simulation/bitbots_webots_sim/setup.py
@@ -3,7 +3,7 @@
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(
-    packages=["wolfgang_webots_sim"],
+    packages=["bitbots_webots_sim"],
     # scripts=['bin/myscript'],
     package_dir={"": "src"},
 )
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/worlds/1_bot.wbt b/bitbots_simulation/bitbots_webots_sim/worlds/1_bot.wbt
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/worlds/1_bot.wbt
rename to bitbots_simulation/bitbots_webots_sim/worlds/1_bot.wbt
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/worlds/4_bots.wbt b/bitbots_simulation/bitbots_webots_sim/worlds/4_bots.wbt
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/worlds/4_bots.wbt
rename to bitbots_simulation/bitbots_webots_sim/worlds/4_bots.wbt
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/worlds/deep_quintic_wolfgang.wbt b/bitbots_simulation/bitbots_webots_sim/worlds/deep_quintic_wolfgang.wbt
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/worlds/deep_quintic_wolfgang.wbt
rename to bitbots_simulation/bitbots_webots_sim/worlds/deep_quintic_wolfgang.wbt
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/worlds/deep_quintic_wolfgang_fast.wbt b/bitbots_simulation/bitbots_webots_sim/worlds/deep_quintic_wolfgang_fast.wbt
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/worlds/deep_quintic_wolfgang_fast.wbt
rename to bitbots_simulation/bitbots_webots_sim/worlds/deep_quintic_wolfgang_fast.wbt
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/worlds/optimization_wolfgang.wbt b/bitbots_simulation/bitbots_webots_sim/worlds/optimization_wolfgang.wbt
similarity index 100%
rename from bitbots_wolfgang/wolfgang_webots_sim/worlds/optimization_wolfgang.wbt
rename to bitbots_simulation/bitbots_webots_sim/worlds/optimization_wolfgang.wbt
diff --git a/bitbots_wolfgang/wolfgang_pybullet_sim/launch/simulation.launch b/bitbots_wolfgang/wolfgang_pybullet_sim/launch/simulation.launch
deleted file mode 100644
index 73b09c4b3..000000000
--- a/bitbots_wolfgang/wolfgang_pybullet_sim/launch/simulation.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<launch>
-    <arg name="gui" default="true"/>
-
-    <group if="$(var gui)">
-        <node pkg="wolfgang_pybullet_sim" exec="simulation_with_gui.py" name="pybullet_sim" output="screen">
-            <param from="$(find-pkg-share wolfgang_pybullet_sim)/config/config.yaml"/>
-        </node>
-    </group>
-    <group unless="$(var gui)">
-        <node pkg="wolfgang_pybullet_sim" exec="simulation_headless.py" name="pybullet_sim" output="screen">
-            <param from="$(find-pkg-share wolfgang_pybullet_sim)/config/config.yaml"/>
-        </node>
-    </group>
-    <include file="$(find-pkg-share wolfgang_webots_sim)/launch/imu_filter_sim.launch">
-        <arg name="sim" value="true"/>
-    </include>
-</launch>
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/config/bitbots_walk.json b/bitbots_wolfgang/wolfgang_robocup_api/config/bitbots_walk.json
deleted file mode 100644
index 6a25ee9db..000000000
--- a/bitbots_wolfgang/wolfgang_robocup_api/config/bitbots_walk.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "Bit-Bots",
-  "players": {
-    "1": {
-      "proto": "Wolfgang",
-      "dockerTag": "latest",
-      "dockerCmd": "roslaunch wolfgang_robocup_api robocup_walk.launch",
-      "halfTimeStartingPose": {
-        "translation": [-3.6, -3.20, 0.43],
-        "rotation": [0.13, -0.13, -0.98, -1.57]
-      },
-      "reentryStartingPose": {
-        "translation": [-3.6, -3.20, 0.43],
-        "rotation": [0.0, -0.0, -1.0, -1.57]
-      },
-      "shootoutStartingPose": {
-        "translation": [2.6, 0, 0.43],
-        "rotation": [0, 0.98, 0.13, 0.26]
-      },
-      "goalKeeperStartingPose": {
-        "translation": [-4.47, 0, 0.43],
-        "rotation": [-0.13, 0, 0.98, 3.14]
-      }
-    }
-  }
-}
diff --git a/bitbots_wolfgang/wolfgang_robocup_api/setup.cfg b/bitbots_wolfgang/wolfgang_robocup_api/setup.cfg
deleted file mode 100644
index fe694faa0..000000000
--- a/bitbots_wolfgang/wolfgang_robocup_api/setup.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[develop]
-script_dir=$base/lib/wolfgang_robocup_api
-[install]
-install_scripts=$base/lib/wolfgang_robocup_api
diff --git a/bitbots_wolfgang/wolfgang_webots_sim/launch/single_robot_controller.launch b/bitbots_wolfgang/wolfgang_webots_sim/launch/single_robot_controller.launch
deleted file mode 100644
index 89d00ef19..000000000
--- a/bitbots_wolfgang/wolfgang_webots_sim/launch/single_robot_controller.launch
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<launch>
-  <arg name="robot_name" default="amy" description="The name of the robot" />
-  <arg name="tf_prefix" default="" description="Prefix applied to the published frames in the headers"/>
-  <arg name="camera" default="false" description="Turn on or off the camera (to speed up if only motion is required)"/>
-  <arg name="recognition" default="false" description="Turn on or off automatic recognition for collection of training data"/>
-  <arg name="void_controller" default="false" description="If set to true, the robot is not controllable"/>
-  <arg name="robot_type" default="wolfgang" description="What type of robot should be used"/>
-  <arg name="sim_port" default="1234" description="Port used for the simulator communication. Relevant if multiple simulations are run at the same time"/>
-
-  <arg name="void_flag" default="$(eval '\'--void-controller\' if \'$(var void_controller)\'==\'true\' else \'\'')"
-       description="do not set, used internally"/>
-  <arg name="recognition_flag" default="$(eval '\'--recognize\' if \'$(var recognition)\'==\'true\' else \'\'')"
-       description="do not set, used internally"/>
-  <arg name="camera_disable_flag" default="$(eval '\'--disable-camera\' if not \'$(var camera)\'==\'true\' else \'\'')"
-       description="do not set, used internally"/>
-
-  <node pkg="wolfgang_webots_sim" exec="start_single.py" name="webots_ros_interface" respawn="true" output="screen"
-        args="--robot_name $(var robot_name) $(var void_flag) $(var recognition_flag) $(var camera_disable_flag) --robot-type $(var robot_type) --sim-port $(var sim_port)">
-    <param name="base_link_frame" value="$(var tf_prefix)base_link"/>
-    <param name="r_sole_frame" value="$(var tf_prefix)r_sole"/>
-    <param name="l_sole_frame" value="$(var tf_prefix)l_sole"/>
-    <param name="camera_optical_frame" value="$(var tf_prefix)camera_optical_frame"/>
-    <param name="head_imu_frame" value="$(var tf_prefix)imu_frame_2"/>
-    <param name="imu_frame" value="$(var tf_prefix)imu_frame"/>
-  </node>
-</launch>
\ No newline at end of file
diff --git a/sync_includes_wolfgang_nuc.yaml b/sync_includes_wolfgang_nuc.yaml
index cd9d26c73..d3b11f678 100644
--- a/sync_includes_wolfgang_nuc.yaml
+++ b/sync_includes_wolfgang_nuc.yaml
@@ -40,7 +40,7 @@ include:
         - bitbots_team_communication
         - bitbots_team_data_sim_rqt
     - bitbots_vision
-    - bitbots_wolfgang:
+    - bitbots_robot:
         - wolfgang_animations
         - wolfgang_description
         - wolfgang_moveit_config