diff --git a/packages/bookworm/ros-noetic-actionlib-dbgsym_1.14.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-actionlib-dbgsym_1.14.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-actionlib-dbgsym_1.14.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-actionlib-dbgsym_1.14.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-actionlib-msgs_1.13.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-actionlib-msgs_1.13.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-actionlib-msgs_1.13.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-actionlib-msgs_1.13.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-actionlib_1.14.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-actionlib_1.14.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-actionlib_1.14.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-actionlib_1.14.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-angles_1.9.13-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-angles_1.9.13-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-angles_1.9.13-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-angles_1.9.13-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-async-web-server-cpp-dbgsym_1.0.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-async-web-server-cpp-dbgsym_1.0.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-async-web-server-cpp-dbgsym_1.0.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-async-web-server-cpp-dbgsym_1.0.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-async-web-server-cpp_1.0.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-async-web-server-cpp_1.0.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-async-web-server-cpp_1.0.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-async-web-server-cpp_1.0.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-bond_1.8.6-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-bond_1.8.6-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-bond_1.8.6-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-bond_1.8.6-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-bondcpp-dbgsym_1.8.6-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-bondcpp-dbgsym_1.8.6-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-bondcpp-dbgsym_1.8.6-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-bondcpp-dbgsym_1.8.6-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-bondcpp_1.8.6-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-bondcpp_1.8.6-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-bondcpp_1.8.6-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-bondcpp_1.8.6-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-bondpy_1.8.6-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-bondpy_1.8.6-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-bondpy_1.8.6-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-bondpy_1.8.6-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-camera-calibration-parsers-dbgsym_1.12.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-camera-calibration-parsers-dbgsym_1.12.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-camera-calibration-parsers-dbgsym_1.12.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-camera-calibration-parsers-dbgsym_1.12.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-camera-calibration-parsers_1.12.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-camera-calibration-parsers_1.12.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-camera-calibration-parsers_1.12.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-camera-calibration-parsers_1.12.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-camera-info-manager-dbgsym_1.12.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-camera-info-manager-dbgsym_1.12.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-camera-info-manager-dbgsym_1.12.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-camera-info-manager-dbgsym_1.12.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-camera-info-manager_1.12.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-camera-info-manager_1.12.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-camera-info-manager_1.12.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-camera-info-manager_1.12.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-catkin_0.8.10-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-catkin_0.8.10-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-catkin_0.8.10-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-catkin_0.8.10-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-class-loader-dbgsym_0.5.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-class-loader-dbgsym_0.5.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-class-loader-dbgsym_0.5.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-class-loader-dbgsym_0.5.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-class-loader_0.5.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-class-loader_0.5.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-class-loader_0.5.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-class-loader_0.5.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-cmake-modules_0.5.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-cmake-modules_0.5.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-cmake-modules_0.5.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-cmake-modules_0.5.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-cpp-common-dbgsym_0.7.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-cpp-common-dbgsym_0.7.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-cpp-common-dbgsym_0.7.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-cpp-common-dbgsym_0.7.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-cpp-common_0.7.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-cpp-common_0.7.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-cpp-common_0.7.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-cpp-common_0.7.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-cv-bridge-dbgsym_1.16.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-cv-bridge-dbgsym_1.16.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-cv-bridge-dbgsym_1.16.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-cv-bridge-dbgsym_1.16.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-cv-bridge_1.16.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-cv-bridge_1.16.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-cv-bridge_1.16.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-cv-bridge_1.16.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-cv-camera-dbgsym_0.6.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-cv-camera-dbgsym_0.6.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-cv-camera-dbgsym_0.6.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-cv-camera-dbgsym_0.6.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-cv-camera-dbgsym_0.6.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-cv-camera-dbgsym_0.6.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-cv-camera-dbgsym_0.6.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-cv-camera-dbgsym_0.6.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-cv-camera_0.6.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-cv-camera_0.6.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-cv-camera_0.6.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-cv-camera_0.6.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-cv-camera_0.6.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-cv-camera_0.6.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-cv-camera_0.6.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-cv-camera_0.6.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-diagnostic-msgs_1.13.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-diagnostic-msgs_1.13.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-diagnostic-msgs_1.13.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-diagnostic-msgs_1.13.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-diagnostic-updater-dbgsym_1.11.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-diagnostic-updater-dbgsym_1.11.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-diagnostic-updater-dbgsym_1.11.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-diagnostic-updater-dbgsym_1.11.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-diagnostic-updater_1.11.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-diagnostic-updater_1.11.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-diagnostic-updater_1.11.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-diagnostic-updater_1.11.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-dynamic-reconfigure-dbgsym_1.7.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-dynamic-reconfigure-dbgsym_1.7.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-dynamic-reconfigure-dbgsym_1.7.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-dynamic-reconfigure-dbgsym_1.7.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-dynamic-reconfigure_1.7.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-dynamic-reconfigure_1.7.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-dynamic-reconfigure_1.7.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-dynamic-reconfigure_1.7.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-eigen-conversions-dbgsym_1.13.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-eigen-conversions-dbgsym_1.13.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-eigen-conversions-dbgsym_1.13.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-eigen-conversions-dbgsym_1.13.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-eigen-conversions_1.13.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-eigen-conversions_1.13.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-eigen-conversions_1.13.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-eigen-conversions_1.13.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-gencpp_0.7.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-gencpp_0.7.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-gencpp_0.7.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-gencpp_0.7.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-geneus_3.0.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-geneus_3.0.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-geneus_3.0.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-geneus_3.0.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-genlisp_0.4.18-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-genlisp_0.4.18-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-genlisp_0.4.18-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-genlisp_0.4.18-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-genmsg_0.6.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-genmsg_0.6.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-genmsg_0.6.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-genmsg_0.6.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-gennodejs_2.0.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-gennodejs_2.0.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-gennodejs_2.0.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-gennodejs_2.0.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-genpy_0.6.15-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-genpy_0.6.15-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-genpy_0.6.15-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-genpy_0.6.15-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-geographic-msgs_0.5.6-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-geographic-msgs_0.5.6-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-geographic-msgs_0.5.6-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-geographic-msgs_0.5.6-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-geometry-msgs_1.13.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-geometry-msgs_1.13.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-geometry-msgs_1.13.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-geometry-msgs_1.13.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-image-geometry-dbgsym_1.16.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-image-geometry-dbgsym_1.16.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-image-geometry-dbgsym_1.16.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-image-geometry-dbgsym_1.16.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-image-geometry_1.16.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-image-geometry_1.16.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-image-geometry_1.16.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-image-geometry_1.16.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-image-proc-dbgsym_1.17.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-image-proc-dbgsym_1.17.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-image-proc-dbgsym_1.17.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-image-proc-dbgsym_1.17.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-image-proc_1.17.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-image-proc_1.17.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-image-proc_1.17.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-image-proc_1.17.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-image-publisher-dbgsym_1.17.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-image-publisher-dbgsym_1.17.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-image-publisher-dbgsym_1.17.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-image-publisher-dbgsym_1.17.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-image-publisher_1.17.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-image-publisher_1.17.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-image-publisher_1.17.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-image-publisher_1.17.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-image-transport-dbgsym_1.12.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-image-transport-dbgsym_1.12.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-image-transport-dbgsym_1.12.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-image-transport-dbgsym_1.12.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-image-transport_1.12.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-image-transport_1.12.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-image-transport_1.12.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-image-transport_1.12.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-libmavconn-dbgsym_1.18.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-libmavconn-dbgsym_1.18.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-libmavconn-dbgsym_1.18.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-libmavconn-dbgsym_1.18.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-libmavconn_1.18.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-libmavconn_1.18.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-libmavconn_1.18.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-libmavconn_1.18.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-mavlink_2024.3.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-mavlink_2024.3.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-mavlink_2024.3.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-mavlink_2024.3.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-mavros-dbgsym_1.18.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-mavros-dbgsym_1.18.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-mavros-dbgsym_1.18.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-mavros-dbgsym_1.18.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-mavros-extras-dbgsym_1.18.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-mavros-extras-dbgsym_1.18.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-mavros-extras-dbgsym_1.18.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-mavros-extras-dbgsym_1.18.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-mavros-extras_1.18.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-mavros-extras_1.18.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-mavros-extras_1.18.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-mavros-extras_1.18.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-mavros-msgs_1.18.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-mavros-msgs_1.18.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-mavros-msgs_1.18.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-mavros-msgs_1.18.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-mavros_1.18.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-mavros_1.18.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-mavros_1.18.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-mavros_1.18.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-message-filters-dbgsym_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-message-filters-dbgsym_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-message-filters-dbgsym_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-message-filters-dbgsym_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-message-filters_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-message-filters_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-message-filters_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-message-filters_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-message-generation_0.4.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-message-generation_0.4.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-message-generation_0.4.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-message-generation_0.4.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-message-runtime_0.4.13-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-message-runtime_0.4.13-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-message-runtime_0.4.13-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-message-runtime_0.4.13-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-mk_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-mk_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-mk_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-mk_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-nav-msgs_1.13.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-nav-msgs_1.13.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-nav-msgs_1.13.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-nav-msgs_1.13.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-nodelet-dbgsym_1.11.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-nodelet-dbgsym_1.11.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-nodelet-dbgsym_1.11.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-nodelet-dbgsym_1.11.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-nodelet-topic-tools_1.11.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-nodelet-topic-tools_1.11.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-nodelet-topic-tools_1.11.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-nodelet-topic-tools_1.11.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-nodelet_1.11.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-nodelet_1.11.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-nodelet_1.11.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-nodelet_1.11.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-pluginlib_1.13.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-pluginlib_1.13.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-pluginlib_1.13.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-pluginlib_1.13.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-ros-environment_1.3.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-ros-environment_1.3.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-ros-environment_1.3.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-ros-environment_1.3.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-ros-pytest_0.2.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-ros-pytest_0.2.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-ros-pytest_0.2.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-ros-pytest_0.2.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosapi_0.11.17-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosapi_0.11.17-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosapi_0.11.17-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosapi_0.11.17-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosauth-dbgsym_1.0.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosauth-dbgsym_1.0.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosauth-dbgsym_1.0.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosauth-dbgsym_1.0.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosauth_1.0.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosauth_1.0.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosauth_1.0.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosauth_1.0.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbag-dbgsym_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbag-dbgsym_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbag-dbgsym_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbag-dbgsym_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbag-migration-rule_1.0.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbag-migration-rule_1.0.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbag-migration-rule_1.0.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbag-migration-rule_1.0.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbag-storage-dbgsym_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbag-storage-dbgsym_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbag-storage-dbgsym_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbag-storage-dbgsym_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbag-storage_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbag-storage_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbag-storage_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbag-storage_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbag_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbag_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbag_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbag_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbash_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbash_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbash_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbash_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosboost-cfg_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosboost-cfg_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosboost-cfg_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosboost-cfg_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbridge-library_0.11.17-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbridge-library_0.11.17-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbridge-library_0.11.17-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbridge-library_0.11.17-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbridge-msgs_0.11.17-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbridge-msgs_0.11.17-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbridge-msgs_0.11.17-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbridge-msgs_0.11.17-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbridge-server_0.11.17-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbridge-server_0.11.17-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbridge-server_0.11.17-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbridge-server_0.11.17-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosbuild_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosbuild_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosbuild_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosbuild_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosclean_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosclean_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosclean_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosclean_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosconsole-bridge-dbgsym_0.5.4-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosconsole-bridge-dbgsym_0.5.4-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosconsole-bridge-dbgsym_0.5.4-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosconsole-bridge-dbgsym_0.5.4-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosconsole-bridge_0.5.4-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosconsole-bridge_0.5.4-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosconsole-bridge_0.5.4-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosconsole-bridge_0.5.4-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosconsole-dbgsym_1.14.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosconsole-dbgsym_1.14.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosconsole-dbgsym_1.14.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosconsole-dbgsym_1.14.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosconsole_1.14.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosconsole_1.14.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosconsole_1.14.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosconsole_1.14.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roscpp-dbgsym_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roscpp-dbgsym_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roscpp-dbgsym_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roscpp-dbgsym_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roscpp-serialization-dbgsym_0.7.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roscpp-serialization-dbgsym_0.7.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roscpp-serialization-dbgsym_0.7.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roscpp-serialization-dbgsym_0.7.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roscpp-serialization_0.7.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roscpp-serialization_0.7.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roscpp-serialization_0.7.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roscpp-serialization_0.7.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roscpp-traits_0.7.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roscpp-traits_0.7.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roscpp-traits_0.7.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roscpp-traits_0.7.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roscpp-tutorials-dbgsym_0.10.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roscpp-tutorials-dbgsym_0.10.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roscpp-tutorials-dbgsym_0.10.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roscpp-tutorials-dbgsym_0.10.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roscpp-tutorials_0.10.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roscpp-tutorials_0.10.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roscpp-tutorials_0.10.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roscpp-tutorials_0.10.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roscpp_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roscpp_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roscpp_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roscpp_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roscreate_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roscreate_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roscreate_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roscreate_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosgraph-msgs_1.11.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosgraph-msgs_1.11.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosgraph-msgs_1.11.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosgraph-msgs_1.11.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosgraph_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosgraph_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosgraph_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosgraph_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roslang_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roslang_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roslang_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roslang_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roslaunch_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roslaunch_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roslaunch_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roslaunch_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roslib-dbgsym_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roslib-dbgsym_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roslib-dbgsym_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roslib-dbgsym_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roslib_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roslib_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roslib_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roslib_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roslint_0.12.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roslint_0.12.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roslint_0.12.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roslint_0.12.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roslisp_1.9.25-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roslisp_1.9.25-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roslisp_1.9.25-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roslisp_1.9.25-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roslz4-dbgsym_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roslz4-dbgsym_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roslz4-dbgsym_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roslz4-dbgsym_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roslz4_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roslz4_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roslz4_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roslz4_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosmake_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosmake_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosmake_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosmake_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosmaster_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosmaster_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosmaster_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosmaster_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosmsg_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosmsg_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosmsg_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosmsg_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosnode_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosnode_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosnode_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosnode_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosout-dbgsym_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosout-dbgsym_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosout-dbgsym_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosout-dbgsym_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosout_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosout_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosout_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosout_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rospack-dbgsym_2.6.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rospack-dbgsym_2.6.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rospack-dbgsym_2.6.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rospack-dbgsym_2.6.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rospack_2.6.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rospack_2.6.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rospack_2.6.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rospack_2.6.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosparam_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosparam_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosparam_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosparam_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rospy-tutorials_0.10.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rospy-tutorials_0.10.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rospy-tutorials_0.10.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rospy-tutorials_0.10.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rospy_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rospy_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rospy_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rospy_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosservice_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosservice_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosservice_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosservice_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rostest_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rostest_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rostest_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rostest_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rostime-dbgsym_0.7.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rostime-dbgsym_0.7.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rostime-dbgsym_0.7.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rostime-dbgsym_0.7.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rostime_0.7.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rostime_0.7.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rostime_0.7.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rostime_0.7.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rostopic_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rostopic_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rostopic_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rostopic_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-rosunit_1.15.8-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-rosunit_1.15.8-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-rosunit_1.15.8-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-rosunit_1.15.8-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-roswtf_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-roswtf_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-roswtf_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-roswtf_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-sensor-msgs_1.13.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-sensor-msgs_1.13.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-sensor-msgs_1.13.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-sensor-msgs_1.13.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-shape-msgs_1.13.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-shape-msgs_1.13.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-shape-msgs_1.13.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-shape-msgs_1.13.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-smclib_1.8.6-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-smclib_1.8.6-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-smclib_1.8.6-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-smclib_1.8.6-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-std-msgs_0.5.13-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-std-msgs_0.5.13-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-std-msgs_0.5.13-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-std-msgs_0.5.13-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-std-srvs_1.11.3-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-std-srvs_1.11.3-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-std-srvs_1.11.3-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-std-srvs_1.11.3-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-stereo-msgs_1.13.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-stereo-msgs_1.13.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-stereo-msgs_1.13.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-stereo-msgs_1.13.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf-dbgsym_1.13.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf-dbgsym_1.13.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf-dbgsym_1.13.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf-dbgsym_1.13.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-dbgsym_0.7.7-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-dbgsym_0.7.7-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-dbgsym_0.7.7-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-dbgsym_0.7.7-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-eigen_0.7.7-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-eigen_0.7.7-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-eigen_0.7.7-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-eigen_0.7.7-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-geometry-msgs_0.7.7-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-geometry-msgs_0.7.7-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-geometry-msgs_0.7.7-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-geometry-msgs_0.7.7-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-msgs_0.7.7-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-msgs_0.7.7-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-msgs_0.7.7-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-msgs_0.7.7-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-py-dbgsym_0.7.7-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-py-dbgsym_0.7.7-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-py-dbgsym_0.7.7-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-py-dbgsym_0.7.7-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-py_0.7.7-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-py_0.7.7-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-py_0.7.7-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-py_0.7.7-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-ros-dbgsym_0.7.7-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-ros-dbgsym_0.7.7-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-ros-dbgsym_0.7.7-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-ros-dbgsym_0.7.7-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-ros_0.7.7-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-ros_0.7.7-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-ros_0.7.7-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-ros_0.7.7-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-web-republisher-dbgsym_0.3.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-web-republisher-dbgsym_0.3.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-web-republisher-dbgsym_0.3.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-web-republisher-dbgsym_0.3.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2-web-republisher_0.3.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2-web-republisher_0.3.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2-web-republisher_0.3.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2-web-republisher_0.3.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf2_0.7.7-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf2_0.7.7-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf2_0.7.7-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf2_0.7.7-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-tf_1.13.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-tf_1.13.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-tf_1.13.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-tf_1.13.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-topic-tools-dbgsym_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-topic-tools-dbgsym_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-topic-tools-dbgsym_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-topic-tools-dbgsym_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-topic-tools_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-topic-tools_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-topic-tools_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-topic-tools_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-trajectory-msgs_1.13.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-trajectory-msgs_1.13.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-trajectory-msgs_1.13.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-trajectory-msgs_1.13.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-urdf-dbgsym_1.13.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-urdf-dbgsym_1.13.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-urdf-dbgsym_1.13.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-urdf-dbgsym_1.13.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-urdf-parser-plugin_1.13.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-urdf-parser-plugin_1.13.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-urdf-parser-plugin_1.13.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-urdf-parser-plugin_1.13.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-urdf_1.13.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-urdf_1.13.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-urdf_1.13.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-urdf_1.13.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-uuid-msgs_1.0.6-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-uuid-msgs_1.0.6-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-uuid-msgs_1.0.6-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-uuid-msgs_1.0.6-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-visualization-msgs_1.13.1-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-visualization-msgs_1.13.1-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-visualization-msgs_1.13.1-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-visualization-msgs_1.13.1-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-web-video-server-dbgsym_0.2.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-web-video-server-dbgsym_0.2.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-web-video-server-dbgsym_0.2.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-web-video-server-dbgsym_0.2.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-web-video-server_0.2.2-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-web-video-server_0.2.2-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-web-video-server_0.2.2-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-web-video-server_0.2.2-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-xmlrpcpp-dbgsym_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-xmlrpcpp-dbgsym_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-xmlrpcpp-dbgsym_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-xmlrpcpp-dbgsym_1.16.0-0bookworm_armhf.deb diff --git a/packages/bookworm/ros-noetic-xmlrpcpp_1.16.0-0bookworm_armhf.deb b/packages/bookworm/main/ros-noetic-xmlrpcpp_1.16.0-0bookworm_armhf.deb similarity index 100% rename from packages/bookworm/ros-noetic-xmlrpcpp_1.16.0-0bookworm_armhf.deb rename to packages/bookworm/main/ros-noetic-xmlrpcpp_1.16.0-0bookworm_armhf.deb