diff --git a/src/core_gazebo/CMakeLists.txt b/src/astra_description/core_gazebo/CMakeLists.txt
similarity index 100%
rename from src/core_gazebo/CMakeLists.txt
rename to src/astra_description/core_gazebo/CMakeLists.txt
diff --git a/src/core_gazebo/config/ros_gz_bridge.yaml b/src/astra_description/core_gazebo/config/ros_gz_bridge.yaml
similarity index 100%
rename from src/core_gazebo/config/ros_gz_bridge.yaml
rename to src/astra_description/core_gazebo/config/ros_gz_bridge.yaml
diff --git a/src/core_gazebo/launch/core.gazebo.launch.py b/src/astra_description/core_gazebo/launch/core.gazebo.launch.py
similarity index 100%
rename from src/core_gazebo/launch/core.gazebo.launch.py
rename to src/astra_description/core_gazebo/launch/core.gazebo.launch.py
diff --git a/src/core_gazebo/package.xml b/src/astra_description/core_gazebo/package.xml
similarity index 100%
rename from src/core_gazebo/package.xml
rename to src/astra_description/core_gazebo/package.xml
diff --git a/src/core_gazebo/worlds/empty.world b/src/astra_description/core_gazebo/worlds/empty.world
similarity index 100%
rename from src/core_gazebo/worlds/empty.world
rename to src/astra_description/core_gazebo/worlds/empty.world
diff --git a/src/core_gazebo/worlds/pick_and_place_demo.world b/src/astra_description/core_gazebo/worlds/pick_and_place_demo.world
similarity index 100%
rename from src/core_gazebo/worlds/pick_and_place_demo.world
rename to src/astra_description/core_gazebo/worlds/pick_and_place_demo.world
diff --git a/src/core_rover_description/config/joint_names_core_rover_description.yaml b/src/astra_description/core_rover_description/config/joint_names_core_rover_description.yaml
similarity index 100%
rename from src/core_rover_description/config/joint_names_core_rover_description.yaml
rename to src/astra_description/core_rover_description/config/joint_names_core_rover_description.yaml
diff --git a/src/core_rover_description/config/ros2_controllers.yaml b/src/astra_description/core_rover_description/config/ros2_controllers.yaml
similarity index 100%
rename from src/core_rover_description/config/ros2_controllers.yaml
rename to src/astra_description/core_rover_description/config/ros2_controllers.yaml
diff --git a/src/core_rover_description/config/rviz_basic_settings.rviz b/src/astra_description/core_rover_description/config/rviz_basic_settings.rviz
similarity index 100%
rename from src/core_rover_description/config/rviz_basic_settings.rviz
rename to src/astra_description/core_rover_description/config/rviz_basic_settings.rviz
diff --git a/src/core_rover_description/export.log b/src/astra_description/core_rover_description/export.log
similarity index 100%
rename from src/core_rover_description/export.log
rename to src/astra_description/core_rover_description/export.log
diff --git a/src/core_rover_description/launch/display.launch.py b/src/astra_description/core_rover_description/launch/display.launch.py
similarity index 100%
rename from src/core_rover_description/launch/display.launch.py
rename to src/astra_description/core_rover_description/launch/display.launch.py
diff --git a/src/core_rover_description/launch/robot_state_publisher.launch.py b/src/astra_description/core_rover_description/launch/robot_state_publisher.launch.py
similarity index 100%
rename from src/core_rover_description/launch/robot_state_publisher.launch.py
rename to src/astra_description/core_rover_description/launch/robot_state_publisher.launch.py
diff --git a/src/core_rover_description/meshes/averaging_bar.STL b/src/astra_description/core_rover_description/meshes/averaging_bar.STL
similarity index 100%
rename from src/core_rover_description/meshes/averaging_bar.STL
rename to src/astra_description/core_rover_description/meshes/averaging_bar.STL
diff --git a/src/core_rover_description/meshes/base_link.STL b/src/astra_description/core_rover_description/meshes/base_link.STL
similarity index 100%
rename from src/core_rover_description/meshes/base_link.STL
rename to src/astra_description/core_rover_description/meshes/base_link.STL
diff --git a/src/core_rover_description/meshes/bl_wheel.STL b/src/astra_description/core_rover_description/meshes/bl_wheel.STL
similarity index 100%
rename from src/core_rover_description/meshes/bl_wheel.STL
rename to src/astra_description/core_rover_description/meshes/bl_wheel.STL
diff --git a/src/core_rover_description/meshes/br_wheel.STL b/src/astra_description/core_rover_description/meshes/br_wheel.STL
similarity index 100%
rename from src/core_rover_description/meshes/br_wheel.STL
rename to src/astra_description/core_rover_description/meshes/br_wheel.STL
diff --git a/src/core_rover_description/meshes/fl_wheel.STL b/src/astra_description/core_rover_description/meshes/fl_wheel.STL
similarity index 100%
rename from src/core_rover_description/meshes/fl_wheel.STL
rename to src/astra_description/core_rover_description/meshes/fl_wheel.STL
diff --git a/src/core_rover_description/meshes/fr_wheel.STL b/src/astra_description/core_rover_description/meshes/fr_wheel.STL
similarity index 100%
rename from src/core_rover_description/meshes/fr_wheel.STL
rename to src/astra_description/core_rover_description/meshes/fr_wheel.STL
diff --git a/src/core_rover_description/meshes/left_suspension_member.STL b/src/astra_description/core_rover_description/meshes/left_suspension_member.STL
similarity index 100%
rename from src/core_rover_description/meshes/left_suspension_member.STL
rename to src/astra_description/core_rover_description/meshes/left_suspension_member.STL
diff --git a/src/core_rover_description/meshes/right_suspension_member.STL b/src/astra_description/core_rover_description/meshes/right_suspension_member.STL
similarity index 100%
rename from src/core_rover_description/meshes/right_suspension_member.STL
rename to src/astra_description/core_rover_description/meshes/right_suspension_member.STL
diff --git a/src/core_rover_description/package.xml b/src/astra_description/core_rover_description/package.xml
similarity index 100%
rename from src/core_rover_description/package.xml
rename to src/astra_description/core_rover_description/package.xml
diff --git a/src/core_rover_description/resource/core_rover_description b/src/astra_description/core_rover_description/resource/core_rover_description
similarity index 100%
rename from src/core_rover_description/resource/core_rover_description
rename to src/astra_description/core_rover_description/resource/core_rover_description
diff --git a/src/core_rover_description/setup.cfg b/src/astra_description/core_rover_description/setup.cfg
similarity index 100%
rename from src/core_rover_description/setup.cfg
rename to src/astra_description/core_rover_description/setup.cfg
diff --git a/src/core_rover_description/setup.py b/src/astra_description/core_rover_description/setup.py
similarity index 100%
rename from src/core_rover_description/setup.py
rename to src/astra_description/core_rover_description/setup.py
diff --git a/src/core_rover_description/urdf/core_rover.urdf b/src/astra_description/core_rover_description/urdf/core_rover.urdf
similarity index 100%
rename from src/core_rover_description/urdf/core_rover.urdf
rename to src/astra_description/core_rover_description/urdf/core_rover.urdf
diff --git a/src/core_rover_description/urdf/core_rover_description.csv b/src/astra_description/core_rover_description/urdf/core_rover_description.csv
similarity index 100%
rename from src/core_rover_description/urdf/core_rover_description.csv
rename to src/astra_description/core_rover_description/urdf/core_rover_description.csv
diff --git a/src/core_rover_description/urdf/core_rover_description.xacro b/src/astra_description/core_rover_description/urdf/core_rover_description.xacro
similarity index 100%
rename from src/core_rover_description/urdf/core_rover_description.xacro
rename to src/astra_description/core_rover_description/urdf/core_rover_description.xacro
diff --git a/src/core_rover_description/urdf/ros2_control.xacro b/src/astra_description/core_rover_description/urdf/ros2_control.xacro
similarity index 100%
rename from src/core_rover_description/urdf/ros2_control.xacro
rename to src/astra_description/core_rover_description/urdf/ros2_control.xacro