diff --git a/ament-cmake-core-setup-hook.sh b/distros/ament-cmake-core-setup-hook.sh
similarity index 100%
rename from ament-cmake-core-setup-hook.sh
rename to distros/ament-cmake-core-setup-hook.sh
diff --git a/build-env/default.nix b/distros/build-env/default.nix
similarity index 100%
rename from build-env/default.nix
rename to distros/build-env/default.nix
diff --git a/build-env/setup-hook-builder.pl b/distros/build-env/setup-hook-builder.pl
similarity index 100%
rename from build-env/setup-hook-builder.pl
rename to distros/build-env/setup-hook-builder.pl
diff --git a/build-ros-package/default.nix b/distros/build-ros-package/default.nix
similarity index 100%
rename from build-ros-package/default.nix
rename to distros/build-ros-package/default.nix
diff --git a/catkin-setup-hook/default.nix b/distros/catkin-setup-hook/default.nix
similarity index 100%
rename from catkin-setup-hook/default.nix
rename to distros/catkin-setup-hook/default.nix
diff --git a/catkin-setup-hook/setup-hook.sh b/distros/catkin-setup-hook/setup-hook.sh
similarity index 100%
rename from catkin-setup-hook/setup-hook.sh
rename to distros/catkin-setup-hook/setup-hook.sh
diff --git a/crystal/action-msgs/default.nix b/distros/crystal/action-msgs/default.nix
similarity index 100%
rename from crystal/action-msgs/default.nix
rename to distros/crystal/action-msgs/default.nix
diff --git a/crystal/actionlib-msgs/default.nix b/distros/crystal/actionlib-msgs/default.nix
similarity index 100%
rename from crystal/actionlib-msgs/default.nix
rename to distros/crystal/actionlib-msgs/default.nix
diff --git a/crystal/ament-clang-format/default.nix b/distros/crystal/ament-clang-format/default.nix
similarity index 100%
rename from crystal/ament-clang-format/default.nix
rename to distros/crystal/ament-clang-format/default.nix
diff --git a/crystal/ament-cmake-auto/default.nix b/distros/crystal/ament-cmake-auto/default.nix
similarity index 100%
rename from crystal/ament-cmake-auto/default.nix
rename to distros/crystal/ament-cmake-auto/default.nix
diff --git a/crystal/ament-cmake-clang-format/default.nix b/distros/crystal/ament-cmake-clang-format/default.nix
similarity index 100%
rename from crystal/ament-cmake-clang-format/default.nix
rename to distros/crystal/ament-cmake-clang-format/default.nix
diff --git a/crystal/ament-cmake-copyright/default.nix b/distros/crystal/ament-cmake-copyright/default.nix
similarity index 100%
rename from crystal/ament-cmake-copyright/default.nix
rename to distros/crystal/ament-cmake-copyright/default.nix
diff --git a/crystal/ament-cmake-core/default.nix b/distros/crystal/ament-cmake-core/default.nix
similarity index 100%
rename from crystal/ament-cmake-core/default.nix
rename to distros/crystal/ament-cmake-core/default.nix
diff --git a/crystal/ament-cmake-cppcheck/default.nix b/distros/crystal/ament-cmake-cppcheck/default.nix
similarity index 100%
rename from crystal/ament-cmake-cppcheck/default.nix
rename to distros/crystal/ament-cmake-cppcheck/default.nix
diff --git a/crystal/ament-cmake-cpplint/default.nix b/distros/crystal/ament-cmake-cpplint/default.nix
similarity index 100%
rename from crystal/ament-cmake-cpplint/default.nix
rename to distros/crystal/ament-cmake-cpplint/default.nix
diff --git a/crystal/ament-cmake-export-definitions/default.nix b/distros/crystal/ament-cmake-export-definitions/default.nix
similarity index 100%
rename from crystal/ament-cmake-export-definitions/default.nix
rename to distros/crystal/ament-cmake-export-definitions/default.nix
diff --git a/crystal/ament-cmake-export-dependencies/default.nix b/distros/crystal/ament-cmake-export-dependencies/default.nix
similarity index 100%
rename from crystal/ament-cmake-export-dependencies/default.nix
rename to distros/crystal/ament-cmake-export-dependencies/default.nix
diff --git a/crystal/ament-cmake-export-include-directories/default.nix b/distros/crystal/ament-cmake-export-include-directories/default.nix
similarity index 100%
rename from crystal/ament-cmake-export-include-directories/default.nix
rename to distros/crystal/ament-cmake-export-include-directories/default.nix
diff --git a/crystal/ament-cmake-export-interfaces/default.nix b/distros/crystal/ament-cmake-export-interfaces/default.nix
similarity index 100%
rename from crystal/ament-cmake-export-interfaces/default.nix
rename to distros/crystal/ament-cmake-export-interfaces/default.nix
diff --git a/crystal/ament-cmake-export-libraries/default.nix b/distros/crystal/ament-cmake-export-libraries/default.nix
similarity index 100%
rename from crystal/ament-cmake-export-libraries/default.nix
rename to distros/crystal/ament-cmake-export-libraries/default.nix
diff --git a/crystal/ament-cmake-export-link-flags/default.nix b/distros/crystal/ament-cmake-export-link-flags/default.nix
similarity index 100%
rename from crystal/ament-cmake-export-link-flags/default.nix
rename to distros/crystal/ament-cmake-export-link-flags/default.nix
diff --git a/crystal/ament-cmake-flake8/default.nix b/distros/crystal/ament-cmake-flake8/default.nix
similarity index 100%
rename from crystal/ament-cmake-flake8/default.nix
rename to distros/crystal/ament-cmake-flake8/default.nix
diff --git a/crystal/ament-cmake-gmock/default.nix b/distros/crystal/ament-cmake-gmock/default.nix
similarity index 100%
rename from crystal/ament-cmake-gmock/default.nix
rename to distros/crystal/ament-cmake-gmock/default.nix
diff --git a/crystal/ament-cmake-gtest/default.nix b/distros/crystal/ament-cmake-gtest/default.nix
similarity index 100%
rename from crystal/ament-cmake-gtest/default.nix
rename to distros/crystal/ament-cmake-gtest/default.nix
diff --git a/crystal/ament-cmake-include-directories/default.nix b/distros/crystal/ament-cmake-include-directories/default.nix
similarity index 100%
rename from crystal/ament-cmake-include-directories/default.nix
rename to distros/crystal/ament-cmake-include-directories/default.nix
diff --git a/crystal/ament-cmake-libraries/default.nix b/distros/crystal/ament-cmake-libraries/default.nix
similarity index 100%
rename from crystal/ament-cmake-libraries/default.nix
rename to distros/crystal/ament-cmake-libraries/default.nix
diff --git a/crystal/ament-cmake-lint-cmake/default.nix b/distros/crystal/ament-cmake-lint-cmake/default.nix
similarity index 100%
rename from crystal/ament-cmake-lint-cmake/default.nix
rename to distros/crystal/ament-cmake-lint-cmake/default.nix
diff --git a/crystal/ament-cmake-nose/default.nix b/distros/crystal/ament-cmake-nose/default.nix
similarity index 100%
rename from crystal/ament-cmake-nose/default.nix
rename to distros/crystal/ament-cmake-nose/default.nix
diff --git a/crystal/ament-cmake-pclint/default.nix b/distros/crystal/ament-cmake-pclint/default.nix
similarity index 100%
rename from crystal/ament-cmake-pclint/default.nix
rename to distros/crystal/ament-cmake-pclint/default.nix
diff --git a/crystal/ament-cmake-pep257/default.nix b/distros/crystal/ament-cmake-pep257/default.nix
similarity index 100%
rename from crystal/ament-cmake-pep257/default.nix
rename to distros/crystal/ament-cmake-pep257/default.nix
diff --git a/crystal/ament-cmake-pep8/default.nix b/distros/crystal/ament-cmake-pep8/default.nix
similarity index 100%
rename from crystal/ament-cmake-pep8/default.nix
rename to distros/crystal/ament-cmake-pep8/default.nix
diff --git a/crystal/ament-cmake-pyflakes/default.nix b/distros/crystal/ament-cmake-pyflakes/default.nix
similarity index 100%
rename from crystal/ament-cmake-pyflakes/default.nix
rename to distros/crystal/ament-cmake-pyflakes/default.nix
diff --git a/crystal/ament-cmake-pytest/default.nix b/distros/crystal/ament-cmake-pytest/default.nix
similarity index 100%
rename from crystal/ament-cmake-pytest/default.nix
rename to distros/crystal/ament-cmake-pytest/default.nix
diff --git a/crystal/ament-cmake-python/default.nix b/distros/crystal/ament-cmake-python/default.nix
similarity index 100%
rename from crystal/ament-cmake-python/default.nix
rename to distros/crystal/ament-cmake-python/default.nix
diff --git a/crystal/ament-cmake-ros/default.nix b/distros/crystal/ament-cmake-ros/default.nix
similarity index 100%
rename from crystal/ament-cmake-ros/default.nix
rename to distros/crystal/ament-cmake-ros/default.nix
diff --git a/crystal/ament-cmake-target-dependencies/default.nix b/distros/crystal/ament-cmake-target-dependencies/default.nix
similarity index 100%
rename from crystal/ament-cmake-target-dependencies/default.nix
rename to distros/crystal/ament-cmake-target-dependencies/default.nix
diff --git a/crystal/ament-cmake-test/default.nix b/distros/crystal/ament-cmake-test/default.nix
similarity index 100%
rename from crystal/ament-cmake-test/default.nix
rename to distros/crystal/ament-cmake-test/default.nix
diff --git a/crystal/ament-cmake-uncrustify/default.nix b/distros/crystal/ament-cmake-uncrustify/default.nix
similarity index 100%
rename from crystal/ament-cmake-uncrustify/default.nix
rename to distros/crystal/ament-cmake-uncrustify/default.nix
diff --git a/crystal/ament-cmake-virtualenv/default.nix b/distros/crystal/ament-cmake-virtualenv/default.nix
similarity index 100%
rename from crystal/ament-cmake-virtualenv/default.nix
rename to distros/crystal/ament-cmake-virtualenv/default.nix
diff --git a/crystal/ament-cmake-xmllint/default.nix b/distros/crystal/ament-cmake-xmllint/default.nix
similarity index 100%
rename from crystal/ament-cmake-xmllint/default.nix
rename to distros/crystal/ament-cmake-xmllint/default.nix
diff --git a/crystal/ament-cmake/default.nix b/distros/crystal/ament-cmake/default.nix
similarity index 100%
rename from crystal/ament-cmake/default.nix
rename to distros/crystal/ament-cmake/default.nix
diff --git a/crystal/ament-copyright/default.nix b/distros/crystal/ament-copyright/default.nix
similarity index 100%
rename from crystal/ament-copyright/default.nix
rename to distros/crystal/ament-copyright/default.nix
diff --git a/crystal/ament-cppcheck/default.nix b/distros/crystal/ament-cppcheck/default.nix
similarity index 100%
rename from crystal/ament-cppcheck/default.nix
rename to distros/crystal/ament-cppcheck/default.nix
diff --git a/crystal/ament-cpplint/default.nix b/distros/crystal/ament-cpplint/default.nix
similarity index 100%
rename from crystal/ament-cpplint/default.nix
rename to distros/crystal/ament-cpplint/default.nix
diff --git a/crystal/ament-flake8/default.nix b/distros/crystal/ament-flake8/default.nix
similarity index 100%
rename from crystal/ament-flake8/default.nix
rename to distros/crystal/ament-flake8/default.nix
diff --git a/crystal/ament-index-cpp/default.nix b/distros/crystal/ament-index-cpp/default.nix
similarity index 100%
rename from crystal/ament-index-cpp/default.nix
rename to distros/crystal/ament-index-cpp/default.nix
diff --git a/crystal/ament-index-python/default.nix b/distros/crystal/ament-index-python/default.nix
similarity index 100%
rename from crystal/ament-index-python/default.nix
rename to distros/crystal/ament-index-python/default.nix
diff --git a/crystal/ament-lint-auto/default.nix b/distros/crystal/ament-lint-auto/default.nix
similarity index 100%
rename from crystal/ament-lint-auto/default.nix
rename to distros/crystal/ament-lint-auto/default.nix
diff --git a/crystal/ament-lint-cmake/default.nix b/distros/crystal/ament-lint-cmake/default.nix
similarity index 100%
rename from crystal/ament-lint-cmake/default.nix
rename to distros/crystal/ament-lint-cmake/default.nix
diff --git a/crystal/ament-lint-common/default.nix b/distros/crystal/ament-lint-common/default.nix
similarity index 100%
rename from crystal/ament-lint-common/default.nix
rename to distros/crystal/ament-lint-common/default.nix
diff --git a/crystal/ament-package/default.nix b/distros/crystal/ament-package/default.nix
similarity index 100%
rename from crystal/ament-package/default.nix
rename to distros/crystal/ament-package/default.nix
diff --git a/crystal/ament-pclint/default.nix b/distros/crystal/ament-pclint/default.nix
similarity index 100%
rename from crystal/ament-pclint/default.nix
rename to distros/crystal/ament-pclint/default.nix
diff --git a/crystal/ament-pep257/default.nix b/distros/crystal/ament-pep257/default.nix
similarity index 100%
rename from crystal/ament-pep257/default.nix
rename to distros/crystal/ament-pep257/default.nix
diff --git a/crystal/ament-pep8/default.nix b/distros/crystal/ament-pep8/default.nix
similarity index 100%
rename from crystal/ament-pep8/default.nix
rename to distros/crystal/ament-pep8/default.nix
diff --git a/crystal/ament-pyflakes/default.nix b/distros/crystal/ament-pyflakes/default.nix
similarity index 100%
rename from crystal/ament-pyflakes/default.nix
rename to distros/crystal/ament-pyflakes/default.nix
diff --git a/crystal/ament-uncrustify/default.nix b/distros/crystal/ament-uncrustify/default.nix
similarity index 100%
rename from crystal/ament-uncrustify/default.nix
rename to distros/crystal/ament-uncrustify/default.nix
diff --git a/crystal/ament-virtualenv/default.nix b/distros/crystal/ament-virtualenv/default.nix
similarity index 100%
rename from crystal/ament-virtualenv/default.nix
rename to distros/crystal/ament-virtualenv/default.nix
diff --git a/crystal/ament-xmllint/default.nix b/distros/crystal/ament-xmllint/default.nix
similarity index 100%
rename from crystal/ament-xmllint/default.nix
rename to distros/crystal/ament-xmllint/default.nix
diff --git a/crystal/angles/default.nix b/distros/crystal/angles/default.nix
similarity index 100%
rename from crystal/angles/default.nix
rename to distros/crystal/angles/default.nix
diff --git a/crystal/apriltag-msgs/default.nix b/distros/crystal/apriltag-msgs/default.nix
similarity index 100%
rename from crystal/apriltag-msgs/default.nix
rename to distros/crystal/apriltag-msgs/default.nix
diff --git a/crystal/apriltag/default.nix b/distros/crystal/apriltag/default.nix
similarity index 100%
rename from crystal/apriltag/default.nix
rename to distros/crystal/apriltag/default.nix
diff --git a/crystal/apriltag2-node/default.nix b/distros/crystal/apriltag2-node/default.nix
similarity index 100%
rename from crystal/apriltag2-node/default.nix
rename to distros/crystal/apriltag2-node/default.nix
diff --git a/crystal/behaviortree-cpp-v3/default.nix b/distros/crystal/behaviortree-cpp-v3/default.nix
similarity index 100%
rename from crystal/behaviortree-cpp-v3/default.nix
rename to distros/crystal/behaviortree-cpp-v3/default.nix
diff --git a/crystal/behaviortree-cpp/default.nix b/distros/crystal/behaviortree-cpp/default.nix
similarity index 100%
rename from crystal/behaviortree-cpp/default.nix
rename to distros/crystal/behaviortree-cpp/default.nix
diff --git a/crystal/builtin-interfaces/default.nix b/distros/crystal/builtin-interfaces/default.nix
similarity index 100%
rename from crystal/builtin-interfaces/default.nix
rename to distros/crystal/builtin-interfaces/default.nix
diff --git a/crystal/camera-calibration-parsers/default.nix b/distros/crystal/camera-calibration-parsers/default.nix
similarity index 100%
rename from crystal/camera-calibration-parsers/default.nix
rename to distros/crystal/camera-calibration-parsers/default.nix
diff --git a/crystal/camera-info-manager/default.nix b/distros/crystal/camera-info-manager/default.nix
similarity index 100%
rename from crystal/camera-info-manager/default.nix
rename to distros/crystal/camera-info-manager/default.nix
diff --git a/crystal/cartographer/default.nix b/distros/crystal/cartographer/default.nix
similarity index 100%
rename from crystal/cartographer/default.nix
rename to distros/crystal/cartographer/default.nix
diff --git a/crystal/class-loader/default.nix b/distros/crystal/class-loader/default.nix
similarity index 100%
rename from crystal/class-loader/default.nix
rename to distros/crystal/class-loader/default.nix
diff --git a/crystal/common-interfaces/default.nix b/distros/crystal/common-interfaces/default.nix
similarity index 100%
rename from crystal/common-interfaces/default.nix
rename to distros/crystal/common-interfaces/default.nix
diff --git a/crystal/composition/default.nix b/distros/crystal/composition/default.nix
similarity index 100%
rename from crystal/composition/default.nix
rename to distros/crystal/composition/default.nix
diff --git a/crystal/compressed-depth-image-transport/default.nix b/distros/crystal/compressed-depth-image-transport/default.nix
similarity index 100%
rename from crystal/compressed-depth-image-transport/default.nix
rename to distros/crystal/compressed-depth-image-transport/default.nix
diff --git a/crystal/compressed-image-transport/default.nix b/distros/crystal/compressed-image-transport/default.nix
similarity index 100%
rename from crystal/compressed-image-transport/default.nix
rename to distros/crystal/compressed-image-transport/default.nix
diff --git a/crystal/connext-cmake-module/default.nix b/distros/crystal/connext-cmake-module/default.nix
similarity index 100%
rename from crystal/connext-cmake-module/default.nix
rename to distros/crystal/connext-cmake-module/default.nix
diff --git a/crystal/console-bridge-vendor/default.nix b/distros/crystal/console-bridge-vendor/default.nix
similarity index 100%
rename from crystal/console-bridge-vendor/default.nix
rename to distros/crystal/console-bridge-vendor/default.nix
diff --git a/crystal/control-msgs/default.nix b/distros/crystal/control-msgs/default.nix
similarity index 100%
rename from crystal/control-msgs/default.nix
rename to distros/crystal/control-msgs/default.nix
diff --git a/crystal/costmap-queue/default.nix b/distros/crystal/costmap-queue/default.nix
similarity index 100%
rename from crystal/costmap-queue/default.nix
rename to distros/crystal/costmap-queue/default.nix
diff --git a/crystal/cv-bridge/default.nix b/distros/crystal/cv-bridge/default.nix
similarity index 100%
rename from crystal/cv-bridge/default.nix
rename to distros/crystal/cv-bridge/default.nix
diff --git a/crystal/demo-nodes-cpp-native/default.nix b/distros/crystal/demo-nodes-cpp-native/default.nix
similarity index 100%
rename from crystal/demo-nodes-cpp-native/default.nix
rename to distros/crystal/demo-nodes-cpp-native/default.nix
diff --git a/crystal/demo-nodes-cpp/default.nix b/distros/crystal/demo-nodes-cpp/default.nix
similarity index 100%
rename from crystal/demo-nodes-cpp/default.nix
rename to distros/crystal/demo-nodes-cpp/default.nix
diff --git a/crystal/demo-nodes-py/default.nix b/distros/crystal/demo-nodes-py/default.nix
similarity index 100%
rename from crystal/demo-nodes-py/default.nix
rename to distros/crystal/demo-nodes-py/default.nix
diff --git a/crystal/depth-image-proc/default.nix b/distros/crystal/depth-image-proc/default.nix
similarity index 100%
rename from crystal/depth-image-proc/default.nix
rename to distros/crystal/depth-image-proc/default.nix
diff --git a/crystal/depthimage-to-laserscan/default.nix b/distros/crystal/depthimage-to-laserscan/default.nix
similarity index 100%
rename from crystal/depthimage-to-laserscan/default.nix
rename to distros/crystal/depthimage-to-laserscan/default.nix
diff --git a/crystal/desktop/default.nix b/distros/crystal/desktop/default.nix
similarity index 100%
rename from crystal/desktop/default.nix
rename to distros/crystal/desktop/default.nix
diff --git a/crystal/diagnostic-msgs/default.nix b/distros/crystal/diagnostic-msgs/default.nix
similarity index 100%
rename from crystal/diagnostic-msgs/default.nix
rename to distros/crystal/diagnostic-msgs/default.nix
diff --git a/crystal/dummy-map-server/default.nix b/distros/crystal/dummy-map-server/default.nix
similarity index 100%
rename from crystal/dummy-map-server/default.nix
rename to distros/crystal/dummy-map-server/default.nix
diff --git a/crystal/dummy-robot-bringup/default.nix b/distros/crystal/dummy-robot-bringup/default.nix
similarity index 100%
rename from crystal/dummy-robot-bringup/default.nix
rename to distros/crystal/dummy-robot-bringup/default.nix
diff --git a/crystal/dummy-sensors/default.nix b/distros/crystal/dummy-sensors/default.nix
similarity index 100%
rename from crystal/dummy-sensors/default.nix
rename to distros/crystal/dummy-sensors/default.nix
diff --git a/crystal/dwb-controller/default.nix b/distros/crystal/dwb-controller/default.nix
similarity index 100%
rename from crystal/dwb-controller/default.nix
rename to distros/crystal/dwb-controller/default.nix
diff --git a/crystal/dwb-core/default.nix b/distros/crystal/dwb-core/default.nix
similarity index 100%
rename from crystal/dwb-core/default.nix
rename to distros/crystal/dwb-core/default.nix
diff --git a/crystal/dwb-critics/default.nix b/distros/crystal/dwb-critics/default.nix
similarity index 100%
rename from crystal/dwb-critics/default.nix
rename to distros/crystal/dwb-critics/default.nix
diff --git a/crystal/dwb-msgs/default.nix b/distros/crystal/dwb-msgs/default.nix
similarity index 100%
rename from crystal/dwb-msgs/default.nix
rename to distros/crystal/dwb-msgs/default.nix
diff --git a/crystal/dwb-plugins/default.nix b/distros/crystal/dwb-plugins/default.nix
similarity index 100%
rename from crystal/dwb-plugins/default.nix
rename to distros/crystal/dwb-plugins/default.nix
diff --git a/crystal/ecl-build/default.nix b/distros/crystal/ecl-build/default.nix
similarity index 100%
rename from crystal/ecl-build/default.nix
rename to distros/crystal/ecl-build/default.nix
diff --git a/crystal/ecl-command-line/default.nix b/distros/crystal/ecl-command-line/default.nix
similarity index 100%
rename from crystal/ecl-command-line/default.nix
rename to distros/crystal/ecl-command-line/default.nix
diff --git a/crystal/ecl-concepts/default.nix b/distros/crystal/ecl-concepts/default.nix
similarity index 100%
rename from crystal/ecl-concepts/default.nix
rename to distros/crystal/ecl-concepts/default.nix
diff --git a/crystal/ecl-config/default.nix b/distros/crystal/ecl-config/default.nix
similarity index 100%
rename from crystal/ecl-config/default.nix
rename to distros/crystal/ecl-config/default.nix
diff --git a/crystal/ecl-console/default.nix b/distros/crystal/ecl-console/default.nix
similarity index 100%
rename from crystal/ecl-console/default.nix
rename to distros/crystal/ecl-console/default.nix
diff --git a/crystal/ecl-containers/default.nix b/distros/crystal/ecl-containers/default.nix
similarity index 100%
rename from crystal/ecl-containers/default.nix
rename to distros/crystal/ecl-containers/default.nix
diff --git a/crystal/ecl-converters-lite/default.nix b/distros/crystal/ecl-converters-lite/default.nix
similarity index 100%
rename from crystal/ecl-converters-lite/default.nix
rename to distros/crystal/ecl-converters-lite/default.nix
diff --git a/crystal/ecl-converters/default.nix b/distros/crystal/ecl-converters/default.nix
similarity index 100%
rename from crystal/ecl-converters/default.nix
rename to distros/crystal/ecl-converters/default.nix
diff --git a/crystal/ecl-core-apps/default.nix b/distros/crystal/ecl-core-apps/default.nix
similarity index 100%
rename from crystal/ecl-core-apps/default.nix
rename to distros/crystal/ecl-core-apps/default.nix
diff --git a/crystal/ecl-core/default.nix b/distros/crystal/ecl-core/default.nix
similarity index 100%
rename from crystal/ecl-core/default.nix
rename to distros/crystal/ecl-core/default.nix
diff --git a/crystal/ecl-devices/default.nix b/distros/crystal/ecl-devices/default.nix
similarity index 100%
rename from crystal/ecl-devices/default.nix
rename to distros/crystal/ecl-devices/default.nix
diff --git a/crystal/ecl-eigen/default.nix b/distros/crystal/ecl-eigen/default.nix
similarity index 100%
rename from crystal/ecl-eigen/default.nix
rename to distros/crystal/ecl-eigen/default.nix
diff --git a/crystal/ecl-errors/default.nix b/distros/crystal/ecl-errors/default.nix
similarity index 100%
rename from crystal/ecl-errors/default.nix
rename to distros/crystal/ecl-errors/default.nix
diff --git a/crystal/ecl-exceptions/default.nix b/distros/crystal/ecl-exceptions/default.nix
similarity index 100%
rename from crystal/ecl-exceptions/default.nix
rename to distros/crystal/ecl-exceptions/default.nix
diff --git a/crystal/ecl-filesystem/default.nix b/distros/crystal/ecl-filesystem/default.nix
similarity index 100%
rename from crystal/ecl-filesystem/default.nix
rename to distros/crystal/ecl-filesystem/default.nix
diff --git a/crystal/ecl-formatters/default.nix b/distros/crystal/ecl-formatters/default.nix
similarity index 100%
rename from crystal/ecl-formatters/default.nix
rename to distros/crystal/ecl-formatters/default.nix
diff --git a/crystal/ecl-geometry/default.nix b/distros/crystal/ecl-geometry/default.nix
similarity index 100%
rename from crystal/ecl-geometry/default.nix
rename to distros/crystal/ecl-geometry/default.nix
diff --git a/crystal/ecl-io/default.nix b/distros/crystal/ecl-io/default.nix
similarity index 100%
rename from crystal/ecl-io/default.nix
rename to distros/crystal/ecl-io/default.nix
diff --git a/crystal/ecl-ipc/default.nix b/distros/crystal/ecl-ipc/default.nix
similarity index 100%
rename from crystal/ecl-ipc/default.nix
rename to distros/crystal/ecl-ipc/default.nix
diff --git a/crystal/ecl-license/default.nix b/distros/crystal/ecl-license/default.nix
similarity index 100%
rename from crystal/ecl-license/default.nix
rename to distros/crystal/ecl-license/default.nix
diff --git a/crystal/ecl-linear-algebra/default.nix b/distros/crystal/ecl-linear-algebra/default.nix
similarity index 100%
rename from crystal/ecl-linear-algebra/default.nix
rename to distros/crystal/ecl-linear-algebra/default.nix
diff --git a/crystal/ecl-lite/default.nix b/distros/crystal/ecl-lite/default.nix
similarity index 100%
rename from crystal/ecl-lite/default.nix
rename to distros/crystal/ecl-lite/default.nix
diff --git a/crystal/ecl-manipulators/default.nix b/distros/crystal/ecl-manipulators/default.nix
similarity index 100%
rename from crystal/ecl-manipulators/default.nix
rename to distros/crystal/ecl-manipulators/default.nix
diff --git a/crystal/ecl-math/default.nix b/distros/crystal/ecl-math/default.nix
similarity index 100%
rename from crystal/ecl-math/default.nix
rename to distros/crystal/ecl-math/default.nix
diff --git a/crystal/ecl-mobile-robot/default.nix b/distros/crystal/ecl-mobile-robot/default.nix
similarity index 100%
rename from crystal/ecl-mobile-robot/default.nix
rename to distros/crystal/ecl-mobile-robot/default.nix
diff --git a/crystal/ecl-mpl/default.nix b/distros/crystal/ecl-mpl/default.nix
similarity index 100%
rename from crystal/ecl-mpl/default.nix
rename to distros/crystal/ecl-mpl/default.nix
diff --git a/crystal/ecl-sigslots-lite/default.nix b/distros/crystal/ecl-sigslots-lite/default.nix
similarity index 100%
rename from crystal/ecl-sigslots-lite/default.nix
rename to distros/crystal/ecl-sigslots-lite/default.nix
diff --git a/crystal/ecl-sigslots/default.nix b/distros/crystal/ecl-sigslots/default.nix
similarity index 100%
rename from crystal/ecl-sigslots/default.nix
rename to distros/crystal/ecl-sigslots/default.nix
diff --git a/crystal/ecl-statistics/default.nix b/distros/crystal/ecl-statistics/default.nix
similarity index 100%
rename from crystal/ecl-statistics/default.nix
rename to distros/crystal/ecl-statistics/default.nix
diff --git a/crystal/ecl-streams/default.nix b/distros/crystal/ecl-streams/default.nix
similarity index 100%
rename from crystal/ecl-streams/default.nix
rename to distros/crystal/ecl-streams/default.nix
diff --git a/crystal/ecl-threads/default.nix b/distros/crystal/ecl-threads/default.nix
similarity index 100%
rename from crystal/ecl-threads/default.nix
rename to distros/crystal/ecl-threads/default.nix
diff --git a/crystal/ecl-time-lite/default.nix b/distros/crystal/ecl-time-lite/default.nix
similarity index 100%
rename from crystal/ecl-time-lite/default.nix
rename to distros/crystal/ecl-time-lite/default.nix
diff --git a/crystal/ecl-time/default.nix b/distros/crystal/ecl-time/default.nix
similarity index 100%
rename from crystal/ecl-time/default.nix
rename to distros/crystal/ecl-time/default.nix
diff --git a/crystal/ecl-tools/default.nix b/distros/crystal/ecl-tools/default.nix
similarity index 100%
rename from crystal/ecl-tools/default.nix
rename to distros/crystal/ecl-tools/default.nix
diff --git a/crystal/ecl-type-traits/default.nix b/distros/crystal/ecl-type-traits/default.nix
similarity index 100%
rename from crystal/ecl-type-traits/default.nix
rename to distros/crystal/ecl-type-traits/default.nix
diff --git a/crystal/ecl-utilities/default.nix b/distros/crystal/ecl-utilities/default.nix
similarity index 100%
rename from crystal/ecl-utilities/default.nix
rename to distros/crystal/ecl-utilities/default.nix
diff --git a/crystal/eigen-stl-containers/default.nix b/distros/crystal/eigen-stl-containers/default.nix
similarity index 100%
rename from crystal/eigen-stl-containers/default.nix
rename to distros/crystal/eigen-stl-containers/default.nix
diff --git a/crystal/ets-cpp-client/default.nix b/distros/crystal/ets-cpp-client/default.nix
similarity index 100%
rename from crystal/ets-cpp-client/default.nix
rename to distros/crystal/ets-cpp-client/default.nix
diff --git a/crystal/ets-msgs/default.nix b/distros/crystal/ets-msgs/default.nix
similarity index 100%
rename from crystal/ets-msgs/default.nix
rename to distros/crystal/ets-msgs/default.nix
diff --git a/crystal/ets-plugin/default.nix b/distros/crystal/ets-plugin/default.nix
similarity index 100%
rename from crystal/ets-plugin/default.nix
rename to distros/crystal/ets-plugin/default.nix
diff --git a/crystal/example-interfaces/default.nix b/distros/crystal/example-interfaces/default.nix
similarity index 100%
rename from crystal/example-interfaces/default.nix
rename to distros/crystal/example-interfaces/default.nix
diff --git a/crystal/examples-rclcpp-minimal-action-client/default.nix b/distros/crystal/examples-rclcpp-minimal-action-client/default.nix
similarity index 100%
rename from crystal/examples-rclcpp-minimal-action-client/default.nix
rename to distros/crystal/examples-rclcpp-minimal-action-client/default.nix
diff --git a/crystal/examples-rclcpp-minimal-action-server/default.nix b/distros/crystal/examples-rclcpp-minimal-action-server/default.nix
similarity index 100%
rename from crystal/examples-rclcpp-minimal-action-server/default.nix
rename to distros/crystal/examples-rclcpp-minimal-action-server/default.nix
diff --git a/crystal/examples-rclcpp-minimal-client/default.nix b/distros/crystal/examples-rclcpp-minimal-client/default.nix
similarity index 100%
rename from crystal/examples-rclcpp-minimal-client/default.nix
rename to distros/crystal/examples-rclcpp-minimal-client/default.nix
diff --git a/crystal/examples-rclcpp-minimal-composition/default.nix b/distros/crystal/examples-rclcpp-minimal-composition/default.nix
similarity index 100%
rename from crystal/examples-rclcpp-minimal-composition/default.nix
rename to distros/crystal/examples-rclcpp-minimal-composition/default.nix
diff --git a/crystal/examples-rclcpp-minimal-publisher/default.nix b/distros/crystal/examples-rclcpp-minimal-publisher/default.nix
similarity index 100%
rename from crystal/examples-rclcpp-minimal-publisher/default.nix
rename to distros/crystal/examples-rclcpp-minimal-publisher/default.nix
diff --git a/crystal/examples-rclcpp-minimal-service/default.nix b/distros/crystal/examples-rclcpp-minimal-service/default.nix
similarity index 100%
rename from crystal/examples-rclcpp-minimal-service/default.nix
rename to distros/crystal/examples-rclcpp-minimal-service/default.nix
diff --git a/crystal/examples-rclcpp-minimal-subscriber/default.nix b/distros/crystal/examples-rclcpp-minimal-subscriber/default.nix
similarity index 100%
rename from crystal/examples-rclcpp-minimal-subscriber/default.nix
rename to distros/crystal/examples-rclcpp-minimal-subscriber/default.nix
diff --git a/crystal/examples-rclcpp-minimal-timer/default.nix b/distros/crystal/examples-rclcpp-minimal-timer/default.nix
similarity index 100%
rename from crystal/examples-rclcpp-minimal-timer/default.nix
rename to distros/crystal/examples-rclcpp-minimal-timer/default.nix
diff --git a/crystal/examples-rclpy-executors/default.nix b/distros/crystal/examples-rclpy-executors/default.nix
similarity index 100%
rename from crystal/examples-rclpy-executors/default.nix
rename to distros/crystal/examples-rclpy-executors/default.nix
diff --git a/crystal/examples-rclpy-minimal-action-client/default.nix b/distros/crystal/examples-rclpy-minimal-action-client/default.nix
similarity index 100%
rename from crystal/examples-rclpy-minimal-action-client/default.nix
rename to distros/crystal/examples-rclpy-minimal-action-client/default.nix
diff --git a/crystal/examples-rclpy-minimal-action-server/default.nix b/distros/crystal/examples-rclpy-minimal-action-server/default.nix
similarity index 100%
rename from crystal/examples-rclpy-minimal-action-server/default.nix
rename to distros/crystal/examples-rclpy-minimal-action-server/default.nix
diff --git a/crystal/examples-rclpy-minimal-client/default.nix b/distros/crystal/examples-rclpy-minimal-client/default.nix
similarity index 100%
rename from crystal/examples-rclpy-minimal-client/default.nix
rename to distros/crystal/examples-rclpy-minimal-client/default.nix
diff --git a/crystal/examples-rclpy-minimal-publisher/default.nix b/distros/crystal/examples-rclpy-minimal-publisher/default.nix
similarity index 100%
rename from crystal/examples-rclpy-minimal-publisher/default.nix
rename to distros/crystal/examples-rclpy-minimal-publisher/default.nix
diff --git a/crystal/examples-rclpy-minimal-service/default.nix b/distros/crystal/examples-rclpy-minimal-service/default.nix
similarity index 100%
rename from crystal/examples-rclpy-minimal-service/default.nix
rename to distros/crystal/examples-rclpy-minimal-service/default.nix
diff --git a/crystal/examples-rclpy-minimal-subscriber/default.nix b/distros/crystal/examples-rclpy-minimal-subscriber/default.nix
similarity index 100%
rename from crystal/examples-rclpy-minimal-subscriber/default.nix
rename to distros/crystal/examples-rclpy-minimal-subscriber/default.nix
diff --git a/crystal/fastcdr/default.nix b/distros/crystal/fastcdr/default.nix
similarity index 100%
rename from crystal/fastcdr/default.nix
rename to distros/crystal/fastcdr/default.nix
diff --git a/crystal/fastrtps-cmake-module/default.nix b/distros/crystal/fastrtps-cmake-module/default.nix
similarity index 100%
rename from crystal/fastrtps-cmake-module/default.nix
rename to distros/crystal/fastrtps-cmake-module/default.nix
diff --git a/crystal/fastrtps/default.nix b/distros/crystal/fastrtps/default.nix
similarity index 100%
rename from crystal/fastrtps/default.nix
rename to distros/crystal/fastrtps/default.nix
diff --git a/crystal/fmi-adapter-examples/default.nix b/distros/crystal/fmi-adapter-examples/default.nix
similarity index 100%
rename from crystal/fmi-adapter-examples/default.nix
rename to distros/crystal/fmi-adapter-examples/default.nix
diff --git a/crystal/fmi-adapter/default.nix b/distros/crystal/fmi-adapter/default.nix
similarity index 100%
rename from crystal/fmi-adapter/default.nix
rename to distros/crystal/fmi-adapter/default.nix
diff --git a/crystal/gazebo-dev/default.nix b/distros/crystal/gazebo-dev/default.nix
similarity index 100%
rename from crystal/gazebo-dev/default.nix
rename to distros/crystal/gazebo-dev/default.nix
diff --git a/crystal/gazebo-msgs/default.nix b/distros/crystal/gazebo-msgs/default.nix
similarity index 100%
rename from crystal/gazebo-msgs/default.nix
rename to distros/crystal/gazebo-msgs/default.nix
diff --git a/crystal/gazebo-plugins/default.nix b/distros/crystal/gazebo-plugins/default.nix
similarity index 100%
rename from crystal/gazebo-plugins/default.nix
rename to distros/crystal/gazebo-plugins/default.nix
diff --git a/crystal/gazebo-ros-pkgs/default.nix b/distros/crystal/gazebo-ros-pkgs/default.nix
similarity index 100%
rename from crystal/gazebo-ros-pkgs/default.nix
rename to distros/crystal/gazebo-ros-pkgs/default.nix
diff --git a/crystal/gazebo-ros/default.nix b/distros/crystal/gazebo-ros/default.nix
similarity index 100%
rename from crystal/gazebo-ros/default.nix
rename to distros/crystal/gazebo-ros/default.nix
diff --git a/crystal/generated.nix b/distros/crystal/generated.nix
similarity index 100%
rename from crystal/generated.nix
rename to distros/crystal/generated.nix
diff --git a/crystal/geometry-msgs/default.nix b/distros/crystal/geometry-msgs/default.nix
similarity index 100%
rename from crystal/geometry-msgs/default.nix
rename to distros/crystal/geometry-msgs/default.nix
diff --git a/crystal/gmock-vendor/default.nix b/distros/crystal/gmock-vendor/default.nix
similarity index 100%
rename from crystal/gmock-vendor/default.nix
rename to distros/crystal/gmock-vendor/default.nix
diff --git a/crystal/gtest-vendor/default.nix b/distros/crystal/gtest-vendor/default.nix
similarity index 100%
rename from crystal/gtest-vendor/default.nix
rename to distros/crystal/gtest-vendor/default.nix
diff --git a/crystal/image-geometry/default.nix b/distros/crystal/image-geometry/default.nix
similarity index 100%
rename from crystal/image-geometry/default.nix
rename to distros/crystal/image-geometry/default.nix
diff --git a/crystal/image-publisher/default.nix b/distros/crystal/image-publisher/default.nix
similarity index 100%
rename from crystal/image-publisher/default.nix
rename to distros/crystal/image-publisher/default.nix
diff --git a/crystal/image-tools/default.nix b/distros/crystal/image-tools/default.nix
similarity index 100%
rename from crystal/image-tools/default.nix
rename to distros/crystal/image-tools/default.nix
diff --git a/crystal/image-transport-plugins/default.nix b/distros/crystal/image-transport-plugins/default.nix
similarity index 100%
rename from crystal/image-transport-plugins/default.nix
rename to distros/crystal/image-transport-plugins/default.nix
diff --git a/crystal/image-transport/default.nix b/distros/crystal/image-transport/default.nix
similarity index 100%
rename from crystal/image-transport/default.nix
rename to distros/crystal/image-transport/default.nix
diff --git a/crystal/intra-process-demo/default.nix b/distros/crystal/intra-process-demo/default.nix
similarity index 100%
rename from crystal/intra-process-demo/default.nix
rename to distros/crystal/intra-process-demo/default.nix
diff --git a/crystal/joy/default.nix b/distros/crystal/joy/default.nix
similarity index 100%
rename from crystal/joy/default.nix
rename to distros/crystal/joy/default.nix
diff --git a/crystal/kdl-parser/default.nix b/distros/crystal/kdl-parser/default.nix
similarity index 100%
rename from crystal/kdl-parser/default.nix
rename to distros/crystal/kdl-parser/default.nix
diff --git a/crystal/keystroke/default.nix b/distros/crystal/keystroke/default.nix
similarity index 100%
rename from crystal/keystroke/default.nix
rename to distros/crystal/keystroke/default.nix
diff --git a/crystal/laser-geometry/default.nix b/distros/crystal/laser-geometry/default.nix
similarity index 100%
rename from crystal/laser-geometry/default.nix
rename to distros/crystal/laser-geometry/default.nix
diff --git a/crystal/launch-ros/default.nix b/distros/crystal/launch-ros/default.nix
similarity index 100%
rename from crystal/launch-ros/default.nix
rename to distros/crystal/launch-ros/default.nix
diff --git a/crystal/launch-testing/default.nix b/distros/crystal/launch-testing/default.nix
similarity index 100%
rename from crystal/launch-testing/default.nix
rename to distros/crystal/launch-testing/default.nix
diff --git a/crystal/launch/default.nix b/distros/crystal/launch/default.nix
similarity index 100%
rename from crystal/launch/default.nix
rename to distros/crystal/launch/default.nix
diff --git a/crystal/libcurl-vendor/default.nix b/distros/crystal/libcurl-vendor/default.nix
similarity index 100%
rename from crystal/libcurl-vendor/default.nix
rename to distros/crystal/libcurl-vendor/default.nix
diff --git a/crystal/librealsense2/default.nix b/distros/crystal/librealsense2/default.nix
similarity index 100%
rename from crystal/librealsense2/default.nix
rename to distros/crystal/librealsense2/default.nix
diff --git a/crystal/libyaml-vendor/default.nix b/distros/crystal/libyaml-vendor/default.nix
similarity index 100%
rename from crystal/libyaml-vendor/default.nix
rename to distros/crystal/libyaml-vendor/default.nix
diff --git a/crystal/lifecycle-msgs/default.nix b/distros/crystal/lifecycle-msgs/default.nix
similarity index 100%
rename from crystal/lifecycle-msgs/default.nix
rename to distros/crystal/lifecycle-msgs/default.nix
diff --git a/crystal/lifecycle/default.nix b/distros/crystal/lifecycle/default.nix
similarity index 100%
rename from crystal/lifecycle/default.nix
rename to distros/crystal/lifecycle/default.nix
diff --git a/crystal/logging-demo/default.nix b/distros/crystal/logging-demo/default.nix
similarity index 100%
rename from crystal/logging-demo/default.nix
rename to distros/crystal/logging-demo/default.nix
diff --git a/crystal/map-msgs/default.nix b/distros/crystal/map-msgs/default.nix
similarity index 100%
rename from crystal/map-msgs/default.nix
rename to distros/crystal/map-msgs/default.nix
diff --git a/crystal/message-filters/default.nix b/distros/crystal/message-filters/default.nix
similarity index 100%
rename from crystal/message-filters/default.nix
rename to distros/crystal/message-filters/default.nix
diff --git a/crystal/micro-xrce-dds-agent/default.nix b/distros/crystal/micro-xrce-dds-agent/default.nix
similarity index 100%
rename from crystal/micro-xrce-dds-agent/default.nix
rename to distros/crystal/micro-xrce-dds-agent/default.nix
diff --git a/crystal/microxrcedds-agent-cmake-module/default.nix b/distros/crystal/microxrcedds-agent-cmake-module/default.nix
similarity index 100%
rename from crystal/microxrcedds-agent-cmake-module/default.nix
rename to distros/crystal/microxrcedds-agent-cmake-module/default.nix
diff --git a/crystal/microxrcedds-agent/default.nix b/distros/crystal/microxrcedds-agent/default.nix
similarity index 100%
rename from crystal/microxrcedds-agent/default.nix
rename to distros/crystal/microxrcedds-agent/default.nix
diff --git a/crystal/ml-classifiers/default.nix b/distros/crystal/ml-classifiers/default.nix
similarity index 100%
rename from crystal/ml-classifiers/default.nix
rename to distros/crystal/ml-classifiers/default.nix
diff --git a/crystal/mrpt2/default.nix b/distros/crystal/mrpt2/default.nix
similarity index 100%
rename from crystal/mrpt2/default.nix
rename to distros/crystal/mrpt2/default.nix
diff --git a/crystal/nav-2d-msgs/default.nix b/distros/crystal/nav-2d-msgs/default.nix
similarity index 100%
rename from crystal/nav-2d-msgs/default.nix
rename to distros/crystal/nav-2d-msgs/default.nix
diff --git a/crystal/nav-2d-utils/default.nix b/distros/crystal/nav-2d-utils/default.nix
similarity index 100%
rename from crystal/nav-2d-utils/default.nix
rename to distros/crystal/nav-2d-utils/default.nix
diff --git a/crystal/nav-msgs/default.nix b/distros/crystal/nav-msgs/default.nix
similarity index 100%
rename from crystal/nav-msgs/default.nix
rename to distros/crystal/nav-msgs/default.nix
diff --git a/crystal/nav2-amcl/default.nix b/distros/crystal/nav2-amcl/default.nix
similarity index 100%
rename from crystal/nav2-amcl/default.nix
rename to distros/crystal/nav2-amcl/default.nix
diff --git a/crystal/nav2-bringup/default.nix b/distros/crystal/nav2-bringup/default.nix
similarity index 100%
rename from crystal/nav2-bringup/default.nix
rename to distros/crystal/nav2-bringup/default.nix
diff --git a/crystal/nav2-bt-navigator/default.nix b/distros/crystal/nav2-bt-navigator/default.nix
similarity index 100%
rename from crystal/nav2-bt-navigator/default.nix
rename to distros/crystal/nav2-bt-navigator/default.nix
diff --git a/crystal/nav2-common/default.nix b/distros/crystal/nav2-common/default.nix
similarity index 100%
rename from crystal/nav2-common/default.nix
rename to distros/crystal/nav2-common/default.nix
diff --git a/crystal/nav2-costmap-2d/default.nix b/distros/crystal/nav2-costmap-2d/default.nix
similarity index 100%
rename from crystal/nav2-costmap-2d/default.nix
rename to distros/crystal/nav2-costmap-2d/default.nix
diff --git a/crystal/nav2-dwb-controller/default.nix b/distros/crystal/nav2-dwb-controller/default.nix
similarity index 100%
rename from crystal/nav2-dwb-controller/default.nix
rename to distros/crystal/nav2-dwb-controller/default.nix
diff --git a/crystal/nav2-dynamic-params/default.nix b/distros/crystal/nav2-dynamic-params/default.nix
similarity index 100%
rename from crystal/nav2-dynamic-params/default.nix
rename to distros/crystal/nav2-dynamic-params/default.nix
diff --git a/crystal/nav2-map-server/default.nix b/distros/crystal/nav2-map-server/default.nix
similarity index 100%
rename from crystal/nav2-map-server/default.nix
rename to distros/crystal/nav2-map-server/default.nix
diff --git a/crystal/nav2-mission-executor/default.nix b/distros/crystal/nav2-mission-executor/default.nix
similarity index 100%
rename from crystal/nav2-mission-executor/default.nix
rename to distros/crystal/nav2-mission-executor/default.nix
diff --git a/crystal/nav2-motion-primitives/default.nix b/distros/crystal/nav2-motion-primitives/default.nix
similarity index 100%
rename from crystal/nav2-motion-primitives/default.nix
rename to distros/crystal/nav2-motion-primitives/default.nix
diff --git a/crystal/nav2-msgs/default.nix b/distros/crystal/nav2-msgs/default.nix
similarity index 100%
rename from crystal/nav2-msgs/default.nix
rename to distros/crystal/nav2-msgs/default.nix
diff --git a/crystal/nav2-navfn-planner/default.nix b/distros/crystal/nav2-navfn-planner/default.nix
similarity index 100%
rename from crystal/nav2-navfn-planner/default.nix
rename to distros/crystal/nav2-navfn-planner/default.nix
diff --git a/crystal/nav2-robot/default.nix b/distros/crystal/nav2-robot/default.nix
similarity index 100%
rename from crystal/nav2-robot/default.nix
rename to distros/crystal/nav2-robot/default.nix
diff --git a/crystal/nav2-simple-navigator/default.nix b/distros/crystal/nav2-simple-navigator/default.nix
similarity index 100%
rename from crystal/nav2-simple-navigator/default.nix
rename to distros/crystal/nav2-simple-navigator/default.nix
diff --git a/crystal/nav2-tasks/default.nix b/distros/crystal/nav2-tasks/default.nix
similarity index 100%
rename from crystal/nav2-tasks/default.nix
rename to distros/crystal/nav2-tasks/default.nix
diff --git a/crystal/nav2-util/default.nix b/distros/crystal/nav2-util/default.nix
similarity index 100%
rename from crystal/nav2-util/default.nix
rename to distros/crystal/nav2-util/default.nix
diff --git a/crystal/nav2-voxel-grid/default.nix b/distros/crystal/nav2-voxel-grid/default.nix
similarity index 100%
rename from crystal/nav2-voxel-grid/default.nix
rename to distros/crystal/nav2-voxel-grid/default.nix
diff --git a/crystal/nav2-world-model/default.nix b/distros/crystal/nav2-world-model/default.nix
similarity index 100%
rename from crystal/nav2-world-model/default.nix
rename to distros/crystal/nav2-world-model/default.nix
diff --git a/crystal/navigation2/default.nix b/distros/crystal/navigation2/default.nix
similarity index 100%
rename from crystal/navigation2/default.nix
rename to distros/crystal/navigation2/default.nix
diff --git a/crystal/nmea-msgs/default.nix b/distros/crystal/nmea-msgs/default.nix
similarity index 100%
rename from crystal/nmea-msgs/default.nix
rename to distros/crystal/nmea-msgs/default.nix
diff --git a/crystal/object-analytics-msgs/default.nix b/distros/crystal/object-analytics-msgs/default.nix
similarity index 100%
rename from crystal/object-analytics-msgs/default.nix
rename to distros/crystal/object-analytics-msgs/default.nix
diff --git a/crystal/object-analytics-node/default.nix b/distros/crystal/object-analytics-node/default.nix
similarity index 100%
rename from crystal/object-analytics-node/default.nix
rename to distros/crystal/object-analytics-node/default.nix
diff --git a/crystal/object-analytics-rviz/default.nix b/distros/crystal/object-analytics-rviz/default.nix
similarity index 100%
rename from crystal/object-analytics-rviz/default.nix
rename to distros/crystal/object-analytics-rviz/default.nix
diff --git a/crystal/object-msgs/default.nix b/distros/crystal/object-msgs/default.nix
similarity index 100%
rename from crystal/object-msgs/default.nix
rename to distros/crystal/object-msgs/default.nix
diff --git a/crystal/opensplice-cmake-module/default.nix b/distros/crystal/opensplice-cmake-module/default.nix
similarity index 100%
rename from crystal/opensplice-cmake-module/default.nix
rename to distros/crystal/opensplice-cmake-module/default.nix
diff --git a/crystal/orocos-kdl/default.nix b/distros/crystal/orocos-kdl/default.nix
similarity index 100%
rename from crystal/orocos-kdl/default.nix
rename to distros/crystal/orocos-kdl/default.nix
diff --git a/crystal/osrf-pycommon/default.nix b/distros/crystal/osrf-pycommon/default.nix
similarity index 100%
rename from crystal/osrf-pycommon/default.nix
rename to distros/crystal/osrf-pycommon/default.nix
diff --git a/crystal/osrf-testing-tools-cpp/default.nix b/distros/crystal/osrf-testing-tools-cpp/default.nix
similarity index 100%
rename from crystal/osrf-testing-tools-cpp/default.nix
rename to distros/crystal/osrf-testing-tools-cpp/default.nix
diff --git a/crystal/overrides.nix b/distros/crystal/overrides.nix
similarity index 100%
rename from crystal/overrides.nix
rename to distros/crystal/overrides.nix
diff --git a/crystal/pcl-conversions/default.nix b/distros/crystal/pcl-conversions/default.nix
similarity index 100%
rename from crystal/pcl-conversions/default.nix
rename to distros/crystal/pcl-conversions/default.nix
diff --git a/crystal/pendulum-control/default.nix b/distros/crystal/pendulum-control/default.nix
similarity index 100%
rename from crystal/pendulum-control/default.nix
rename to distros/crystal/pendulum-control/default.nix
diff --git a/crystal/pendulum-msgs/default.nix b/distros/crystal/pendulum-msgs/default.nix
similarity index 100%
rename from crystal/pendulum-msgs/default.nix
rename to distros/crystal/pendulum-msgs/default.nix
diff --git a/crystal/pluginlib/default.nix b/distros/crystal/pluginlib/default.nix
similarity index 100%
rename from crystal/pluginlib/default.nix
rename to distros/crystal/pluginlib/default.nix
diff --git a/crystal/poco-vendor/default.nix b/distros/crystal/poco-vendor/default.nix
similarity index 100%
rename from crystal/poco-vendor/default.nix
rename to distros/crystal/poco-vendor/default.nix
diff --git a/crystal/px4-msgs/default.nix b/distros/crystal/px4-msgs/default.nix
similarity index 100%
rename from crystal/px4-msgs/default.nix
rename to distros/crystal/px4-msgs/default.nix
diff --git a/crystal/py-trees-ros-interfaces/default.nix b/distros/crystal/py-trees-ros-interfaces/default.nix
similarity index 100%
rename from crystal/py-trees-ros-interfaces/default.nix
rename to distros/crystal/py-trees-ros-interfaces/default.nix
diff --git a/crystal/python-cmake-module/default.nix b/distros/crystal/python-cmake-module/default.nix
similarity index 100%
rename from crystal/python-cmake-module/default.nix
rename to distros/crystal/python-cmake-module/default.nix
diff --git a/crystal/python-qt-binding/default.nix b/distros/crystal/python-qt-binding/default.nix
similarity index 100%
rename from crystal/python-qt-binding/default.nix
rename to distros/crystal/python-qt-binding/default.nix
diff --git a/crystal/qt-dotgraph/default.nix b/distros/crystal/qt-dotgraph/default.nix
similarity index 100%
rename from crystal/qt-dotgraph/default.nix
rename to distros/crystal/qt-dotgraph/default.nix
diff --git a/crystal/qt-gui-app/default.nix b/distros/crystal/qt-gui-app/default.nix
similarity index 100%
rename from crystal/qt-gui-app/default.nix
rename to distros/crystal/qt-gui-app/default.nix
diff --git a/crystal/qt-gui-core/default.nix b/distros/crystal/qt-gui-core/default.nix
similarity index 100%
rename from crystal/qt-gui-core/default.nix
rename to distros/crystal/qt-gui-core/default.nix
diff --git a/crystal/qt-gui-cpp/default.nix b/distros/crystal/qt-gui-cpp/default.nix
similarity index 100%
rename from crystal/qt-gui-cpp/default.nix
rename to distros/crystal/qt-gui-cpp/default.nix
diff --git a/crystal/qt-gui-py-common/default.nix b/distros/crystal/qt-gui-py-common/default.nix
similarity index 100%
rename from crystal/qt-gui-py-common/default.nix
rename to distros/crystal/qt-gui-py-common/default.nix
diff --git a/crystal/qt-gui/default.nix b/distros/crystal/qt-gui/default.nix
similarity index 100%
rename from crystal/qt-gui/default.nix
rename to distros/crystal/qt-gui/default.nix
diff --git a/crystal/rcl-action/default.nix b/distros/crystal/rcl-action/default.nix
similarity index 100%
rename from crystal/rcl-action/default.nix
rename to distros/crystal/rcl-action/default.nix
diff --git a/crystal/rcl-interfaces/default.nix b/distros/crystal/rcl-interfaces/default.nix
similarity index 100%
rename from crystal/rcl-interfaces/default.nix
rename to distros/crystal/rcl-interfaces/default.nix
diff --git a/crystal/rcl-lifecycle/default.nix b/distros/crystal/rcl-lifecycle/default.nix
similarity index 100%
rename from crystal/rcl-lifecycle/default.nix
rename to distros/crystal/rcl-lifecycle/default.nix
diff --git a/crystal/rcl-logging-log4cxx/default.nix b/distros/crystal/rcl-logging-log4cxx/default.nix
similarity index 100%
rename from crystal/rcl-logging-log4cxx/default.nix
rename to distros/crystal/rcl-logging-log4cxx/default.nix
diff --git a/crystal/rcl-logging-noop/default.nix b/distros/crystal/rcl-logging-noop/default.nix
similarity index 100%
rename from crystal/rcl-logging-noop/default.nix
rename to distros/crystal/rcl-logging-noop/default.nix
diff --git a/crystal/rcl-yaml-param-parser/default.nix b/distros/crystal/rcl-yaml-param-parser/default.nix
similarity index 100%
rename from crystal/rcl-yaml-param-parser/default.nix
rename to distros/crystal/rcl-yaml-param-parser/default.nix
diff --git a/crystal/rcl/default.nix b/distros/crystal/rcl/default.nix
similarity index 100%
rename from crystal/rcl/default.nix
rename to distros/crystal/rcl/default.nix
diff --git a/crystal/rclcpp-action/default.nix b/distros/crystal/rclcpp-action/default.nix
similarity index 100%
rename from crystal/rclcpp-action/default.nix
rename to distros/crystal/rclcpp-action/default.nix
diff --git a/crystal/rclcpp-lifecycle/default.nix b/distros/crystal/rclcpp-lifecycle/default.nix
similarity index 100%
rename from crystal/rclcpp-lifecycle/default.nix
rename to distros/crystal/rclcpp-lifecycle/default.nix
diff --git a/crystal/rclcpp/default.nix b/distros/crystal/rclcpp/default.nix
similarity index 100%
rename from crystal/rclcpp/default.nix
rename to distros/crystal/rclcpp/default.nix
diff --git a/crystal/rclpy/default.nix b/distros/crystal/rclpy/default.nix
similarity index 100%
rename from crystal/rclpy/default.nix
rename to distros/crystal/rclpy/default.nix
diff --git a/crystal/rcutils/default.nix b/distros/crystal/rcutils/default.nix
similarity index 100%
rename from crystal/rcutils/default.nix
rename to distros/crystal/rcutils/default.nix
diff --git a/crystal/realsense-camera-msgs/default.nix b/distros/crystal/realsense-camera-msgs/default.nix
similarity index 100%
rename from crystal/realsense-camera-msgs/default.nix
rename to distros/crystal/realsense-camera-msgs/default.nix
diff --git a/crystal/realsense-ros2-camera/default.nix b/distros/crystal/realsense-ros2-camera/default.nix
similarity index 100%
rename from crystal/realsense-ros2-camera/default.nix
rename to distros/crystal/realsense-ros2-camera/default.nix
diff --git a/crystal/resource-retriever/default.nix b/distros/crystal/resource-retriever/default.nix
similarity index 100%
rename from crystal/resource-retriever/default.nix
rename to distros/crystal/resource-retriever/default.nix
diff --git a/crystal/rmw-connext-cpp/default.nix b/distros/crystal/rmw-connext-cpp/default.nix
similarity index 100%
rename from crystal/rmw-connext-cpp/default.nix
rename to distros/crystal/rmw-connext-cpp/default.nix
diff --git a/crystal/rmw-connext-shared-cpp/default.nix b/distros/crystal/rmw-connext-shared-cpp/default.nix
similarity index 100%
rename from crystal/rmw-connext-shared-cpp/default.nix
rename to distros/crystal/rmw-connext-shared-cpp/default.nix
diff --git a/crystal/rmw-fastrtps-cpp/default.nix b/distros/crystal/rmw-fastrtps-cpp/default.nix
similarity index 100%
rename from crystal/rmw-fastrtps-cpp/default.nix
rename to distros/crystal/rmw-fastrtps-cpp/default.nix
diff --git a/crystal/rmw-fastrtps-dynamic-cpp/default.nix b/distros/crystal/rmw-fastrtps-dynamic-cpp/default.nix
similarity index 100%
rename from crystal/rmw-fastrtps-dynamic-cpp/default.nix
rename to distros/crystal/rmw-fastrtps-dynamic-cpp/default.nix
diff --git a/crystal/rmw-fastrtps-shared-cpp/default.nix b/distros/crystal/rmw-fastrtps-shared-cpp/default.nix
similarity index 100%
rename from crystal/rmw-fastrtps-shared-cpp/default.nix
rename to distros/crystal/rmw-fastrtps-shared-cpp/default.nix
diff --git a/crystal/rmw-implementation-cmake/default.nix b/distros/crystal/rmw-implementation-cmake/default.nix
similarity index 100%
rename from crystal/rmw-implementation-cmake/default.nix
rename to distros/crystal/rmw-implementation-cmake/default.nix
diff --git a/crystal/rmw-implementation/default.nix b/distros/crystal/rmw-implementation/default.nix
similarity index 100%
rename from crystal/rmw-implementation/default.nix
rename to distros/crystal/rmw-implementation/default.nix
diff --git a/crystal/rmw-opensplice-cpp/default.nix b/distros/crystal/rmw-opensplice-cpp/default.nix
similarity index 100%
rename from crystal/rmw-opensplice-cpp/default.nix
rename to distros/crystal/rmw-opensplice-cpp/default.nix
diff --git a/crystal/rmw/default.nix b/distros/crystal/rmw/default.nix
similarity index 100%
rename from crystal/rmw/default.nix
rename to distros/crystal/rmw/default.nix
diff --git a/crystal/robot-state-publisher/default.nix b/distros/crystal/robot-state-publisher/default.nix
similarity index 100%
rename from crystal/robot-state-publisher/default.nix
rename to distros/crystal/robot-state-publisher/default.nix
diff --git a/crystal/ros-base/default.nix b/distros/crystal/ros-base/default.nix
similarity index 100%
rename from crystal/ros-base/default.nix
rename to distros/crystal/ros-base/default.nix
diff --git a/crystal/ros-core/default.nix b/distros/crystal/ros-core/default.nix
similarity index 100%
rename from crystal/ros-core/default.nix
rename to distros/crystal/ros-core/default.nix
diff --git a/crystal/ros-environment/default.nix b/distros/crystal/ros-environment/default.nix
similarity index 100%
rename from crystal/ros-environment/default.nix
rename to distros/crystal/ros-environment/default.nix
diff --git a/crystal/ros-workspace/default.nix b/distros/crystal/ros-workspace/default.nix
similarity index 100%
rename from crystal/ros-workspace/default.nix
rename to distros/crystal/ros-workspace/default.nix
diff --git a/crystal/ros1-bridge/default.nix b/distros/crystal/ros1-bridge/default.nix
similarity index 100%
rename from crystal/ros1-bridge/default.nix
rename to distros/crystal/ros1-bridge/default.nix
diff --git a/crystal/ros1-rosbag-storage-vendor/default.nix b/distros/crystal/ros1-rosbag-storage-vendor/default.nix
similarity index 100%
rename from crystal/ros1-rosbag-storage-vendor/default.nix
rename to distros/crystal/ros1-rosbag-storage-vendor/default.nix
diff --git a/crystal/ros2bag/default.nix b/distros/crystal/ros2bag/default.nix
similarity index 100%
rename from crystal/ros2bag/default.nix
rename to distros/crystal/ros2bag/default.nix
diff --git a/crystal/ros2cli/default.nix b/distros/crystal/ros2cli/default.nix
similarity index 100%
rename from crystal/ros2cli/default.nix
rename to distros/crystal/ros2cli/default.nix
diff --git a/crystal/ros2launch/default.nix b/distros/crystal/ros2launch/default.nix
similarity index 100%
rename from crystal/ros2launch/default.nix
rename to distros/crystal/ros2launch/default.nix
diff --git a/crystal/ros2lifecycle/default.nix b/distros/crystal/ros2lifecycle/default.nix
similarity index 100%
rename from crystal/ros2lifecycle/default.nix
rename to distros/crystal/ros2lifecycle/default.nix
diff --git a/crystal/ros2msg/default.nix b/distros/crystal/ros2msg/default.nix
similarity index 100%
rename from crystal/ros2msg/default.nix
rename to distros/crystal/ros2msg/default.nix
diff --git a/crystal/ros2multicast/default.nix b/distros/crystal/ros2multicast/default.nix
similarity index 100%
rename from crystal/ros2multicast/default.nix
rename to distros/crystal/ros2multicast/default.nix
diff --git a/crystal/ros2node/default.nix b/distros/crystal/ros2node/default.nix
similarity index 100%
rename from crystal/ros2node/default.nix
rename to distros/crystal/ros2node/default.nix
diff --git a/crystal/ros2param/default.nix b/distros/crystal/ros2param/default.nix
similarity index 100%
rename from crystal/ros2param/default.nix
rename to distros/crystal/ros2param/default.nix
diff --git a/crystal/ros2pkg/default.nix b/distros/crystal/ros2pkg/default.nix
similarity index 100%
rename from crystal/ros2pkg/default.nix
rename to distros/crystal/ros2pkg/default.nix
diff --git a/crystal/ros2run/default.nix b/distros/crystal/ros2run/default.nix
similarity index 100%
rename from crystal/ros2run/default.nix
rename to distros/crystal/ros2run/default.nix
diff --git a/crystal/ros2service/default.nix b/distros/crystal/ros2service/default.nix
similarity index 100%
rename from crystal/ros2service/default.nix
rename to distros/crystal/ros2service/default.nix
diff --git a/crystal/ros2srv/default.nix b/distros/crystal/ros2srv/default.nix
similarity index 100%
rename from crystal/ros2srv/default.nix
rename to distros/crystal/ros2srv/default.nix
diff --git a/crystal/ros2topic/default.nix b/distros/crystal/ros2topic/default.nix
similarity index 100%
rename from crystal/ros2topic/default.nix
rename to distros/crystal/ros2topic/default.nix
diff --git a/crystal/rosbag2-bag-v2-plugins/default.nix b/distros/crystal/rosbag2-bag-v2-plugins/default.nix
similarity index 100%
rename from crystal/rosbag2-bag-v2-plugins/default.nix
rename to distros/crystal/rosbag2-bag-v2-plugins/default.nix
diff --git a/crystal/rosbag2-converter-default-plugins/default.nix b/distros/crystal/rosbag2-converter-default-plugins/default.nix
similarity index 100%
rename from crystal/rosbag2-converter-default-plugins/default.nix
rename to distros/crystal/rosbag2-converter-default-plugins/default.nix
diff --git a/crystal/rosbag2-storage-default-plugins/default.nix b/distros/crystal/rosbag2-storage-default-plugins/default.nix
similarity index 100%
rename from crystal/rosbag2-storage-default-plugins/default.nix
rename to distros/crystal/rosbag2-storage-default-plugins/default.nix
diff --git a/crystal/rosbag2-storage/default.nix b/distros/crystal/rosbag2-storage/default.nix
similarity index 100%
rename from crystal/rosbag2-storage/default.nix
rename to distros/crystal/rosbag2-storage/default.nix
diff --git a/crystal/rosbag2-test-common/default.nix b/distros/crystal/rosbag2-test-common/default.nix
similarity index 100%
rename from crystal/rosbag2-test-common/default.nix
rename to distros/crystal/rosbag2-test-common/default.nix
diff --git a/crystal/rosbag2-tests/default.nix b/distros/crystal/rosbag2-tests/default.nix
similarity index 100%
rename from crystal/rosbag2-tests/default.nix
rename to distros/crystal/rosbag2-tests/default.nix
diff --git a/crystal/rosbag2-transport/default.nix b/distros/crystal/rosbag2-transport/default.nix
similarity index 100%
rename from crystal/rosbag2-transport/default.nix
rename to distros/crystal/rosbag2-transport/default.nix
diff --git a/crystal/rosbag2/default.nix b/distros/crystal/rosbag2/default.nix
similarity index 100%
rename from crystal/rosbag2/default.nix
rename to distros/crystal/rosbag2/default.nix
diff --git a/crystal/rosgraph-msgs/default.nix b/distros/crystal/rosgraph-msgs/default.nix
similarity index 100%
rename from crystal/rosgraph-msgs/default.nix
rename to distros/crystal/rosgraph-msgs/default.nix
diff --git a/crystal/rosidl-actions/default.nix b/distros/crystal/rosidl-actions/default.nix
similarity index 100%
rename from crystal/rosidl-actions/default.nix
rename to distros/crystal/rosidl-actions/default.nix
diff --git a/crystal/rosidl-adapter/default.nix b/distros/crystal/rosidl-adapter/default.nix
similarity index 100%
rename from crystal/rosidl-adapter/default.nix
rename to distros/crystal/rosidl-adapter/default.nix
diff --git a/crystal/rosidl-cmake/default.nix b/distros/crystal/rosidl-cmake/default.nix
similarity index 100%
rename from crystal/rosidl-cmake/default.nix
rename to distros/crystal/rosidl-cmake/default.nix
diff --git a/crystal/rosidl-default-generators/default.nix b/distros/crystal/rosidl-default-generators/default.nix
similarity index 100%
rename from crystal/rosidl-default-generators/default.nix
rename to distros/crystal/rosidl-default-generators/default.nix
diff --git a/crystal/rosidl-default-runtime/default.nix b/distros/crystal/rosidl-default-runtime/default.nix
similarity index 100%
rename from crystal/rosidl-default-runtime/default.nix
rename to distros/crystal/rosidl-default-runtime/default.nix
diff --git a/crystal/rosidl-generator-c/default.nix b/distros/crystal/rosidl-generator-c/default.nix
similarity index 100%
rename from crystal/rosidl-generator-c/default.nix
rename to distros/crystal/rosidl-generator-c/default.nix
diff --git a/crystal/rosidl-generator-cpp/default.nix b/distros/crystal/rosidl-generator-cpp/default.nix
similarity index 100%
rename from crystal/rosidl-generator-cpp/default.nix
rename to distros/crystal/rosidl-generator-cpp/default.nix
diff --git a/crystal/rosidl-generator-dds-idl/default.nix b/distros/crystal/rosidl-generator-dds-idl/default.nix
similarity index 100%
rename from crystal/rosidl-generator-dds-idl/default.nix
rename to distros/crystal/rosidl-generator-dds-idl/default.nix
diff --git a/crystal/rosidl-generator-py/default.nix b/distros/crystal/rosidl-generator-py/default.nix
similarity index 100%
rename from crystal/rosidl-generator-py/default.nix
rename to distros/crystal/rosidl-generator-py/default.nix
diff --git a/crystal/rosidl-parser/default.nix b/distros/crystal/rosidl-parser/default.nix
similarity index 100%
rename from crystal/rosidl-parser/default.nix
rename to distros/crystal/rosidl-parser/default.nix
diff --git a/crystal/rosidl-typesupport-c/default.nix b/distros/crystal/rosidl-typesupport-c/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-c/default.nix
rename to distros/crystal/rosidl-typesupport-c/default.nix
diff --git a/crystal/rosidl-typesupport-connext-c/default.nix b/distros/crystal/rosidl-typesupport-connext-c/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-connext-c/default.nix
rename to distros/crystal/rosidl-typesupport-connext-c/default.nix
diff --git a/crystal/rosidl-typesupport-connext-cpp/default.nix b/distros/crystal/rosidl-typesupport-connext-cpp/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-connext-cpp/default.nix
rename to distros/crystal/rosidl-typesupport-connext-cpp/default.nix
diff --git a/crystal/rosidl-typesupport-cpp/default.nix b/distros/crystal/rosidl-typesupport-cpp/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-cpp/default.nix
rename to distros/crystal/rosidl-typesupport-cpp/default.nix
diff --git a/crystal/rosidl-typesupport-fastrtps-c/default.nix b/distros/crystal/rosidl-typesupport-fastrtps-c/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-fastrtps-c/default.nix
rename to distros/crystal/rosidl-typesupport-fastrtps-c/default.nix
diff --git a/crystal/rosidl-typesupport-fastrtps-cpp/default.nix b/distros/crystal/rosidl-typesupport-fastrtps-cpp/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-fastrtps-cpp/default.nix
rename to distros/crystal/rosidl-typesupport-fastrtps-cpp/default.nix
diff --git a/crystal/rosidl-typesupport-interface/default.nix b/distros/crystal/rosidl-typesupport-interface/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-interface/default.nix
rename to distros/crystal/rosidl-typesupport-interface/default.nix
diff --git a/crystal/rosidl-typesupport-introspection-c/default.nix b/distros/crystal/rosidl-typesupport-introspection-c/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-introspection-c/default.nix
rename to distros/crystal/rosidl-typesupport-introspection-c/default.nix
diff --git a/crystal/rosidl-typesupport-introspection-cpp/default.nix b/distros/crystal/rosidl-typesupport-introspection-cpp/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-introspection-cpp/default.nix
rename to distros/crystal/rosidl-typesupport-introspection-cpp/default.nix
diff --git a/crystal/rosidl-typesupport-opensplice-c/default.nix b/distros/crystal/rosidl-typesupport-opensplice-c/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-opensplice-c/default.nix
rename to distros/crystal/rosidl-typesupport-opensplice-c/default.nix
diff --git a/crystal/rosidl-typesupport-opensplice-cpp/default.nix b/distros/crystal/rosidl-typesupport-opensplice-cpp/default.nix
similarity index 100%
rename from crystal/rosidl-typesupport-opensplice-cpp/default.nix
rename to distros/crystal/rosidl-typesupport-opensplice-cpp/default.nix
diff --git a/crystal/rqt-action/default.nix b/distros/crystal/rqt-action/default.nix
similarity index 100%
rename from crystal/rqt-action/default.nix
rename to distros/crystal/rqt-action/default.nix
diff --git a/crystal/rqt-console/default.nix b/distros/crystal/rqt-console/default.nix
similarity index 100%
rename from crystal/rqt-console/default.nix
rename to distros/crystal/rqt-console/default.nix
diff --git a/crystal/rqt-graph/default.nix b/distros/crystal/rqt-graph/default.nix
similarity index 100%
rename from crystal/rqt-graph/default.nix
rename to distros/crystal/rqt-graph/default.nix
diff --git a/crystal/rqt-gui-cpp/default.nix b/distros/crystal/rqt-gui-cpp/default.nix
similarity index 100%
rename from crystal/rqt-gui-cpp/default.nix
rename to distros/crystal/rqt-gui-cpp/default.nix
diff --git a/crystal/rqt-gui-py/default.nix b/distros/crystal/rqt-gui-py/default.nix
similarity index 100%
rename from crystal/rqt-gui-py/default.nix
rename to distros/crystal/rqt-gui-py/default.nix
diff --git a/crystal/rqt-gui/default.nix b/distros/crystal/rqt-gui/default.nix
similarity index 100%
rename from crystal/rqt-gui/default.nix
rename to distros/crystal/rqt-gui/default.nix
diff --git a/crystal/rqt-image-view/default.nix b/distros/crystal/rqt-image-view/default.nix
similarity index 100%
rename from crystal/rqt-image-view/default.nix
rename to distros/crystal/rqt-image-view/default.nix
diff --git a/crystal/rqt-msg/default.nix b/distros/crystal/rqt-msg/default.nix
similarity index 100%
rename from crystal/rqt-msg/default.nix
rename to distros/crystal/rqt-msg/default.nix
diff --git a/crystal/rqt-plot/default.nix b/distros/crystal/rqt-plot/default.nix
similarity index 100%
rename from crystal/rqt-plot/default.nix
rename to distros/crystal/rqt-plot/default.nix
diff --git a/crystal/rqt-publisher/default.nix b/distros/crystal/rqt-publisher/default.nix
similarity index 100%
rename from crystal/rqt-publisher/default.nix
rename to distros/crystal/rqt-publisher/default.nix
diff --git a/crystal/rqt-py-common/default.nix b/distros/crystal/rqt-py-common/default.nix
similarity index 100%
rename from crystal/rqt-py-common/default.nix
rename to distros/crystal/rqt-py-common/default.nix
diff --git a/crystal/rqt-py-console/default.nix b/distros/crystal/rqt-py-console/default.nix
similarity index 100%
rename from crystal/rqt-py-console/default.nix
rename to distros/crystal/rqt-py-console/default.nix
diff --git a/crystal/rqt-service-caller/default.nix b/distros/crystal/rqt-service-caller/default.nix
similarity index 100%
rename from crystal/rqt-service-caller/default.nix
rename to distros/crystal/rqt-service-caller/default.nix
diff --git a/crystal/rqt-shell/default.nix b/distros/crystal/rqt-shell/default.nix
similarity index 100%
rename from crystal/rqt-shell/default.nix
rename to distros/crystal/rqt-shell/default.nix
diff --git a/crystal/rqt-srv/default.nix b/distros/crystal/rqt-srv/default.nix
similarity index 100%
rename from crystal/rqt-srv/default.nix
rename to distros/crystal/rqt-srv/default.nix
diff --git a/crystal/rqt-top/default.nix b/distros/crystal/rqt-top/default.nix
similarity index 100%
rename from crystal/rqt-top/default.nix
rename to distros/crystal/rqt-top/default.nix
diff --git a/crystal/rqt-topic/default.nix b/distros/crystal/rqt-topic/default.nix
similarity index 100%
rename from crystal/rqt-topic/default.nix
rename to distros/crystal/rqt-topic/default.nix
diff --git a/crystal/rqt/default.nix b/distros/crystal/rqt/default.nix
similarity index 100%
rename from crystal/rqt/default.nix
rename to distros/crystal/rqt/default.nix
diff --git a/crystal/rttest/default.nix b/distros/crystal/rttest/default.nix
similarity index 100%
rename from crystal/rttest/default.nix
rename to distros/crystal/rttest/default.nix
diff --git a/crystal/rviz-assimp-vendor/default.nix b/distros/crystal/rviz-assimp-vendor/default.nix
similarity index 100%
rename from crystal/rviz-assimp-vendor/default.nix
rename to distros/crystal/rviz-assimp-vendor/default.nix
diff --git a/crystal/rviz-common/default.nix b/distros/crystal/rviz-common/default.nix
similarity index 100%
rename from crystal/rviz-common/default.nix
rename to distros/crystal/rviz-common/default.nix
diff --git a/crystal/rviz-default-plugins/default.nix b/distros/crystal/rviz-default-plugins/default.nix
similarity index 100%
rename from crystal/rviz-default-plugins/default.nix
rename to distros/crystal/rviz-default-plugins/default.nix
diff --git a/crystal/rviz-ogre-vendor/default.nix b/distros/crystal/rviz-ogre-vendor/default.nix
similarity index 100%
rename from crystal/rviz-ogre-vendor/default.nix
rename to distros/crystal/rviz-ogre-vendor/default.nix
diff --git a/crystal/rviz-rendering-tests/default.nix b/distros/crystal/rviz-rendering-tests/default.nix
similarity index 100%
rename from crystal/rviz-rendering-tests/default.nix
rename to distros/crystal/rviz-rendering-tests/default.nix
diff --git a/crystal/rviz-rendering/default.nix b/distros/crystal/rviz-rendering/default.nix
similarity index 100%
rename from crystal/rviz-rendering/default.nix
rename to distros/crystal/rviz-rendering/default.nix
diff --git a/crystal/rviz-visual-testing-framework/default.nix b/distros/crystal/rviz-visual-testing-framework/default.nix
similarity index 100%
rename from crystal/rviz-visual-testing-framework/default.nix
rename to distros/crystal/rviz-visual-testing-framework/default.nix
diff --git a/crystal/rviz2/default.nix b/distros/crystal/rviz2/default.nix
similarity index 100%
rename from crystal/rviz2/default.nix
rename to distros/crystal/rviz2/default.nix
diff --git a/crystal/sensor-msgs/default.nix b/distros/crystal/sensor-msgs/default.nix
similarity index 100%
rename from crystal/sensor-msgs/default.nix
rename to distros/crystal/sensor-msgs/default.nix
diff --git a/crystal/shape-msgs/default.nix b/distros/crystal/shape-msgs/default.nix
similarity index 100%
rename from crystal/shape-msgs/default.nix
rename to distros/crystal/shape-msgs/default.nix
diff --git a/crystal/shared-queues-vendor/default.nix b/distros/crystal/shared-queues-vendor/default.nix
similarity index 100%
rename from crystal/shared-queues-vendor/default.nix
rename to distros/crystal/shared-queues-vendor/default.nix
diff --git a/crystal/sophus/default.nix b/distros/crystal/sophus/default.nix
similarity index 100%
rename from crystal/sophus/default.nix
rename to distros/crystal/sophus/default.nix
diff --git a/crystal/sqlite3-vendor/default.nix b/distros/crystal/sqlite3-vendor/default.nix
similarity index 100%
rename from crystal/sqlite3-vendor/default.nix
rename to distros/crystal/sqlite3-vendor/default.nix
diff --git a/crystal/sros2-cmake/default.nix b/distros/crystal/sros2-cmake/default.nix
similarity index 100%
rename from crystal/sros2-cmake/default.nix
rename to distros/crystal/sros2-cmake/default.nix
diff --git a/crystal/sros2/default.nix b/distros/crystal/sros2/default.nix
similarity index 100%
rename from crystal/sros2/default.nix
rename to distros/crystal/sros2/default.nix
diff --git a/crystal/std-msgs/default.nix b/distros/crystal/std-msgs/default.nix
similarity index 100%
rename from crystal/std-msgs/default.nix
rename to distros/crystal/std-msgs/default.nix
diff --git a/crystal/std-srvs/default.nix b/distros/crystal/std-srvs/default.nix
similarity index 100%
rename from crystal/std-srvs/default.nix
rename to distros/crystal/std-srvs/default.nix
diff --git a/crystal/stereo-msgs/default.nix b/distros/crystal/stereo-msgs/default.nix
similarity index 100%
rename from crystal/stereo-msgs/default.nix
rename to distros/crystal/stereo-msgs/default.nix
diff --git a/crystal/system-modes-examples/default.nix b/distros/crystal/system-modes-examples/default.nix
similarity index 100%
rename from crystal/system-modes-examples/default.nix
rename to distros/crystal/system-modes-examples/default.nix
diff --git a/crystal/system-modes/default.nix b/distros/crystal/system-modes/default.nix
similarity index 100%
rename from crystal/system-modes/default.nix
rename to distros/crystal/system-modes/default.nix
diff --git a/crystal/teleop-twist-joy/default.nix b/distros/crystal/teleop-twist-joy/default.nix
similarity index 100%
rename from crystal/teleop-twist-joy/default.nix
rename to distros/crystal/teleop-twist-joy/default.nix
diff --git a/crystal/teleop-twist-keyboard/default.nix b/distros/crystal/teleop-twist-keyboard/default.nix
similarity index 100%
rename from crystal/teleop-twist-keyboard/default.nix
rename to distros/crystal/teleop-twist-keyboard/default.nix
diff --git a/crystal/test-msgs/default.nix b/distros/crystal/test-msgs/default.nix
similarity index 100%
rename from crystal/test-msgs/default.nix
rename to distros/crystal/test-msgs/default.nix
diff --git a/crystal/test-osrf-testing-tools-cpp/default.nix b/distros/crystal/test-osrf-testing-tools-cpp/default.nix
similarity index 100%
rename from crystal/test-osrf-testing-tools-cpp/default.nix
rename to distros/crystal/test-osrf-testing-tools-cpp/default.nix
diff --git a/crystal/tf2-eigen/default.nix b/distros/crystal/tf2-eigen/default.nix
similarity index 100%
rename from crystal/tf2-eigen/default.nix
rename to distros/crystal/tf2-eigen/default.nix
diff --git a/crystal/tf2-geometry-msgs/default.nix b/distros/crystal/tf2-geometry-msgs/default.nix
similarity index 100%
rename from crystal/tf2-geometry-msgs/default.nix
rename to distros/crystal/tf2-geometry-msgs/default.nix
diff --git a/crystal/tf2-msgs/default.nix b/distros/crystal/tf2-msgs/default.nix
similarity index 100%
rename from crystal/tf2-msgs/default.nix
rename to distros/crystal/tf2-msgs/default.nix
diff --git a/crystal/tf2-ros/default.nix b/distros/crystal/tf2-ros/default.nix
similarity index 100%
rename from crystal/tf2-ros/default.nix
rename to distros/crystal/tf2-ros/default.nix
diff --git a/crystal/tf2-sensor-msgs/default.nix b/distros/crystal/tf2-sensor-msgs/default.nix
similarity index 100%
rename from crystal/tf2-sensor-msgs/default.nix
rename to distros/crystal/tf2-sensor-msgs/default.nix
diff --git a/crystal/tf2/default.nix b/distros/crystal/tf2/default.nix
similarity index 100%
rename from crystal/tf2/default.nix
rename to distros/crystal/tf2/default.nix
diff --git a/crystal/theora-image-transport/default.nix b/distros/crystal/theora-image-transport/default.nix
similarity index 100%
rename from crystal/theora-image-transport/default.nix
rename to distros/crystal/theora-image-transport/default.nix
diff --git a/crystal/tinydir-vendor/default.nix b/distros/crystal/tinydir-vendor/default.nix
similarity index 100%
rename from crystal/tinydir-vendor/default.nix
rename to distros/crystal/tinydir-vendor/default.nix
diff --git a/crystal/tinyxml-vendor/default.nix b/distros/crystal/tinyxml-vendor/default.nix
similarity index 100%
rename from crystal/tinyxml-vendor/default.nix
rename to distros/crystal/tinyxml-vendor/default.nix
diff --git a/crystal/tinyxml2-vendor/default.nix b/distros/crystal/tinyxml2-vendor/default.nix
similarity index 100%
rename from crystal/tinyxml2-vendor/default.nix
rename to distros/crystal/tinyxml2-vendor/default.nix
diff --git a/crystal/tlsf-cpp/default.nix b/distros/crystal/tlsf-cpp/default.nix
similarity index 100%
rename from crystal/tlsf-cpp/default.nix
rename to distros/crystal/tlsf-cpp/default.nix
diff --git a/crystal/tlsf/default.nix b/distros/crystal/tlsf/default.nix
similarity index 100%
rename from crystal/tlsf/default.nix
rename to distros/crystal/tlsf/default.nix
diff --git a/crystal/topic-monitor/default.nix b/distros/crystal/topic-monitor/default.nix
similarity index 100%
rename from crystal/topic-monitor/default.nix
rename to distros/crystal/topic-monitor/default.nix
diff --git a/crystal/trajectory-msgs/default.nix b/distros/crystal/trajectory-msgs/default.nix
similarity index 100%
rename from crystal/trajectory-msgs/default.nix
rename to distros/crystal/trajectory-msgs/default.nix
diff --git a/crystal/uncrustify-vendor/default.nix b/distros/crystal/uncrustify-vendor/default.nix
similarity index 100%
rename from crystal/uncrustify-vendor/default.nix
rename to distros/crystal/uncrustify-vendor/default.nix
diff --git a/crystal/unique-identifier-msgs/default.nix b/distros/crystal/unique-identifier-msgs/default.nix
similarity index 100%
rename from crystal/unique-identifier-msgs/default.nix
rename to distros/crystal/unique-identifier-msgs/default.nix
diff --git a/crystal/urdf/default.nix b/distros/crystal/urdf/default.nix
similarity index 100%
rename from crystal/urdf/default.nix
rename to distros/crystal/urdf/default.nix
diff --git a/crystal/urdfdom-headers/default.nix b/distros/crystal/urdfdom-headers/default.nix
similarity index 100%
rename from crystal/urdfdom-headers/default.nix
rename to distros/crystal/urdfdom-headers/default.nix
diff --git a/crystal/urdfdom/default.nix b/distros/crystal/urdfdom/default.nix
similarity index 100%
rename from crystal/urdfdom/default.nix
rename to distros/crystal/urdfdom/default.nix
diff --git a/crystal/vision-opencv/default.nix b/distros/crystal/vision-opencv/default.nix
similarity index 100%
rename from crystal/vision-opencv/default.nix
rename to distros/crystal/vision-opencv/default.nix
diff --git a/crystal/visualization-msgs/default.nix b/distros/crystal/visualization-msgs/default.nix
similarity index 100%
rename from crystal/visualization-msgs/default.nix
rename to distros/crystal/visualization-msgs/default.nix
diff --git a/crystal/webots-ros2-core/default.nix b/distros/crystal/webots-ros2-core/default.nix
similarity index 100%
rename from crystal/webots-ros2-core/default.nix
rename to distros/crystal/webots-ros2-core/default.nix
diff --git a/crystal/webots-ros2-desktop/default.nix b/distros/crystal/webots-ros2-desktop/default.nix
similarity index 100%
rename from crystal/webots-ros2-desktop/default.nix
rename to distros/crystal/webots-ros2-desktop/default.nix
diff --git a/crystal/webots-ros2-examples/default.nix b/distros/crystal/webots-ros2-examples/default.nix
similarity index 100%
rename from crystal/webots-ros2-examples/default.nix
rename to distros/crystal/webots-ros2-examples/default.nix
diff --git a/crystal/webots-ros2-msgs/default.nix b/distros/crystal/webots-ros2-msgs/default.nix
similarity index 100%
rename from crystal/webots-ros2-msgs/default.nix
rename to distros/crystal/webots-ros2-msgs/default.nix
diff --git a/crystal/webots-ros2-universal-robot/default.nix b/distros/crystal/webots-ros2-universal-robot/default.nix
similarity index 100%
rename from crystal/webots-ros2-universal-robot/default.nix
rename to distros/crystal/webots-ros2-universal-robot/default.nix
diff --git a/crystal/webots-ros2/default.nix b/distros/crystal/webots-ros2/default.nix
similarity index 100%
rename from crystal/webots-ros2/default.nix
rename to distros/crystal/webots-ros2/default.nix
diff --git a/crystal/xacro/default.nix b/distros/crystal/xacro/default.nix
similarity index 100%
rename from crystal/xacro/default.nix
rename to distros/crystal/xacro/default.nix
diff --git a/crystal/yaml-cpp-vendor/default.nix b/distros/crystal/yaml-cpp-vendor/default.nix
similarity index 100%
rename from crystal/yaml-cpp-vendor/default.nix
rename to distros/crystal/yaml-cpp-vendor/default.nix
diff --git a/dashing/ackermann-msgs/default.nix b/distros/dashing/ackermann-msgs/default.nix
similarity index 100%
rename from dashing/ackermann-msgs/default.nix
rename to distros/dashing/ackermann-msgs/default.nix
diff --git a/dashing/action-msgs/default.nix b/distros/dashing/action-msgs/default.nix
similarity index 100%
rename from dashing/action-msgs/default.nix
rename to distros/dashing/action-msgs/default.nix
diff --git a/dashing/action-tutorials/default.nix b/distros/dashing/action-tutorials/default.nix
similarity index 100%
rename from dashing/action-tutorials/default.nix
rename to distros/dashing/action-tutorials/default.nix
diff --git a/dashing/actionlib-msgs/default.nix b/distros/dashing/actionlib-msgs/default.nix
similarity index 100%
rename from dashing/actionlib-msgs/default.nix
rename to distros/dashing/actionlib-msgs/default.nix
diff --git a/dashing/ament-clang-format/default.nix b/distros/dashing/ament-clang-format/default.nix
similarity index 100%
rename from dashing/ament-clang-format/default.nix
rename to distros/dashing/ament-clang-format/default.nix
diff --git a/dashing/ament-clang-tidy/default.nix b/distros/dashing/ament-clang-tidy/default.nix
similarity index 100%
rename from dashing/ament-clang-tidy/default.nix
rename to distros/dashing/ament-clang-tidy/default.nix
diff --git a/dashing/ament-cmake-auto/default.nix b/distros/dashing/ament-cmake-auto/default.nix
similarity index 100%
rename from dashing/ament-cmake-auto/default.nix
rename to distros/dashing/ament-cmake-auto/default.nix
diff --git a/dashing/ament-cmake-clang-format/default.nix b/distros/dashing/ament-cmake-clang-format/default.nix
similarity index 100%
rename from dashing/ament-cmake-clang-format/default.nix
rename to distros/dashing/ament-cmake-clang-format/default.nix
diff --git a/dashing/ament-cmake-clang-tidy/default.nix b/distros/dashing/ament-cmake-clang-tidy/default.nix
similarity index 100%
rename from dashing/ament-cmake-clang-tidy/default.nix
rename to distros/dashing/ament-cmake-clang-tidy/default.nix
diff --git a/dashing/ament-cmake-copyright/default.nix b/distros/dashing/ament-cmake-copyright/default.nix
similarity index 100%
rename from dashing/ament-cmake-copyright/default.nix
rename to distros/dashing/ament-cmake-copyright/default.nix
diff --git a/dashing/ament-cmake-core/default.nix b/distros/dashing/ament-cmake-core/default.nix
similarity index 100%
rename from dashing/ament-cmake-core/default.nix
rename to distros/dashing/ament-cmake-core/default.nix
diff --git a/dashing/ament-cmake-cppcheck/default.nix b/distros/dashing/ament-cmake-cppcheck/default.nix
similarity index 100%
rename from dashing/ament-cmake-cppcheck/default.nix
rename to distros/dashing/ament-cmake-cppcheck/default.nix
diff --git a/dashing/ament-cmake-cpplint/default.nix b/distros/dashing/ament-cmake-cpplint/default.nix
similarity index 100%
rename from dashing/ament-cmake-cpplint/default.nix
rename to distros/dashing/ament-cmake-cpplint/default.nix
diff --git a/dashing/ament-cmake-export-definitions/default.nix b/distros/dashing/ament-cmake-export-definitions/default.nix
similarity index 100%
rename from dashing/ament-cmake-export-definitions/default.nix
rename to distros/dashing/ament-cmake-export-definitions/default.nix
diff --git a/dashing/ament-cmake-export-dependencies/default.nix b/distros/dashing/ament-cmake-export-dependencies/default.nix
similarity index 100%
rename from dashing/ament-cmake-export-dependencies/default.nix
rename to distros/dashing/ament-cmake-export-dependencies/default.nix
diff --git a/dashing/ament-cmake-export-include-directories/default.nix b/distros/dashing/ament-cmake-export-include-directories/default.nix
similarity index 100%
rename from dashing/ament-cmake-export-include-directories/default.nix
rename to distros/dashing/ament-cmake-export-include-directories/default.nix
diff --git a/dashing/ament-cmake-export-interfaces/default.nix b/distros/dashing/ament-cmake-export-interfaces/default.nix
similarity index 100%
rename from dashing/ament-cmake-export-interfaces/default.nix
rename to distros/dashing/ament-cmake-export-interfaces/default.nix
diff --git a/dashing/ament-cmake-export-libraries/default.nix b/distros/dashing/ament-cmake-export-libraries/default.nix
similarity index 100%
rename from dashing/ament-cmake-export-libraries/default.nix
rename to distros/dashing/ament-cmake-export-libraries/default.nix
diff --git a/dashing/ament-cmake-export-link-flags/default.nix b/distros/dashing/ament-cmake-export-link-flags/default.nix
similarity index 100%
rename from dashing/ament-cmake-export-link-flags/default.nix
rename to distros/dashing/ament-cmake-export-link-flags/default.nix
diff --git a/dashing/ament-cmake-flake8/default.nix b/distros/dashing/ament-cmake-flake8/default.nix
similarity index 100%
rename from dashing/ament-cmake-flake8/default.nix
rename to distros/dashing/ament-cmake-flake8/default.nix
diff --git a/dashing/ament-cmake-gmock/default.nix b/distros/dashing/ament-cmake-gmock/default.nix
similarity index 100%
rename from dashing/ament-cmake-gmock/default.nix
rename to distros/dashing/ament-cmake-gmock/default.nix
diff --git a/dashing/ament-cmake-gtest/default.nix b/distros/dashing/ament-cmake-gtest/default.nix
similarity index 100%
rename from dashing/ament-cmake-gtest/default.nix
rename to distros/dashing/ament-cmake-gtest/default.nix
diff --git a/dashing/ament-cmake-include-directories/default.nix b/distros/dashing/ament-cmake-include-directories/default.nix
similarity index 100%
rename from dashing/ament-cmake-include-directories/default.nix
rename to distros/dashing/ament-cmake-include-directories/default.nix
diff --git a/dashing/ament-cmake-libraries/default.nix b/distros/dashing/ament-cmake-libraries/default.nix
similarity index 100%
rename from dashing/ament-cmake-libraries/default.nix
rename to distros/dashing/ament-cmake-libraries/default.nix
diff --git a/dashing/ament-cmake-lint-cmake/default.nix b/distros/dashing/ament-cmake-lint-cmake/default.nix
similarity index 100%
rename from dashing/ament-cmake-lint-cmake/default.nix
rename to distros/dashing/ament-cmake-lint-cmake/default.nix
diff --git a/dashing/ament-cmake-nose/default.nix b/distros/dashing/ament-cmake-nose/default.nix
similarity index 100%
rename from dashing/ament-cmake-nose/default.nix
rename to distros/dashing/ament-cmake-nose/default.nix
diff --git a/dashing/ament-cmake-pclint/default.nix b/distros/dashing/ament-cmake-pclint/default.nix
similarity index 100%
rename from dashing/ament-cmake-pclint/default.nix
rename to distros/dashing/ament-cmake-pclint/default.nix
diff --git a/dashing/ament-cmake-pep257/default.nix b/distros/dashing/ament-cmake-pep257/default.nix
similarity index 100%
rename from dashing/ament-cmake-pep257/default.nix
rename to distros/dashing/ament-cmake-pep257/default.nix
diff --git a/dashing/ament-cmake-pep8/default.nix b/distros/dashing/ament-cmake-pep8/default.nix
similarity index 100%
rename from dashing/ament-cmake-pep8/default.nix
rename to distros/dashing/ament-cmake-pep8/default.nix
diff --git a/dashing/ament-cmake-pyflakes/default.nix b/distros/dashing/ament-cmake-pyflakes/default.nix
similarity index 100%
rename from dashing/ament-cmake-pyflakes/default.nix
rename to distros/dashing/ament-cmake-pyflakes/default.nix
diff --git a/dashing/ament-cmake-pytest/default.nix b/distros/dashing/ament-cmake-pytest/default.nix
similarity index 100%
rename from dashing/ament-cmake-pytest/default.nix
rename to distros/dashing/ament-cmake-pytest/default.nix
diff --git a/dashing/ament-cmake-python/default.nix b/distros/dashing/ament-cmake-python/default.nix
similarity index 100%
rename from dashing/ament-cmake-python/default.nix
rename to distros/dashing/ament-cmake-python/default.nix
diff --git a/dashing/ament-cmake-ros/default.nix b/distros/dashing/ament-cmake-ros/default.nix
similarity index 100%
rename from dashing/ament-cmake-ros/default.nix
rename to distros/dashing/ament-cmake-ros/default.nix
diff --git a/dashing/ament-cmake-target-dependencies/default.nix b/distros/dashing/ament-cmake-target-dependencies/default.nix
similarity index 100%
rename from dashing/ament-cmake-target-dependencies/default.nix
rename to distros/dashing/ament-cmake-target-dependencies/default.nix
diff --git a/dashing/ament-cmake-test/default.nix b/distros/dashing/ament-cmake-test/default.nix
similarity index 100%
rename from dashing/ament-cmake-test/default.nix
rename to distros/dashing/ament-cmake-test/default.nix
diff --git a/dashing/ament-cmake-uncrustify/default.nix b/distros/dashing/ament-cmake-uncrustify/default.nix
similarity index 100%
rename from dashing/ament-cmake-uncrustify/default.nix
rename to distros/dashing/ament-cmake-uncrustify/default.nix
diff --git a/dashing/ament-cmake-virtualenv/default.nix b/distros/dashing/ament-cmake-virtualenv/default.nix
similarity index 100%
rename from dashing/ament-cmake-virtualenv/default.nix
rename to distros/dashing/ament-cmake-virtualenv/default.nix
diff --git a/dashing/ament-cmake-xmllint/default.nix b/distros/dashing/ament-cmake-xmllint/default.nix
similarity index 100%
rename from dashing/ament-cmake-xmllint/default.nix
rename to distros/dashing/ament-cmake-xmllint/default.nix
diff --git a/dashing/ament-cmake/default.nix b/distros/dashing/ament-cmake/default.nix
similarity index 100%
rename from dashing/ament-cmake/default.nix
rename to distros/dashing/ament-cmake/default.nix
diff --git a/dashing/ament-copyright/default.nix b/distros/dashing/ament-copyright/default.nix
similarity index 100%
rename from dashing/ament-copyright/default.nix
rename to distros/dashing/ament-copyright/default.nix
diff --git a/dashing/ament-cppcheck/default.nix b/distros/dashing/ament-cppcheck/default.nix
similarity index 100%
rename from dashing/ament-cppcheck/default.nix
rename to distros/dashing/ament-cppcheck/default.nix
diff --git a/dashing/ament-cpplint/default.nix b/distros/dashing/ament-cpplint/default.nix
similarity index 100%
rename from dashing/ament-cpplint/default.nix
rename to distros/dashing/ament-cpplint/default.nix
diff --git a/dashing/ament-download/default.nix b/distros/dashing/ament-download/default.nix
similarity index 100%
rename from dashing/ament-download/default.nix
rename to distros/dashing/ament-download/default.nix
diff --git a/dashing/ament-flake8/default.nix b/distros/dashing/ament-flake8/default.nix
similarity index 100%
rename from dashing/ament-flake8/default.nix
rename to distros/dashing/ament-flake8/default.nix
diff --git a/dashing/ament-index-cpp/default.nix b/distros/dashing/ament-index-cpp/default.nix
similarity index 100%
rename from dashing/ament-index-cpp/default.nix
rename to distros/dashing/ament-index-cpp/default.nix
diff --git a/dashing/ament-index-python/default.nix b/distros/dashing/ament-index-python/default.nix
similarity index 100%
rename from dashing/ament-index-python/default.nix
rename to distros/dashing/ament-index-python/default.nix
diff --git a/dashing/ament-lint-auto/default.nix b/distros/dashing/ament-lint-auto/default.nix
similarity index 100%
rename from dashing/ament-lint-auto/default.nix
rename to distros/dashing/ament-lint-auto/default.nix
diff --git a/dashing/ament-lint-cmake/default.nix b/distros/dashing/ament-lint-cmake/default.nix
similarity index 100%
rename from dashing/ament-lint-cmake/default.nix
rename to distros/dashing/ament-lint-cmake/default.nix
diff --git a/dashing/ament-lint-common/default.nix b/distros/dashing/ament-lint-common/default.nix
similarity index 100%
rename from dashing/ament-lint-common/default.nix
rename to distros/dashing/ament-lint-common/default.nix
diff --git a/dashing/ament-lint/default.nix b/distros/dashing/ament-lint/default.nix
similarity index 100%
rename from dashing/ament-lint/default.nix
rename to distros/dashing/ament-lint/default.nix
diff --git a/dashing/ament-package/default.nix b/distros/dashing/ament-package/default.nix
similarity index 100%
rename from dashing/ament-package/default.nix
rename to distros/dashing/ament-package/default.nix
diff --git a/dashing/ament-pclint/default.nix b/distros/dashing/ament-pclint/default.nix
similarity index 100%
rename from dashing/ament-pclint/default.nix
rename to distros/dashing/ament-pclint/default.nix
diff --git a/dashing/ament-pep257/default.nix b/distros/dashing/ament-pep257/default.nix
similarity index 100%
rename from dashing/ament-pep257/default.nix
rename to distros/dashing/ament-pep257/default.nix
diff --git a/dashing/ament-pep8/default.nix b/distros/dashing/ament-pep8/default.nix
similarity index 100%
rename from dashing/ament-pep8/default.nix
rename to distros/dashing/ament-pep8/default.nix
diff --git a/dashing/ament-pyflakes/default.nix b/distros/dashing/ament-pyflakes/default.nix
similarity index 100%
rename from dashing/ament-pyflakes/default.nix
rename to distros/dashing/ament-pyflakes/default.nix
diff --git a/dashing/ament-uncrustify/default.nix b/distros/dashing/ament-uncrustify/default.nix
similarity index 100%
rename from dashing/ament-uncrustify/default.nix
rename to distros/dashing/ament-uncrustify/default.nix
diff --git a/dashing/ament-virtualenv/default.nix b/distros/dashing/ament-virtualenv/default.nix
similarity index 100%
rename from dashing/ament-virtualenv/default.nix
rename to distros/dashing/ament-virtualenv/default.nix
diff --git a/dashing/ament-xmllint/default.nix b/distros/dashing/ament-xmllint/default.nix
similarity index 100%
rename from dashing/ament-xmllint/default.nix
rename to distros/dashing/ament-xmllint/default.nix
diff --git a/dashing/angles/default.nix b/distros/dashing/angles/default.nix
similarity index 100%
rename from dashing/angles/default.nix
rename to distros/dashing/angles/default.nix
diff --git a/dashing/apriltag-msgs/default.nix b/distros/dashing/apriltag-msgs/default.nix
similarity index 100%
rename from dashing/apriltag-msgs/default.nix
rename to distros/dashing/apriltag-msgs/default.nix
diff --git a/dashing/apriltag-ros/default.nix b/distros/dashing/apriltag-ros/default.nix
similarity index 100%
rename from dashing/apriltag-ros/default.nix
rename to distros/dashing/apriltag-ros/default.nix
diff --git a/dashing/apriltag/default.nix b/distros/dashing/apriltag/default.nix
similarity index 100%
rename from dashing/apriltag/default.nix
rename to distros/dashing/apriltag/default.nix
diff --git a/dashing/automotive-autonomy-msgs/default.nix b/distros/dashing/automotive-autonomy-msgs/default.nix
similarity index 100%
rename from dashing/automotive-autonomy-msgs/default.nix
rename to distros/dashing/automotive-autonomy-msgs/default.nix
diff --git a/dashing/automotive-navigation-msgs/default.nix b/distros/dashing/automotive-navigation-msgs/default.nix
similarity index 100%
rename from dashing/automotive-navigation-msgs/default.nix
rename to distros/dashing/automotive-navigation-msgs/default.nix
diff --git a/dashing/automotive-platform-msgs/default.nix b/distros/dashing/automotive-platform-msgs/default.nix
similarity index 100%
rename from dashing/automotive-platform-msgs/default.nix
rename to distros/dashing/automotive-platform-msgs/default.nix
diff --git a/dashing/autoware-auto-algorithm/default.nix b/distros/dashing/autoware-auto-algorithm/default.nix
similarity index 100%
rename from dashing/autoware-auto-algorithm/default.nix
rename to distros/dashing/autoware-auto-algorithm/default.nix
diff --git a/dashing/autoware-auto-cmake/default.nix b/distros/dashing/autoware-auto-cmake/default.nix
similarity index 100%
rename from dashing/autoware-auto-cmake/default.nix
rename to distros/dashing/autoware-auto-cmake/default.nix
diff --git a/dashing/autoware-auto-create-pkg/default.nix b/distros/dashing/autoware-auto-create-pkg/default.nix
similarity index 100%
rename from dashing/autoware-auto-create-pkg/default.nix
rename to distros/dashing/autoware-auto-create-pkg/default.nix
diff --git a/dashing/autoware-auto-examples/default.nix b/distros/dashing/autoware-auto-examples/default.nix
similarity index 100%
rename from dashing/autoware-auto-examples/default.nix
rename to distros/dashing/autoware-auto-examples/default.nix
diff --git a/dashing/autoware-auto-geometry/default.nix b/distros/dashing/autoware-auto-geometry/default.nix
similarity index 100%
rename from dashing/autoware-auto-geometry/default.nix
rename to distros/dashing/autoware-auto-geometry/default.nix
diff --git a/dashing/autoware-auto-helper-functions/default.nix b/distros/dashing/autoware-auto-helper-functions/default.nix
similarity index 100%
rename from dashing/autoware-auto-helper-functions/default.nix
rename to distros/dashing/autoware-auto-helper-functions/default.nix
diff --git a/dashing/autoware-auto-msgs/default.nix b/distros/dashing/autoware-auto-msgs/default.nix
similarity index 100%
rename from dashing/autoware-auto-msgs/default.nix
rename to distros/dashing/autoware-auto-msgs/default.nix
diff --git a/dashing/aws-common/default.nix b/distros/dashing/aws-common/default.nix
similarity index 100%
rename from dashing/aws-common/default.nix
rename to distros/dashing/aws-common/default.nix
diff --git a/dashing/aws-ros2-common/default.nix b/distros/dashing/aws-ros2-common/default.nix
similarity index 100%
rename from dashing/aws-ros2-common/default.nix
rename to distros/dashing/aws-ros2-common/default.nix
diff --git a/dashing/behaviortree-cpp-v3/default.nix b/distros/dashing/behaviortree-cpp-v3/default.nix
similarity index 100%
rename from dashing/behaviortree-cpp-v3/default.nix
rename to distros/dashing/behaviortree-cpp-v3/default.nix
diff --git a/dashing/behaviortree-cpp/default.nix b/distros/dashing/behaviortree-cpp/default.nix
similarity index 100%
rename from dashing/behaviortree-cpp/default.nix
rename to distros/dashing/behaviortree-cpp/default.nix
diff --git a/dashing/builtin-interfaces/default.nix b/distros/dashing/builtin-interfaces/default.nix
similarity index 100%
rename from dashing/builtin-interfaces/default.nix
rename to distros/dashing/builtin-interfaces/default.nix
diff --git a/dashing/camera-calibration-parsers/default.nix b/distros/dashing/camera-calibration-parsers/default.nix
similarity index 100%
rename from dashing/camera-calibration-parsers/default.nix
rename to distros/dashing/camera-calibration-parsers/default.nix
diff --git a/dashing/camera-info-manager/default.nix b/distros/dashing/camera-info-manager/default.nix
similarity index 100%
rename from dashing/camera-info-manager/default.nix
rename to distros/dashing/camera-info-manager/default.nix
diff --git a/dashing/can-msgs/default.nix b/distros/dashing/can-msgs/default.nix
similarity index 100%
rename from dashing/can-msgs/default.nix
rename to distros/dashing/can-msgs/default.nix
diff --git a/dashing/cartographer-ros-msgs/default.nix b/distros/dashing/cartographer-ros-msgs/default.nix
similarity index 100%
rename from dashing/cartographer-ros-msgs/default.nix
rename to distros/dashing/cartographer-ros-msgs/default.nix
diff --git a/dashing/cartographer-ros/default.nix b/distros/dashing/cartographer-ros/default.nix
similarity index 100%
rename from dashing/cartographer-ros/default.nix
rename to distros/dashing/cartographer-ros/default.nix
diff --git a/dashing/cartographer/default.nix b/distros/dashing/cartographer/default.nix
similarity index 100%
rename from dashing/cartographer/default.nix
rename to distros/dashing/cartographer/default.nix
diff --git a/dashing/class-loader/default.nix b/distros/dashing/class-loader/default.nix
similarity index 100%
rename from dashing/class-loader/default.nix
rename to distros/dashing/class-loader/default.nix
diff --git a/dashing/cloudwatch-logger/default.nix b/distros/dashing/cloudwatch-logger/default.nix
similarity index 100%
rename from dashing/cloudwatch-logger/default.nix
rename to distros/dashing/cloudwatch-logger/default.nix
diff --git a/dashing/cloudwatch-logs-common/default.nix b/distros/dashing/cloudwatch-logs-common/default.nix
similarity index 100%
rename from dashing/cloudwatch-logs-common/default.nix
rename to distros/dashing/cloudwatch-logs-common/default.nix
diff --git a/dashing/cloudwatch-metrics-collector/default.nix b/distros/dashing/cloudwatch-metrics-collector/default.nix
similarity index 100%
rename from dashing/cloudwatch-metrics-collector/default.nix
rename to distros/dashing/cloudwatch-metrics-collector/default.nix
diff --git a/dashing/cloudwatch-metrics-common/default.nix b/distros/dashing/cloudwatch-metrics-common/default.nix
similarity index 100%
rename from dashing/cloudwatch-metrics-common/default.nix
rename to distros/dashing/cloudwatch-metrics-common/default.nix
diff --git a/dashing/common-interfaces/default.nix b/distros/dashing/common-interfaces/default.nix
similarity index 100%
rename from dashing/common-interfaces/default.nix
rename to distros/dashing/common-interfaces/default.nix
diff --git a/dashing/composition-interfaces/default.nix b/distros/dashing/composition-interfaces/default.nix
similarity index 100%
rename from dashing/composition-interfaces/default.nix
rename to distros/dashing/composition-interfaces/default.nix
diff --git a/dashing/composition/default.nix b/distros/dashing/composition/default.nix
similarity index 100%
rename from dashing/composition/default.nix
rename to distros/dashing/composition/default.nix
diff --git a/dashing/compressed-depth-image-transport/default.nix b/distros/dashing/compressed-depth-image-transport/default.nix
similarity index 100%
rename from dashing/compressed-depth-image-transport/default.nix
rename to distros/dashing/compressed-depth-image-transport/default.nix
diff --git a/dashing/compressed-image-transport/default.nix b/distros/dashing/compressed-image-transport/default.nix
similarity index 100%
rename from dashing/compressed-image-transport/default.nix
rename to distros/dashing/compressed-image-transport/default.nix
diff --git a/dashing/connext-cmake-module/default.nix b/distros/dashing/connext-cmake-module/default.nix
similarity index 100%
rename from dashing/connext-cmake-module/default.nix
rename to distros/dashing/connext-cmake-module/default.nix
diff --git a/dashing/console-bridge-vendor/default.nix b/distros/dashing/console-bridge-vendor/default.nix
similarity index 100%
rename from dashing/console-bridge-vendor/default.nix
rename to distros/dashing/console-bridge-vendor/default.nix
diff --git a/dashing/control-msgs/default.nix b/distros/dashing/control-msgs/default.nix
similarity index 100%
rename from dashing/control-msgs/default.nix
rename to distros/dashing/control-msgs/default.nix
diff --git a/dashing/costmap-queue/default.nix b/distros/dashing/costmap-queue/default.nix
similarity index 100%
rename from dashing/costmap-queue/default.nix
rename to distros/dashing/costmap-queue/default.nix
diff --git a/dashing/cross-compile/default.nix b/distros/dashing/cross-compile/default.nix
similarity index 100%
rename from dashing/cross-compile/default.nix
rename to distros/dashing/cross-compile/default.nix
diff --git a/dashing/cv-bridge/default.nix b/distros/dashing/cv-bridge/default.nix
similarity index 100%
rename from dashing/cv-bridge/default.nix
rename to distros/dashing/cv-bridge/default.nix
diff --git a/dashing/cyclonedds-cmake-module/default.nix b/distros/dashing/cyclonedds-cmake-module/default.nix
similarity index 100%
rename from dashing/cyclonedds-cmake-module/default.nix
rename to distros/dashing/cyclonedds-cmake-module/default.nix
diff --git a/dashing/cyclonedds/default.nix b/distros/dashing/cyclonedds/default.nix
similarity index 100%
rename from dashing/cyclonedds/default.nix
rename to distros/dashing/cyclonedds/default.nix
diff --git a/dashing/dataflow-lite/default.nix b/distros/dashing/dataflow-lite/default.nix
similarity index 100%
rename from dashing/dataflow-lite/default.nix
rename to distros/dashing/dataflow-lite/default.nix
diff --git a/dashing/delphi-esr-msgs/default.nix b/distros/dashing/delphi-esr-msgs/default.nix
similarity index 100%
rename from dashing/delphi-esr-msgs/default.nix
rename to distros/dashing/delphi-esr-msgs/default.nix
diff --git a/dashing/delphi-mrr-msgs/default.nix b/distros/dashing/delphi-mrr-msgs/default.nix
similarity index 100%
rename from dashing/delphi-mrr-msgs/default.nix
rename to distros/dashing/delphi-mrr-msgs/default.nix
diff --git a/dashing/delphi-srr-msgs/default.nix b/distros/dashing/delphi-srr-msgs/default.nix
similarity index 100%
rename from dashing/delphi-srr-msgs/default.nix
rename to distros/dashing/delphi-srr-msgs/default.nix
diff --git a/dashing/demo-nodes-cpp-native/default.nix b/distros/dashing/demo-nodes-cpp-native/default.nix
similarity index 100%
rename from dashing/demo-nodes-cpp-native/default.nix
rename to distros/dashing/demo-nodes-cpp-native/default.nix
diff --git a/dashing/demo-nodes-cpp/default.nix b/distros/dashing/demo-nodes-cpp/default.nix
similarity index 100%
rename from dashing/demo-nodes-cpp/default.nix
rename to distros/dashing/demo-nodes-cpp/default.nix
diff --git a/dashing/demo-nodes-py/default.nix b/distros/dashing/demo-nodes-py/default.nix
similarity index 100%
rename from dashing/demo-nodes-py/default.nix
rename to distros/dashing/demo-nodes-py/default.nix
diff --git a/dashing/depthimage-to-laserscan/default.nix b/distros/dashing/depthimage-to-laserscan/default.nix
similarity index 100%
rename from dashing/depthimage-to-laserscan/default.nix
rename to distros/dashing/depthimage-to-laserscan/default.nix
diff --git a/dashing/derived-object-msgs/default.nix b/distros/dashing/derived-object-msgs/default.nix
similarity index 100%
rename from dashing/derived-object-msgs/default.nix
rename to distros/dashing/derived-object-msgs/default.nix
diff --git a/dashing/desktop/default.nix b/distros/dashing/desktop/default.nix
similarity index 100%
rename from dashing/desktop/default.nix
rename to distros/dashing/desktop/default.nix
diff --git a/dashing/diagnostic-msgs/default.nix b/distros/dashing/diagnostic-msgs/default.nix
similarity index 100%
rename from dashing/diagnostic-msgs/default.nix
rename to distros/dashing/diagnostic-msgs/default.nix
diff --git a/dashing/diagnostic-updater/default.nix b/distros/dashing/diagnostic-updater/default.nix
similarity index 100%
rename from dashing/diagnostic-updater/default.nix
rename to distros/dashing/diagnostic-updater/default.nix
diff --git a/dashing/dolly-follow/default.nix b/distros/dashing/dolly-follow/default.nix
similarity index 100%
rename from dashing/dolly-follow/default.nix
rename to distros/dashing/dolly-follow/default.nix
diff --git a/dashing/dolly-gazebo/default.nix b/distros/dashing/dolly-gazebo/default.nix
similarity index 100%
rename from dashing/dolly-gazebo/default.nix
rename to distros/dashing/dolly-gazebo/default.nix
diff --git a/dashing/dolly/default.nix b/distros/dashing/dolly/default.nix
similarity index 100%
rename from dashing/dolly/default.nix
rename to distros/dashing/dolly/default.nix
diff --git a/dashing/dummy-map-server/default.nix b/distros/dashing/dummy-map-server/default.nix
similarity index 100%
rename from dashing/dummy-map-server/default.nix
rename to distros/dashing/dummy-map-server/default.nix
diff --git a/dashing/dummy-robot-bringup/default.nix b/distros/dashing/dummy-robot-bringup/default.nix
similarity index 100%
rename from dashing/dummy-robot-bringup/default.nix
rename to distros/dashing/dummy-robot-bringup/default.nix
diff --git a/dashing/dummy-sensors/default.nix b/distros/dashing/dummy-sensors/default.nix
similarity index 100%
rename from dashing/dummy-sensors/default.nix
rename to distros/dashing/dummy-sensors/default.nix
diff --git a/dashing/dwb-controller/default.nix b/distros/dashing/dwb-controller/default.nix
similarity index 100%
rename from dashing/dwb-controller/default.nix
rename to distros/dashing/dwb-controller/default.nix
diff --git a/dashing/dwb-core/default.nix b/distros/dashing/dwb-core/default.nix
similarity index 100%
rename from dashing/dwb-core/default.nix
rename to distros/dashing/dwb-core/default.nix
diff --git a/dashing/dwb-critics/default.nix b/distros/dashing/dwb-critics/default.nix
similarity index 100%
rename from dashing/dwb-critics/default.nix
rename to distros/dashing/dwb-critics/default.nix
diff --git a/dashing/dwb-msgs/default.nix b/distros/dashing/dwb-msgs/default.nix
similarity index 100%
rename from dashing/dwb-msgs/default.nix
rename to distros/dashing/dwb-msgs/default.nix
diff --git a/dashing/dwb-plugins/default.nix b/distros/dashing/dwb-plugins/default.nix
similarity index 100%
rename from dashing/dwb-plugins/default.nix
rename to distros/dashing/dwb-plugins/default.nix
diff --git a/dashing/dynamic-edt-3d/default.nix b/distros/dashing/dynamic-edt-3d/default.nix
similarity index 100%
rename from dashing/dynamic-edt-3d/default.nix
rename to distros/dashing/dynamic-edt-3d/default.nix
diff --git a/dashing/dynamixel-sdk/default.nix b/distros/dashing/dynamixel-sdk/default.nix
similarity index 100%
rename from dashing/dynamixel-sdk/default.nix
rename to distros/dashing/dynamixel-sdk/default.nix
diff --git a/dashing/ecl-build/default.nix b/distros/dashing/ecl-build/default.nix
similarity index 100%
rename from dashing/ecl-build/default.nix
rename to distros/dashing/ecl-build/default.nix
diff --git a/dashing/ecl-command-line/default.nix b/distros/dashing/ecl-command-line/default.nix
similarity index 100%
rename from dashing/ecl-command-line/default.nix
rename to distros/dashing/ecl-command-line/default.nix
diff --git a/dashing/ecl-concepts/default.nix b/distros/dashing/ecl-concepts/default.nix
similarity index 100%
rename from dashing/ecl-concepts/default.nix
rename to distros/dashing/ecl-concepts/default.nix
diff --git a/dashing/ecl-config/default.nix b/distros/dashing/ecl-config/default.nix
similarity index 100%
rename from dashing/ecl-config/default.nix
rename to distros/dashing/ecl-config/default.nix
diff --git a/dashing/ecl-console/default.nix b/distros/dashing/ecl-console/default.nix
similarity index 100%
rename from dashing/ecl-console/default.nix
rename to distros/dashing/ecl-console/default.nix
diff --git a/dashing/ecl-containers/default.nix b/distros/dashing/ecl-containers/default.nix
similarity index 100%
rename from dashing/ecl-containers/default.nix
rename to distros/dashing/ecl-containers/default.nix
diff --git a/dashing/ecl-converters-lite/default.nix b/distros/dashing/ecl-converters-lite/default.nix
similarity index 100%
rename from dashing/ecl-converters-lite/default.nix
rename to distros/dashing/ecl-converters-lite/default.nix
diff --git a/dashing/ecl-converters/default.nix b/distros/dashing/ecl-converters/default.nix
similarity index 100%
rename from dashing/ecl-converters/default.nix
rename to distros/dashing/ecl-converters/default.nix
diff --git a/dashing/ecl-core-apps/default.nix b/distros/dashing/ecl-core-apps/default.nix
similarity index 100%
rename from dashing/ecl-core-apps/default.nix
rename to distros/dashing/ecl-core-apps/default.nix
diff --git a/dashing/ecl-core/default.nix b/distros/dashing/ecl-core/default.nix
similarity index 100%
rename from dashing/ecl-core/default.nix
rename to distros/dashing/ecl-core/default.nix
diff --git a/dashing/ecl-devices/default.nix b/distros/dashing/ecl-devices/default.nix
similarity index 100%
rename from dashing/ecl-devices/default.nix
rename to distros/dashing/ecl-devices/default.nix
diff --git a/dashing/ecl-eigen/default.nix b/distros/dashing/ecl-eigen/default.nix
similarity index 100%
rename from dashing/ecl-eigen/default.nix
rename to distros/dashing/ecl-eigen/default.nix
diff --git a/dashing/ecl-errors/default.nix b/distros/dashing/ecl-errors/default.nix
similarity index 100%
rename from dashing/ecl-errors/default.nix
rename to distros/dashing/ecl-errors/default.nix
diff --git a/dashing/ecl-exceptions/default.nix b/distros/dashing/ecl-exceptions/default.nix
similarity index 100%
rename from dashing/ecl-exceptions/default.nix
rename to distros/dashing/ecl-exceptions/default.nix
diff --git a/dashing/ecl-filesystem/default.nix b/distros/dashing/ecl-filesystem/default.nix
similarity index 100%
rename from dashing/ecl-filesystem/default.nix
rename to distros/dashing/ecl-filesystem/default.nix
diff --git a/dashing/ecl-formatters/default.nix b/distros/dashing/ecl-formatters/default.nix
similarity index 100%
rename from dashing/ecl-formatters/default.nix
rename to distros/dashing/ecl-formatters/default.nix
diff --git a/dashing/ecl-geometry/default.nix b/distros/dashing/ecl-geometry/default.nix
similarity index 100%
rename from dashing/ecl-geometry/default.nix
rename to distros/dashing/ecl-geometry/default.nix
diff --git a/dashing/ecl-io/default.nix b/distros/dashing/ecl-io/default.nix
similarity index 100%
rename from dashing/ecl-io/default.nix
rename to distros/dashing/ecl-io/default.nix
diff --git a/dashing/ecl-ipc/default.nix b/distros/dashing/ecl-ipc/default.nix
similarity index 100%
rename from dashing/ecl-ipc/default.nix
rename to distros/dashing/ecl-ipc/default.nix
diff --git a/dashing/ecl-license/default.nix b/distros/dashing/ecl-license/default.nix
similarity index 100%
rename from dashing/ecl-license/default.nix
rename to distros/dashing/ecl-license/default.nix
diff --git a/dashing/ecl-linear-algebra/default.nix b/distros/dashing/ecl-linear-algebra/default.nix
similarity index 100%
rename from dashing/ecl-linear-algebra/default.nix
rename to distros/dashing/ecl-linear-algebra/default.nix
diff --git a/dashing/ecl-lite/default.nix b/distros/dashing/ecl-lite/default.nix
similarity index 100%
rename from dashing/ecl-lite/default.nix
rename to distros/dashing/ecl-lite/default.nix
diff --git a/dashing/ecl-manipulators/default.nix b/distros/dashing/ecl-manipulators/default.nix
similarity index 100%
rename from dashing/ecl-manipulators/default.nix
rename to distros/dashing/ecl-manipulators/default.nix
diff --git a/dashing/ecl-math/default.nix b/distros/dashing/ecl-math/default.nix
similarity index 100%
rename from dashing/ecl-math/default.nix
rename to distros/dashing/ecl-math/default.nix
diff --git a/dashing/ecl-mobile-robot/default.nix b/distros/dashing/ecl-mobile-robot/default.nix
similarity index 100%
rename from dashing/ecl-mobile-robot/default.nix
rename to distros/dashing/ecl-mobile-robot/default.nix
diff --git a/dashing/ecl-mpl/default.nix b/distros/dashing/ecl-mpl/default.nix
similarity index 100%
rename from dashing/ecl-mpl/default.nix
rename to distros/dashing/ecl-mpl/default.nix
diff --git a/dashing/ecl-sigslots-lite/default.nix b/distros/dashing/ecl-sigslots-lite/default.nix
similarity index 100%
rename from dashing/ecl-sigslots-lite/default.nix
rename to distros/dashing/ecl-sigslots-lite/default.nix
diff --git a/dashing/ecl-sigslots/default.nix b/distros/dashing/ecl-sigslots/default.nix
similarity index 100%
rename from dashing/ecl-sigslots/default.nix
rename to distros/dashing/ecl-sigslots/default.nix
diff --git a/dashing/ecl-statistics/default.nix b/distros/dashing/ecl-statistics/default.nix
similarity index 100%
rename from dashing/ecl-statistics/default.nix
rename to distros/dashing/ecl-statistics/default.nix
diff --git a/dashing/ecl-streams/default.nix b/distros/dashing/ecl-streams/default.nix
similarity index 100%
rename from dashing/ecl-streams/default.nix
rename to distros/dashing/ecl-streams/default.nix
diff --git a/dashing/ecl-threads/default.nix b/distros/dashing/ecl-threads/default.nix
similarity index 100%
rename from dashing/ecl-threads/default.nix
rename to distros/dashing/ecl-threads/default.nix
diff --git a/dashing/ecl-time-lite/default.nix b/distros/dashing/ecl-time-lite/default.nix
similarity index 100%
rename from dashing/ecl-time-lite/default.nix
rename to distros/dashing/ecl-time-lite/default.nix
diff --git a/dashing/ecl-time/default.nix b/distros/dashing/ecl-time/default.nix
similarity index 100%
rename from dashing/ecl-time/default.nix
rename to distros/dashing/ecl-time/default.nix
diff --git a/dashing/ecl-tools/default.nix b/distros/dashing/ecl-tools/default.nix
similarity index 100%
rename from dashing/ecl-tools/default.nix
rename to distros/dashing/ecl-tools/default.nix
diff --git a/dashing/ecl-type-traits/default.nix b/distros/dashing/ecl-type-traits/default.nix
similarity index 100%
rename from dashing/ecl-type-traits/default.nix
rename to distros/dashing/ecl-type-traits/default.nix
diff --git a/dashing/ecl-utilities/default.nix b/distros/dashing/ecl-utilities/default.nix
similarity index 100%
rename from dashing/ecl-utilities/default.nix
rename to distros/dashing/ecl-utilities/default.nix
diff --git a/dashing/eigen-stl-containers/default.nix b/distros/dashing/eigen-stl-containers/default.nix
similarity index 100%
rename from dashing/eigen-stl-containers/default.nix
rename to distros/dashing/eigen-stl-containers/default.nix
diff --git a/dashing/eigen3-cmake-module/default.nix b/distros/dashing/eigen3-cmake-module/default.nix
similarity index 100%
rename from dashing/eigen3-cmake-module/default.nix
rename to distros/dashing/eigen3-cmake-module/default.nix
diff --git a/dashing/euclidean-cluster-nodes/default.nix b/distros/dashing/euclidean-cluster-nodes/default.nix
similarity index 100%
rename from dashing/euclidean-cluster-nodes/default.nix
rename to distros/dashing/euclidean-cluster-nodes/default.nix
diff --git a/dashing/euclidean-cluster/default.nix b/distros/dashing/euclidean-cluster/default.nix
similarity index 100%
rename from dashing/euclidean-cluster/default.nix
rename to distros/dashing/euclidean-cluster/default.nix
diff --git a/dashing/example-interfaces/default.nix b/distros/dashing/example-interfaces/default.nix
similarity index 100%
rename from dashing/example-interfaces/default.nix
rename to distros/dashing/example-interfaces/default.nix
diff --git a/dashing/examples-rclcpp-minimal-action-client/default.nix b/distros/dashing/examples-rclcpp-minimal-action-client/default.nix
similarity index 100%
rename from dashing/examples-rclcpp-minimal-action-client/default.nix
rename to distros/dashing/examples-rclcpp-minimal-action-client/default.nix
diff --git a/dashing/examples-rclcpp-minimal-action-server/default.nix b/distros/dashing/examples-rclcpp-minimal-action-server/default.nix
similarity index 100%
rename from dashing/examples-rclcpp-minimal-action-server/default.nix
rename to distros/dashing/examples-rclcpp-minimal-action-server/default.nix
diff --git a/dashing/examples-rclcpp-minimal-client/default.nix b/distros/dashing/examples-rclcpp-minimal-client/default.nix
similarity index 100%
rename from dashing/examples-rclcpp-minimal-client/default.nix
rename to distros/dashing/examples-rclcpp-minimal-client/default.nix
diff --git a/dashing/examples-rclcpp-minimal-composition/default.nix b/distros/dashing/examples-rclcpp-minimal-composition/default.nix
similarity index 100%
rename from dashing/examples-rclcpp-minimal-composition/default.nix
rename to distros/dashing/examples-rclcpp-minimal-composition/default.nix
diff --git a/dashing/examples-rclcpp-minimal-publisher/default.nix b/distros/dashing/examples-rclcpp-minimal-publisher/default.nix
similarity index 100%
rename from dashing/examples-rclcpp-minimal-publisher/default.nix
rename to distros/dashing/examples-rclcpp-minimal-publisher/default.nix
diff --git a/dashing/examples-rclcpp-minimal-service/default.nix b/distros/dashing/examples-rclcpp-minimal-service/default.nix
similarity index 100%
rename from dashing/examples-rclcpp-minimal-service/default.nix
rename to distros/dashing/examples-rclcpp-minimal-service/default.nix
diff --git a/dashing/examples-rclcpp-minimal-subscriber/default.nix b/distros/dashing/examples-rclcpp-minimal-subscriber/default.nix
similarity index 100%
rename from dashing/examples-rclcpp-minimal-subscriber/default.nix
rename to distros/dashing/examples-rclcpp-minimal-subscriber/default.nix
diff --git a/dashing/examples-rclcpp-minimal-timer/default.nix b/distros/dashing/examples-rclcpp-minimal-timer/default.nix
similarity index 100%
rename from dashing/examples-rclcpp-minimal-timer/default.nix
rename to distros/dashing/examples-rclcpp-minimal-timer/default.nix
diff --git a/dashing/examples-rclpy-executors/default.nix b/distros/dashing/examples-rclpy-executors/default.nix
similarity index 100%
rename from dashing/examples-rclpy-executors/default.nix
rename to distros/dashing/examples-rclpy-executors/default.nix
diff --git a/dashing/examples-rclpy-minimal-action-client/default.nix b/distros/dashing/examples-rclpy-minimal-action-client/default.nix
similarity index 100%
rename from dashing/examples-rclpy-minimal-action-client/default.nix
rename to distros/dashing/examples-rclpy-minimal-action-client/default.nix
diff --git a/dashing/examples-rclpy-minimal-action-server/default.nix b/distros/dashing/examples-rclpy-minimal-action-server/default.nix
similarity index 100%
rename from dashing/examples-rclpy-minimal-action-server/default.nix
rename to distros/dashing/examples-rclpy-minimal-action-server/default.nix
diff --git a/dashing/examples-rclpy-minimal-client/default.nix b/distros/dashing/examples-rclpy-minimal-client/default.nix
similarity index 100%
rename from dashing/examples-rclpy-minimal-client/default.nix
rename to distros/dashing/examples-rclpy-minimal-client/default.nix
diff --git a/dashing/examples-rclpy-minimal-publisher/default.nix b/distros/dashing/examples-rclpy-minimal-publisher/default.nix
similarity index 100%
rename from dashing/examples-rclpy-minimal-publisher/default.nix
rename to distros/dashing/examples-rclpy-minimal-publisher/default.nix
diff --git a/dashing/examples-rclpy-minimal-service/default.nix b/distros/dashing/examples-rclpy-minimal-service/default.nix
similarity index 100%
rename from dashing/examples-rclpy-minimal-service/default.nix
rename to distros/dashing/examples-rclpy-minimal-service/default.nix
diff --git a/dashing/examples-rclpy-minimal-subscriber/default.nix b/distros/dashing/examples-rclpy-minimal-subscriber/default.nix
similarity index 100%
rename from dashing/examples-rclpy-minimal-subscriber/default.nix
rename to distros/dashing/examples-rclpy-minimal-subscriber/default.nix
diff --git a/dashing/fastcdr/default.nix b/distros/dashing/fastcdr/default.nix
similarity index 100%
rename from dashing/fastcdr/default.nix
rename to distros/dashing/fastcdr/default.nix
diff --git a/dashing/fastrtps-cmake-module/default.nix b/distros/dashing/fastrtps-cmake-module/default.nix
similarity index 100%
rename from dashing/fastrtps-cmake-module/default.nix
rename to distros/dashing/fastrtps-cmake-module/default.nix
diff --git a/dashing/fastrtps/default.nix b/distros/dashing/fastrtps/default.nix
similarity index 100%
rename from dashing/fastrtps/default.nix
rename to distros/dashing/fastrtps/default.nix
diff --git a/dashing/file-management/default.nix b/distros/dashing/file-management/default.nix
similarity index 100%
rename from dashing/file-management/default.nix
rename to distros/dashing/file-management/default.nix
diff --git a/dashing/fmi-adapter-examples/default.nix b/distros/dashing/fmi-adapter-examples/default.nix
similarity index 100%
rename from dashing/fmi-adapter-examples/default.nix
rename to distros/dashing/fmi-adapter-examples/default.nix
diff --git a/dashing/fmi-adapter/default.nix b/distros/dashing/fmi-adapter/default.nix
similarity index 100%
rename from dashing/fmi-adapter/default.nix
rename to distros/dashing/fmi-adapter/default.nix
diff --git a/dashing/fmilibrary-vendor/default.nix b/distros/dashing/fmilibrary-vendor/default.nix
similarity index 100%
rename from dashing/fmilibrary-vendor/default.nix
rename to distros/dashing/fmilibrary-vendor/default.nix
diff --git a/dashing/foonathan-memory-vendor/default.nix b/distros/dashing/foonathan-memory-vendor/default.nix
similarity index 100%
rename from dashing/foonathan-memory-vendor/default.nix
rename to distros/dashing/foonathan-memory-vendor/default.nix
diff --git a/dashing/gazebo-dev/default.nix b/distros/dashing/gazebo-dev/default.nix
similarity index 100%
rename from dashing/gazebo-dev/default.nix
rename to distros/dashing/gazebo-dev/default.nix
diff --git a/dashing/gazebo-msgs/default.nix b/distros/dashing/gazebo-msgs/default.nix
similarity index 100%
rename from dashing/gazebo-msgs/default.nix
rename to distros/dashing/gazebo-msgs/default.nix
diff --git a/dashing/gazebo-plugins/default.nix b/distros/dashing/gazebo-plugins/default.nix
similarity index 100%
rename from dashing/gazebo-plugins/default.nix
rename to distros/dashing/gazebo-plugins/default.nix
diff --git a/dashing/gazebo-ros-pkgs/default.nix b/distros/dashing/gazebo-ros-pkgs/default.nix
similarity index 100%
rename from dashing/gazebo-ros-pkgs/default.nix
rename to distros/dashing/gazebo-ros-pkgs/default.nix
diff --git a/dashing/gazebo-ros/default.nix b/distros/dashing/gazebo-ros/default.nix
similarity index 100%
rename from dashing/gazebo-ros/default.nix
rename to distros/dashing/gazebo-ros/default.nix
diff --git a/dashing/generated.nix b/distros/dashing/generated.nix
similarity index 100%
rename from dashing/generated.nix
rename to distros/dashing/generated.nix
diff --git a/dashing/geodesy/default.nix b/distros/dashing/geodesy/default.nix
similarity index 100%
rename from dashing/geodesy/default.nix
rename to distros/dashing/geodesy/default.nix
diff --git a/dashing/geographic-info/default.nix b/distros/dashing/geographic-info/default.nix
similarity index 100%
rename from dashing/geographic-info/default.nix
rename to distros/dashing/geographic-info/default.nix
diff --git a/dashing/geographic-msgs/default.nix b/distros/dashing/geographic-msgs/default.nix
similarity index 100%
rename from dashing/geographic-msgs/default.nix
rename to distros/dashing/geographic-msgs/default.nix
diff --git a/dashing/geometry-msgs/default.nix b/distros/dashing/geometry-msgs/default.nix
similarity index 100%
rename from dashing/geometry-msgs/default.nix
rename to distros/dashing/geometry-msgs/default.nix
diff --git a/dashing/gmock-vendor/default.nix b/distros/dashing/gmock-vendor/default.nix
similarity index 100%
rename from dashing/gmock-vendor/default.nix
rename to distros/dashing/gmock-vendor/default.nix
diff --git a/dashing/gps-msgs/default.nix b/distros/dashing/gps-msgs/default.nix
similarity index 100%
rename from dashing/gps-msgs/default.nix
rename to distros/dashing/gps-msgs/default.nix
diff --git a/dashing/gps-tools/default.nix b/distros/dashing/gps-tools/default.nix
similarity index 100%
rename from dashing/gps-tools/default.nix
rename to distros/dashing/gps-tools/default.nix
diff --git a/dashing/gps-umd/default.nix b/distros/dashing/gps-umd/default.nix
similarity index 100%
rename from dashing/gps-umd/default.nix
rename to distros/dashing/gps-umd/default.nix
diff --git a/dashing/gpsd-client/default.nix b/distros/dashing/gpsd-client/default.nix
similarity index 100%
rename from dashing/gpsd-client/default.nix
rename to distros/dashing/gpsd-client/default.nix
diff --git a/dashing/gtest-vendor/default.nix b/distros/dashing/gtest-vendor/default.nix
similarity index 100%
rename from dashing/gtest-vendor/default.nix
rename to distros/dashing/gtest-vendor/default.nix
diff --git a/dashing/h264-encoder-core/default.nix b/distros/dashing/h264-encoder-core/default.nix
similarity index 100%
rename from dashing/h264-encoder-core/default.nix
rename to distros/dashing/h264-encoder-core/default.nix
diff --git a/dashing/h264-video-encoder/default.nix b/distros/dashing/h264-video-encoder/default.nix
similarity index 100%
rename from dashing/h264-video-encoder/default.nix
rename to distros/dashing/h264-video-encoder/default.nix
diff --git a/dashing/health-metric-collector/default.nix b/distros/dashing/health-metric-collector/default.nix
similarity index 100%
rename from dashing/health-metric-collector/default.nix
rename to distros/dashing/health-metric-collector/default.nix
diff --git a/dashing/hls-lfcd-lds-driver/default.nix b/distros/dashing/hls-lfcd-lds-driver/default.nix
similarity index 100%
rename from dashing/hls-lfcd-lds-driver/default.nix
rename to distros/dashing/hls-lfcd-lds-driver/default.nix
diff --git a/dashing/hungarian-assigner/default.nix b/distros/dashing/hungarian-assigner/default.nix
similarity index 100%
rename from dashing/hungarian-assigner/default.nix
rename to distros/dashing/hungarian-assigner/default.nix
diff --git a/dashing/ibeo-msgs/default.nix b/distros/dashing/ibeo-msgs/default.nix
similarity index 100%
rename from dashing/ibeo-msgs/default.nix
rename to distros/dashing/ibeo-msgs/default.nix
diff --git a/dashing/image-geometry/default.nix b/distros/dashing/image-geometry/default.nix
similarity index 100%
rename from dashing/image-geometry/default.nix
rename to distros/dashing/image-geometry/default.nix
diff --git a/dashing/image-tools/default.nix b/distros/dashing/image-tools/default.nix
similarity index 100%
rename from dashing/image-tools/default.nix
rename to distros/dashing/image-tools/default.nix
diff --git a/dashing/image-transport-plugins/default.nix b/distros/dashing/image-transport-plugins/default.nix
similarity index 100%
rename from dashing/image-transport-plugins/default.nix
rename to distros/dashing/image-transport-plugins/default.nix
diff --git a/dashing/image-transport/default.nix b/distros/dashing/image-transport/default.nix
similarity index 100%
rename from dashing/image-transport/default.nix
rename to distros/dashing/image-transport/default.nix
diff --git a/dashing/intra-process-demo/default.nix b/distros/dashing/intra-process-demo/default.nix
similarity index 100%
rename from dashing/intra-process-demo/default.nix
rename to distros/dashing/intra-process-demo/default.nix
diff --git a/dashing/joy-teleop/default.nix b/distros/dashing/joy-teleop/default.nix
similarity index 100%
rename from dashing/joy-teleop/default.nix
rename to distros/dashing/joy-teleop/default.nix
diff --git a/dashing/joy/default.nix b/distros/dashing/joy/default.nix
similarity index 100%
rename from dashing/joy/default.nix
rename to distros/dashing/joy/default.nix
diff --git a/dashing/kalman-filter/default.nix b/distros/dashing/kalman-filter/default.nix
similarity index 100%
rename from dashing/kalman-filter/default.nix
rename to distros/dashing/kalman-filter/default.nix
diff --git a/dashing/kartech-linear-actuator-msgs/default.nix b/distros/dashing/kartech-linear-actuator-msgs/default.nix
similarity index 100%
rename from dashing/kartech-linear-actuator-msgs/default.nix
rename to distros/dashing/kartech-linear-actuator-msgs/default.nix
diff --git a/dashing/kdl-parser/default.nix b/distros/dashing/kdl-parser/default.nix
similarity index 100%
rename from dashing/kdl-parser/default.nix
rename to distros/dashing/kdl-parser/default.nix
diff --git a/dashing/key-teleop/default.nix b/distros/dashing/key-teleop/default.nix
similarity index 100%
rename from dashing/key-teleop/default.nix
rename to distros/dashing/key-teleop/default.nix
diff --git a/dashing/kinesis-manager/default.nix b/distros/dashing/kinesis-manager/default.nix
similarity index 100%
rename from dashing/kinesis-manager/default.nix
rename to distros/dashing/kinesis-manager/default.nix
diff --git a/dashing/kinesis-video-msgs/default.nix b/distros/dashing/kinesis-video-msgs/default.nix
similarity index 100%
rename from dashing/kinesis-video-msgs/default.nix
rename to distros/dashing/kinesis-video-msgs/default.nix
diff --git a/dashing/kinesis-video-streamer/default.nix b/distros/dashing/kinesis-video-streamer/default.nix
similarity index 100%
rename from dashing/kinesis-video-streamer/default.nix
rename to distros/dashing/kinesis-video-streamer/default.nix
diff --git a/dashing/laser-geometry/default.nix b/distros/dashing/laser-geometry/default.nix
similarity index 100%
rename from dashing/laser-geometry/default.nix
rename to distros/dashing/laser-geometry/default.nix
diff --git a/dashing/launch-ros-sandbox/default.nix b/distros/dashing/launch-ros-sandbox/default.nix
similarity index 100%
rename from dashing/launch-ros-sandbox/default.nix
rename to distros/dashing/launch-ros-sandbox/default.nix
diff --git a/dashing/launch-ros/default.nix b/distros/dashing/launch-ros/default.nix
similarity index 100%
rename from dashing/launch-ros/default.nix
rename to distros/dashing/launch-ros/default.nix
diff --git a/dashing/launch-testing-ament-cmake/default.nix b/distros/dashing/launch-testing-ament-cmake/default.nix
similarity index 100%
rename from dashing/launch-testing-ament-cmake/default.nix
rename to distros/dashing/launch-testing-ament-cmake/default.nix
diff --git a/dashing/launch-testing-ros/default.nix b/distros/dashing/launch-testing-ros/default.nix
similarity index 100%
rename from dashing/launch-testing-ros/default.nix
rename to distros/dashing/launch-testing-ros/default.nix
diff --git a/dashing/launch-testing/default.nix b/distros/dashing/launch-testing/default.nix
similarity index 100%
rename from dashing/launch-testing/default.nix
rename to distros/dashing/launch-testing/default.nix
diff --git a/dashing/launch/default.nix b/distros/dashing/launch/default.nix
similarity index 100%
rename from dashing/launch/default.nix
rename to distros/dashing/launch/default.nix
diff --git a/dashing/lex-common-msgs/default.nix b/distros/dashing/lex-common-msgs/default.nix
similarity index 100%
rename from dashing/lex-common-msgs/default.nix
rename to distros/dashing/lex-common-msgs/default.nix
diff --git a/dashing/lex-common/default.nix b/distros/dashing/lex-common/default.nix
similarity index 100%
rename from dashing/lex-common/default.nix
rename to distros/dashing/lex-common/default.nix
diff --git a/dashing/lex-node/default.nix b/distros/dashing/lex-node/default.nix
similarity index 100%
rename from dashing/lex-node/default.nix
rename to distros/dashing/lex-node/default.nix
diff --git a/dashing/libcurl-vendor/default.nix b/distros/dashing/libcurl-vendor/default.nix
similarity index 100%
rename from dashing/libcurl-vendor/default.nix
rename to distros/dashing/libcurl-vendor/default.nix
diff --git a/dashing/libphidget22/default.nix b/distros/dashing/libphidget22/default.nix
similarity index 100%
rename from dashing/libphidget22/default.nix
rename to distros/dashing/libphidget22/default.nix
diff --git a/dashing/librealsense2/default.nix b/distros/dashing/librealsense2/default.nix
similarity index 100%
rename from dashing/librealsense2/default.nix
rename to distros/dashing/librealsense2/default.nix
diff --git a/dashing/libyaml-vendor/default.nix b/distros/dashing/libyaml-vendor/default.nix
similarity index 100%
rename from dashing/libyaml-vendor/default.nix
rename to distros/dashing/libyaml-vendor/default.nix
diff --git a/dashing/lidar-utils/default.nix b/distros/dashing/lidar-utils/default.nix
similarity index 100%
rename from dashing/lidar-utils/default.nix
rename to distros/dashing/lidar-utils/default.nix
diff --git a/dashing/lifecycle-msgs/default.nix b/distros/dashing/lifecycle-msgs/default.nix
similarity index 100%
rename from dashing/lifecycle-msgs/default.nix
rename to distros/dashing/lifecycle-msgs/default.nix
diff --git a/dashing/lifecycle/default.nix b/distros/dashing/lifecycle/default.nix
similarity index 100%
rename from dashing/lifecycle/default.nix
rename to distros/dashing/lifecycle/default.nix
diff --git a/dashing/localization-common/default.nix b/distros/dashing/localization-common/default.nix
similarity index 100%
rename from dashing/localization-common/default.nix
rename to distros/dashing/localization-common/default.nix
diff --git a/dashing/localization-nodes/default.nix b/distros/dashing/localization-nodes/default.nix
similarity index 100%
rename from dashing/localization-nodes/default.nix
rename to distros/dashing/localization-nodes/default.nix
diff --git a/dashing/logging-demo/default.nix b/distros/dashing/logging-demo/default.nix
similarity index 100%
rename from dashing/logging-demo/default.nix
rename to distros/dashing/logging-demo/default.nix
diff --git a/dashing/map-msgs/default.nix b/distros/dashing/map-msgs/default.nix
similarity index 100%
rename from dashing/map-msgs/default.nix
rename to distros/dashing/map-msgs/default.nix
diff --git a/dashing/marti-can-msgs/default.nix b/distros/dashing/marti-can-msgs/default.nix
similarity index 100%
rename from dashing/marti-can-msgs/default.nix
rename to distros/dashing/marti-can-msgs/default.nix
diff --git a/dashing/marti-common-msgs/default.nix b/distros/dashing/marti-common-msgs/default.nix
similarity index 100%
rename from dashing/marti-common-msgs/default.nix
rename to distros/dashing/marti-common-msgs/default.nix
diff --git a/dashing/marti-nav-msgs/default.nix b/distros/dashing/marti-nav-msgs/default.nix
similarity index 100%
rename from dashing/marti-nav-msgs/default.nix
rename to distros/dashing/marti-nav-msgs/default.nix
diff --git a/dashing/marti-perception-msgs/default.nix b/distros/dashing/marti-perception-msgs/default.nix
similarity index 100%
rename from dashing/marti-perception-msgs/default.nix
rename to distros/dashing/marti-perception-msgs/default.nix
diff --git a/dashing/marti-sensor-msgs/default.nix b/distros/dashing/marti-sensor-msgs/default.nix
similarity index 100%
rename from dashing/marti-sensor-msgs/default.nix
rename to distros/dashing/marti-sensor-msgs/default.nix
diff --git a/dashing/marti-status-msgs/default.nix b/distros/dashing/marti-status-msgs/default.nix
similarity index 100%
rename from dashing/marti-status-msgs/default.nix
rename to distros/dashing/marti-status-msgs/default.nix
diff --git a/dashing/marti-visualization-msgs/default.nix b/distros/dashing/marti-visualization-msgs/default.nix
similarity index 100%
rename from dashing/marti-visualization-msgs/default.nix
rename to distros/dashing/marti-visualization-msgs/default.nix
diff --git a/dashing/message-filters/default.nix b/distros/dashing/message-filters/default.nix
similarity index 100%
rename from dashing/message-filters/default.nix
rename to distros/dashing/message-filters/default.nix
diff --git a/dashing/ml-classifiers/default.nix b/distros/dashing/ml-classifiers/default.nix
similarity index 100%
rename from dashing/ml-classifiers/default.nix
rename to distros/dashing/ml-classifiers/default.nix
diff --git a/dashing/mobileye-560-660-msgs/default.nix b/distros/dashing/mobileye-560-660-msgs/default.nix
similarity index 100%
rename from dashing/mobileye-560-660-msgs/default.nix
rename to distros/dashing/mobileye-560-660-msgs/default.nix
diff --git a/dashing/motion-model/default.nix b/distros/dashing/motion-model/default.nix
similarity index 100%
rename from dashing/motion-model/default.nix
rename to distros/dashing/motion-model/default.nix
diff --git a/dashing/mouse-teleop/default.nix b/distros/dashing/mouse-teleop/default.nix
similarity index 100%
rename from dashing/mouse-teleop/default.nix
rename to distros/dashing/mouse-teleop/default.nix
diff --git a/dashing/move-base-msgs/default.nix b/distros/dashing/move-base-msgs/default.nix
similarity index 100%
rename from dashing/move-base-msgs/default.nix
rename to distros/dashing/move-base-msgs/default.nix
diff --git a/dashing/nav-2d-msgs/default.nix b/distros/dashing/nav-2d-msgs/default.nix
similarity index 100%
rename from dashing/nav-2d-msgs/default.nix
rename to distros/dashing/nav-2d-msgs/default.nix
diff --git a/dashing/nav-2d-utils/default.nix b/distros/dashing/nav-2d-utils/default.nix
similarity index 100%
rename from dashing/nav-2d-utils/default.nix
rename to distros/dashing/nav-2d-utils/default.nix
diff --git a/dashing/nav-msgs/default.nix b/distros/dashing/nav-msgs/default.nix
similarity index 100%
rename from dashing/nav-msgs/default.nix
rename to distros/dashing/nav-msgs/default.nix
diff --git a/dashing/nav2-amcl/default.nix b/distros/dashing/nav2-amcl/default.nix
similarity index 100%
rename from dashing/nav2-amcl/default.nix
rename to distros/dashing/nav2-amcl/default.nix
diff --git a/dashing/nav2-behavior-tree/default.nix b/distros/dashing/nav2-behavior-tree/default.nix
similarity index 100%
rename from dashing/nav2-behavior-tree/default.nix
rename to distros/dashing/nav2-behavior-tree/default.nix
diff --git a/dashing/nav2-bringup/default.nix b/distros/dashing/nav2-bringup/default.nix
similarity index 100%
rename from dashing/nav2-bringup/default.nix
rename to distros/dashing/nav2-bringup/default.nix
diff --git a/dashing/nav2-bt-navigator/default.nix b/distros/dashing/nav2-bt-navigator/default.nix
similarity index 100%
rename from dashing/nav2-bt-navigator/default.nix
rename to distros/dashing/nav2-bt-navigator/default.nix
diff --git a/dashing/nav2-common/default.nix b/distros/dashing/nav2-common/default.nix
similarity index 100%
rename from dashing/nav2-common/default.nix
rename to distros/dashing/nav2-common/default.nix
diff --git a/dashing/nav2-costmap-2d/default.nix b/distros/dashing/nav2-costmap-2d/default.nix
similarity index 100%
rename from dashing/nav2-costmap-2d/default.nix
rename to distros/dashing/nav2-costmap-2d/default.nix
diff --git a/dashing/nav2-dwb-controller/default.nix b/distros/dashing/nav2-dwb-controller/default.nix
similarity index 100%
rename from dashing/nav2-dwb-controller/default.nix
rename to distros/dashing/nav2-dwb-controller/default.nix
diff --git a/dashing/nav2-dynamic-params/default.nix b/distros/dashing/nav2-dynamic-params/default.nix
similarity index 100%
rename from dashing/nav2-dynamic-params/default.nix
rename to distros/dashing/nav2-dynamic-params/default.nix
diff --git a/dashing/nav2-lifecycle-manager/default.nix b/distros/dashing/nav2-lifecycle-manager/default.nix
similarity index 100%
rename from dashing/nav2-lifecycle-manager/default.nix
rename to distros/dashing/nav2-lifecycle-manager/default.nix
diff --git a/dashing/nav2-map-server/default.nix b/distros/dashing/nav2-map-server/default.nix
similarity index 100%
rename from dashing/nav2-map-server/default.nix
rename to distros/dashing/nav2-map-server/default.nix
diff --git a/dashing/nav2-msgs/default.nix b/distros/dashing/nav2-msgs/default.nix
similarity index 100%
rename from dashing/nav2-msgs/default.nix
rename to distros/dashing/nav2-msgs/default.nix
diff --git a/dashing/nav2-navfn-planner/default.nix b/distros/dashing/nav2-navfn-planner/default.nix
similarity index 100%
rename from dashing/nav2-navfn-planner/default.nix
rename to distros/dashing/nav2-navfn-planner/default.nix
diff --git a/dashing/nav2-recoveries/default.nix b/distros/dashing/nav2-recoveries/default.nix
similarity index 100%
rename from dashing/nav2-recoveries/default.nix
rename to distros/dashing/nav2-recoveries/default.nix
diff --git a/dashing/nav2-rviz-plugins/default.nix b/distros/dashing/nav2-rviz-plugins/default.nix
similarity index 100%
rename from dashing/nav2-rviz-plugins/default.nix
rename to distros/dashing/nav2-rviz-plugins/default.nix
diff --git a/dashing/nav2-system-tests/default.nix b/distros/dashing/nav2-system-tests/default.nix
similarity index 100%
rename from dashing/nav2-system-tests/default.nix
rename to distros/dashing/nav2-system-tests/default.nix
diff --git a/dashing/nav2-util/default.nix b/distros/dashing/nav2-util/default.nix
similarity index 100%
rename from dashing/nav2-util/default.nix
rename to distros/dashing/nav2-util/default.nix
diff --git a/dashing/nav2-voxel-grid/default.nix b/distros/dashing/nav2-voxel-grid/default.nix
similarity index 100%
rename from dashing/nav2-voxel-grid/default.nix
rename to distros/dashing/nav2-voxel-grid/default.nix
diff --git a/dashing/nav2-world-model/default.nix b/distros/dashing/nav2-world-model/default.nix
similarity index 100%
rename from dashing/nav2-world-model/default.nix
rename to distros/dashing/nav2-world-model/default.nix
diff --git a/dashing/navigation2/default.nix b/distros/dashing/navigation2/default.nix
similarity index 100%
rename from dashing/navigation2/default.nix
rename to distros/dashing/navigation2/default.nix
diff --git a/dashing/ndt/default.nix b/distros/dashing/ndt/default.nix
similarity index 100%
rename from dashing/ndt/default.nix
rename to distros/dashing/ndt/default.nix
diff --git a/dashing/neobotix-usboard-msgs/default.nix b/distros/dashing/neobotix-usboard-msgs/default.nix
similarity index 100%
rename from dashing/neobotix-usboard-msgs/default.nix
rename to distros/dashing/neobotix-usboard-msgs/default.nix
diff --git a/dashing/nmea-msgs/default.nix b/distros/dashing/nmea-msgs/default.nix
similarity index 100%
rename from dashing/nmea-msgs/default.nix
rename to distros/dashing/nmea-msgs/default.nix
diff --git a/dashing/nonpersistent-voxel-layer/default.nix b/distros/dashing/nonpersistent-voxel-layer/default.nix
similarity index 100%
rename from dashing/nonpersistent-voxel-layer/default.nix
rename to distros/dashing/nonpersistent-voxel-layer/default.nix
diff --git a/dashing/novatel-gps-driver/default.nix b/distros/dashing/novatel-gps-driver/default.nix
similarity index 100%
rename from dashing/novatel-gps-driver/default.nix
rename to distros/dashing/novatel-gps-driver/default.nix
diff --git a/dashing/novatel-gps-msgs/default.nix b/distros/dashing/novatel-gps-msgs/default.nix
similarity index 100%
rename from dashing/novatel-gps-msgs/default.nix
rename to distros/dashing/novatel-gps-msgs/default.nix
diff --git a/dashing/object-analytics-msgs/default.nix b/distros/dashing/object-analytics-msgs/default.nix
similarity index 100%
rename from dashing/object-analytics-msgs/default.nix
rename to distros/dashing/object-analytics-msgs/default.nix
diff --git a/dashing/object-analytics-node/default.nix b/distros/dashing/object-analytics-node/default.nix
similarity index 100%
rename from dashing/object-analytics-node/default.nix
rename to distros/dashing/object-analytics-node/default.nix
diff --git a/dashing/object-analytics-rviz/default.nix b/distros/dashing/object-analytics-rviz/default.nix
similarity index 100%
rename from dashing/object-analytics-rviz/default.nix
rename to distros/dashing/object-analytics-rviz/default.nix
diff --git a/dashing/object-msgs/default.nix b/distros/dashing/object-msgs/default.nix
similarity index 100%
rename from dashing/object-msgs/default.nix
rename to distros/dashing/object-msgs/default.nix
diff --git a/dashing/octomap/default.nix b/distros/dashing/octomap/default.nix
similarity index 100%
rename from dashing/octomap/default.nix
rename to distros/dashing/octomap/default.nix
diff --git a/dashing/ompl/default.nix b/distros/dashing/ompl/default.nix
similarity index 100%
rename from dashing/ompl/default.nix
rename to distros/dashing/ompl/default.nix
diff --git a/dashing/opensplice-cmake-module/default.nix b/distros/dashing/opensplice-cmake-module/default.nix
similarity index 100%
rename from dashing/opensplice-cmake-module/default.nix
rename to distros/dashing/opensplice-cmake-module/default.nix
diff --git a/dashing/optimization/default.nix b/distros/dashing/optimization/default.nix
similarity index 100%
rename from dashing/optimization/default.nix
rename to distros/dashing/optimization/default.nix
diff --git a/dashing/orocos-kdl/default.nix b/distros/dashing/orocos-kdl/default.nix
similarity index 100%
rename from dashing/orocos-kdl/default.nix
rename to distros/dashing/orocos-kdl/default.nix
diff --git a/dashing/osrf-pycommon/default.nix b/distros/dashing/osrf-pycommon/default.nix
similarity index 100%
rename from dashing/osrf-pycommon/default.nix
rename to distros/dashing/osrf-pycommon/default.nix
diff --git a/dashing/osrf-testing-tools-cpp/default.nix b/distros/dashing/osrf-testing-tools-cpp/default.nix
similarity index 100%
rename from dashing/osrf-testing-tools-cpp/default.nix
rename to distros/dashing/osrf-testing-tools-cpp/default.nix
diff --git a/dashing/ouster-msgs/default.nix b/distros/dashing/ouster-msgs/default.nix
similarity index 100%
rename from dashing/ouster-msgs/default.nix
rename to distros/dashing/ouster-msgs/default.nix
diff --git a/dashing/overrides.nix b/distros/dashing/overrides.nix
similarity index 100%
rename from dashing/overrides.nix
rename to distros/dashing/overrides.nix
diff --git a/dashing/pacmod-msgs/default.nix b/distros/dashing/pacmod-msgs/default.nix
similarity index 100%
rename from dashing/pacmod-msgs/default.nix
rename to distros/dashing/pacmod-msgs/default.nix
diff --git a/dashing/pcl-conversions/default.nix b/distros/dashing/pcl-conversions/default.nix
similarity index 100%
rename from dashing/pcl-conversions/default.nix
rename to distros/dashing/pcl-conversions/default.nix
diff --git a/dashing/pcl-msgs/default.nix b/distros/dashing/pcl-msgs/default.nix
similarity index 100%
rename from dashing/pcl-msgs/default.nix
rename to distros/dashing/pcl-msgs/default.nix
diff --git a/dashing/pendulum-control/default.nix b/distros/dashing/pendulum-control/default.nix
similarity index 100%
rename from dashing/pendulum-control/default.nix
rename to distros/dashing/pendulum-control/default.nix
diff --git a/dashing/pendulum-msgs/default.nix b/distros/dashing/pendulum-msgs/default.nix
similarity index 100%
rename from dashing/pendulum-msgs/default.nix
rename to distros/dashing/pendulum-msgs/default.nix
diff --git a/dashing/people-msgs/default.nix b/distros/dashing/people-msgs/default.nix
similarity index 100%
rename from dashing/people-msgs/default.nix
rename to distros/dashing/people-msgs/default.nix
diff --git a/dashing/perception-pcl/default.nix b/distros/dashing/perception-pcl/default.nix
similarity index 100%
rename from dashing/perception-pcl/default.nix
rename to distros/dashing/perception-pcl/default.nix
diff --git a/dashing/phidgets-accelerometer/default.nix b/distros/dashing/phidgets-accelerometer/default.nix
similarity index 100%
rename from dashing/phidgets-accelerometer/default.nix
rename to distros/dashing/phidgets-accelerometer/default.nix
diff --git a/dashing/phidgets-analog-inputs/default.nix b/distros/dashing/phidgets-analog-inputs/default.nix
similarity index 100%
rename from dashing/phidgets-analog-inputs/default.nix
rename to distros/dashing/phidgets-analog-inputs/default.nix
diff --git a/dashing/phidgets-api/default.nix b/distros/dashing/phidgets-api/default.nix
similarity index 100%
rename from dashing/phidgets-api/default.nix
rename to distros/dashing/phidgets-api/default.nix
diff --git a/dashing/phidgets-digital-inputs/default.nix b/distros/dashing/phidgets-digital-inputs/default.nix
similarity index 100%
rename from dashing/phidgets-digital-inputs/default.nix
rename to distros/dashing/phidgets-digital-inputs/default.nix
diff --git a/dashing/phidgets-digital-outputs/default.nix b/distros/dashing/phidgets-digital-outputs/default.nix
similarity index 100%
rename from dashing/phidgets-digital-outputs/default.nix
rename to distros/dashing/phidgets-digital-outputs/default.nix
diff --git a/dashing/phidgets-drivers/default.nix b/distros/dashing/phidgets-drivers/default.nix
similarity index 100%
rename from dashing/phidgets-drivers/default.nix
rename to distros/dashing/phidgets-drivers/default.nix
diff --git a/dashing/phidgets-gyroscope/default.nix b/distros/dashing/phidgets-gyroscope/default.nix
similarity index 100%
rename from dashing/phidgets-gyroscope/default.nix
rename to distros/dashing/phidgets-gyroscope/default.nix
diff --git a/dashing/phidgets-high-speed-encoder/default.nix b/distros/dashing/phidgets-high-speed-encoder/default.nix
similarity index 100%
rename from dashing/phidgets-high-speed-encoder/default.nix
rename to distros/dashing/phidgets-high-speed-encoder/default.nix
diff --git a/dashing/phidgets-ik/default.nix b/distros/dashing/phidgets-ik/default.nix
similarity index 100%
rename from dashing/phidgets-ik/default.nix
rename to distros/dashing/phidgets-ik/default.nix
diff --git a/dashing/phidgets-magnetometer/default.nix b/distros/dashing/phidgets-magnetometer/default.nix
similarity index 100%
rename from dashing/phidgets-magnetometer/default.nix
rename to distros/dashing/phidgets-magnetometer/default.nix
diff --git a/dashing/phidgets-motors/default.nix b/distros/dashing/phidgets-motors/default.nix
similarity index 100%
rename from dashing/phidgets-motors/default.nix
rename to distros/dashing/phidgets-motors/default.nix
diff --git a/dashing/phidgets-msgs/default.nix b/distros/dashing/phidgets-msgs/default.nix
similarity index 100%
rename from dashing/phidgets-msgs/default.nix
rename to distros/dashing/phidgets-msgs/default.nix
diff --git a/dashing/phidgets-spatial/default.nix b/distros/dashing/phidgets-spatial/default.nix
similarity index 100%
rename from dashing/phidgets-spatial/default.nix
rename to distros/dashing/phidgets-spatial/default.nix
diff --git a/dashing/phidgets-temperature/default.nix b/distros/dashing/phidgets-temperature/default.nix
similarity index 100%
rename from dashing/phidgets-temperature/default.nix
rename to distros/dashing/phidgets-temperature/default.nix
diff --git a/dashing/pluginlib/default.nix b/distros/dashing/pluginlib/default.nix
similarity index 100%
rename from dashing/pluginlib/default.nix
rename to distros/dashing/pluginlib/default.nix
diff --git a/dashing/poco-vendor/default.nix b/distros/dashing/poco-vendor/default.nix
similarity index 100%
rename from dashing/poco-vendor/default.nix
rename to distros/dashing/poco-vendor/default.nix
diff --git a/dashing/point-cloud-fusion/default.nix b/distros/dashing/point-cloud-fusion/default.nix
similarity index 100%
rename from dashing/point-cloud-fusion/default.nix
rename to distros/dashing/point-cloud-fusion/default.nix
diff --git a/dashing/px4-msgs/default.nix b/distros/dashing/px4-msgs/default.nix
similarity index 100%
rename from dashing/px4-msgs/default.nix
rename to distros/dashing/px4-msgs/default.nix
diff --git a/dashing/py-trees-ros-interfaces/default.nix b/distros/dashing/py-trees-ros-interfaces/default.nix
similarity index 100%
rename from dashing/py-trees-ros-interfaces/default.nix
rename to distros/dashing/py-trees-ros-interfaces/default.nix
diff --git a/dashing/py-trees-ros/default.nix b/distros/dashing/py-trees-ros/default.nix
similarity index 100%
rename from dashing/py-trees-ros/default.nix
rename to distros/dashing/py-trees-ros/default.nix
diff --git a/dashing/python-cmake-module/default.nix b/distros/dashing/python-cmake-module/default.nix
similarity index 100%
rename from dashing/python-cmake-module/default.nix
rename to distros/dashing/python-cmake-module/default.nix
diff --git a/dashing/python-qt-binding/default.nix b/distros/dashing/python-qt-binding/default.nix
similarity index 100%
rename from dashing/python-qt-binding/default.nix
rename to distros/dashing/python-qt-binding/default.nix
diff --git a/dashing/qt-dotgraph/default.nix b/distros/dashing/qt-dotgraph/default.nix
similarity index 100%
rename from dashing/qt-dotgraph/default.nix
rename to distros/dashing/qt-dotgraph/default.nix
diff --git a/dashing/qt-gui-app/default.nix b/distros/dashing/qt-gui-app/default.nix
similarity index 100%
rename from dashing/qt-gui-app/default.nix
rename to distros/dashing/qt-gui-app/default.nix
diff --git a/dashing/qt-gui-core/default.nix b/distros/dashing/qt-gui-core/default.nix
similarity index 100%
rename from dashing/qt-gui-core/default.nix
rename to distros/dashing/qt-gui-core/default.nix
diff --git a/dashing/qt-gui-cpp/default.nix b/distros/dashing/qt-gui-cpp/default.nix
similarity index 100%
rename from dashing/qt-gui-cpp/default.nix
rename to distros/dashing/qt-gui-cpp/default.nix
diff --git a/dashing/qt-gui-py-common/default.nix b/distros/dashing/qt-gui-py-common/default.nix
similarity index 100%
rename from dashing/qt-gui-py-common/default.nix
rename to distros/dashing/qt-gui-py-common/default.nix
diff --git a/dashing/qt-gui/default.nix b/distros/dashing/qt-gui/default.nix
similarity index 100%
rename from dashing/qt-gui/default.nix
rename to distros/dashing/qt-gui/default.nix
diff --git a/dashing/quality-of-service-demo-cpp/default.nix b/distros/dashing/quality-of-service-demo-cpp/default.nix
similarity index 100%
rename from dashing/quality-of-service-demo-cpp/default.nix
rename to distros/dashing/quality-of-service-demo-cpp/default.nix
diff --git a/dashing/quality-of-service-demo-py/default.nix b/distros/dashing/quality-of-service-demo-py/default.nix
similarity index 100%
rename from dashing/quality-of-service-demo-py/default.nix
rename to distros/dashing/quality-of-service-demo-py/default.nix
diff --git a/dashing/radar-msgs/default.nix b/distros/dashing/radar-msgs/default.nix
similarity index 100%
rename from dashing/radar-msgs/default.nix
rename to distros/dashing/radar-msgs/default.nix
diff --git a/dashing/ray-ground-classifier-nodes/default.nix b/distros/dashing/ray-ground-classifier-nodes/default.nix
similarity index 100%
rename from dashing/ray-ground-classifier-nodes/default.nix
rename to distros/dashing/ray-ground-classifier-nodes/default.nix
diff --git a/dashing/ray-ground-classifier/default.nix b/distros/dashing/ray-ground-classifier/default.nix
similarity index 100%
rename from dashing/ray-ground-classifier/default.nix
rename to distros/dashing/ray-ground-classifier/default.nix
diff --git a/dashing/rcl-action/default.nix b/distros/dashing/rcl-action/default.nix
similarity index 100%
rename from dashing/rcl-action/default.nix
rename to distros/dashing/rcl-action/default.nix
diff --git a/dashing/rcl-interfaces/default.nix b/distros/dashing/rcl-interfaces/default.nix
similarity index 100%
rename from dashing/rcl-interfaces/default.nix
rename to distros/dashing/rcl-interfaces/default.nix
diff --git a/dashing/rcl-lifecycle/default.nix b/distros/dashing/rcl-lifecycle/default.nix
similarity index 100%
rename from dashing/rcl-lifecycle/default.nix
rename to distros/dashing/rcl-lifecycle/default.nix
diff --git a/dashing/rcl-logging-log4cxx/default.nix b/distros/dashing/rcl-logging-log4cxx/default.nix
similarity index 100%
rename from dashing/rcl-logging-log4cxx/default.nix
rename to distros/dashing/rcl-logging-log4cxx/default.nix
diff --git a/dashing/rcl-logging-noop/default.nix b/distros/dashing/rcl-logging-noop/default.nix
similarity index 100%
rename from dashing/rcl-logging-noop/default.nix
rename to distros/dashing/rcl-logging-noop/default.nix
diff --git a/dashing/rcl-yaml-param-parser/default.nix b/distros/dashing/rcl-yaml-param-parser/default.nix
similarity index 100%
rename from dashing/rcl-yaml-param-parser/default.nix
rename to distros/dashing/rcl-yaml-param-parser/default.nix
diff --git a/dashing/rcl/default.nix b/distros/dashing/rcl/default.nix
similarity index 100%
rename from dashing/rcl/default.nix
rename to distros/dashing/rcl/default.nix
diff --git a/dashing/rclcpp-action/default.nix b/distros/dashing/rclcpp-action/default.nix
similarity index 100%
rename from dashing/rclcpp-action/default.nix
rename to distros/dashing/rclcpp-action/default.nix
diff --git a/dashing/rclcpp-components/default.nix b/distros/dashing/rclcpp-components/default.nix
similarity index 100%
rename from dashing/rclcpp-components/default.nix
rename to distros/dashing/rclcpp-components/default.nix
diff --git a/dashing/rclcpp-lifecycle/default.nix b/distros/dashing/rclcpp-lifecycle/default.nix
similarity index 100%
rename from dashing/rclcpp-lifecycle/default.nix
rename to distros/dashing/rclcpp-lifecycle/default.nix
diff --git a/dashing/rclcpp/default.nix b/distros/dashing/rclcpp/default.nix
similarity index 100%
rename from dashing/rclcpp/default.nix
rename to distros/dashing/rclcpp/default.nix
diff --git a/dashing/rclpy/default.nix b/distros/dashing/rclpy/default.nix
similarity index 100%
rename from dashing/rclpy/default.nix
rename to distros/dashing/rclpy/default.nix
diff --git a/dashing/rcpputils/default.nix b/distros/dashing/rcpputils/default.nix
similarity index 100%
rename from dashing/rcpputils/default.nix
rename to distros/dashing/rcpputils/default.nix
diff --git a/dashing/rcutils/default.nix b/distros/dashing/rcutils/default.nix
similarity index 100%
rename from dashing/rcutils/default.nix
rename to distros/dashing/rcutils/default.nix
diff --git a/dashing/realsense-camera-msgs/default.nix b/distros/dashing/realsense-camera-msgs/default.nix
similarity index 100%
rename from dashing/realsense-camera-msgs/default.nix
rename to distros/dashing/realsense-camera-msgs/default.nix
diff --git a/dashing/realsense-ros2-camera/default.nix b/distros/dashing/realsense-ros2-camera/default.nix
similarity index 100%
rename from dashing/realsense-ros2-camera/default.nix
rename to distros/dashing/realsense-ros2-camera/default.nix
diff --git a/dashing/realtime-tools/default.nix b/distros/dashing/realtime-tools/default.nix
similarity index 100%
rename from dashing/realtime-tools/default.nix
rename to distros/dashing/realtime-tools/default.nix
diff --git a/dashing/resource-retriever/default.nix b/distros/dashing/resource-retriever/default.nix
similarity index 100%
rename from dashing/resource-retriever/default.nix
rename to distros/dashing/resource-retriever/default.nix
diff --git a/dashing/rmw-connext-cpp/default.nix b/distros/dashing/rmw-connext-cpp/default.nix
similarity index 100%
rename from dashing/rmw-connext-cpp/default.nix
rename to distros/dashing/rmw-connext-cpp/default.nix
diff --git a/dashing/rmw-connext-shared-cpp/default.nix b/distros/dashing/rmw-connext-shared-cpp/default.nix
similarity index 100%
rename from dashing/rmw-connext-shared-cpp/default.nix
rename to distros/dashing/rmw-connext-shared-cpp/default.nix
diff --git a/dashing/rmw-cyclonedds-cpp/default.nix b/distros/dashing/rmw-cyclonedds-cpp/default.nix
similarity index 100%
rename from dashing/rmw-cyclonedds-cpp/default.nix
rename to distros/dashing/rmw-cyclonedds-cpp/default.nix
diff --git a/dashing/rmw-fastrtps-cpp/default.nix b/distros/dashing/rmw-fastrtps-cpp/default.nix
similarity index 100%
rename from dashing/rmw-fastrtps-cpp/default.nix
rename to distros/dashing/rmw-fastrtps-cpp/default.nix
diff --git a/dashing/rmw-fastrtps-dynamic-cpp/default.nix b/distros/dashing/rmw-fastrtps-dynamic-cpp/default.nix
similarity index 100%
rename from dashing/rmw-fastrtps-dynamic-cpp/default.nix
rename to distros/dashing/rmw-fastrtps-dynamic-cpp/default.nix
diff --git a/dashing/rmw-fastrtps-shared-cpp/default.nix b/distros/dashing/rmw-fastrtps-shared-cpp/default.nix
similarity index 100%
rename from dashing/rmw-fastrtps-shared-cpp/default.nix
rename to distros/dashing/rmw-fastrtps-shared-cpp/default.nix
diff --git a/dashing/rmw-implementation-cmake/default.nix b/distros/dashing/rmw-implementation-cmake/default.nix
similarity index 100%
rename from dashing/rmw-implementation-cmake/default.nix
rename to distros/dashing/rmw-implementation-cmake/default.nix
diff --git a/dashing/rmw-implementation/default.nix b/distros/dashing/rmw-implementation/default.nix
similarity index 100%
rename from dashing/rmw-implementation/default.nix
rename to distros/dashing/rmw-implementation/default.nix
diff --git a/dashing/rmw-opensplice-cpp/default.nix b/distros/dashing/rmw-opensplice-cpp/default.nix
similarity index 100%
rename from dashing/rmw-opensplice-cpp/default.nix
rename to distros/dashing/rmw-opensplice-cpp/default.nix
diff --git a/dashing/rmw/default.nix b/distros/dashing/rmw/default.nix
similarity index 100%
rename from dashing/rmw/default.nix
rename to distros/dashing/rmw/default.nix
diff --git a/dashing/robot-state-publisher/default.nix b/distros/dashing/robot-state-publisher/default.nix
similarity index 100%
rename from dashing/robot-state-publisher/default.nix
rename to distros/dashing/robot-state-publisher/default.nix
diff --git a/dashing/ros-base/default.nix b/distros/dashing/ros-base/default.nix
similarity index 100%
rename from dashing/ros-base/default.nix
rename to distros/dashing/ros-base/default.nix
diff --git a/dashing/ros-core/default.nix b/distros/dashing/ros-core/default.nix
similarity index 100%
rename from dashing/ros-core/default.nix
rename to distros/dashing/ros-core/default.nix
diff --git a/dashing/ros-environment/default.nix b/distros/dashing/ros-environment/default.nix
similarity index 100%
rename from dashing/ros-environment/default.nix
rename to distros/dashing/ros-environment/default.nix
diff --git a/dashing/ros-monitoring-msgs/default.nix b/distros/dashing/ros-monitoring-msgs/default.nix
similarity index 100%
rename from dashing/ros-monitoring-msgs/default.nix
rename to distros/dashing/ros-monitoring-msgs/default.nix
diff --git a/dashing/ros-testing/default.nix b/distros/dashing/ros-testing/default.nix
similarity index 100%
rename from dashing/ros-testing/default.nix
rename to distros/dashing/ros-testing/default.nix
diff --git a/dashing/ros-workspace/default.nix b/distros/dashing/ros-workspace/default.nix
similarity index 100%
rename from dashing/ros-workspace/default.nix
rename to distros/dashing/ros-workspace/default.nix
diff --git a/dashing/ros1-bridge/default.nix b/distros/dashing/ros1-bridge/default.nix
similarity index 100%
rename from dashing/ros1-bridge/default.nix
rename to distros/dashing/ros1-bridge/default.nix
diff --git a/dashing/ros1-rosbag-storage-vendor/default.nix b/distros/dashing/ros1-rosbag-storage-vendor/default.nix
similarity index 100%
rename from dashing/ros1-rosbag-storage-vendor/default.nix
rename to distros/dashing/ros1-rosbag-storage-vendor/default.nix
diff --git a/dashing/ros2-ouster/default.nix b/distros/dashing/ros2-ouster/default.nix
similarity index 100%
rename from dashing/ros2-ouster/default.nix
rename to distros/dashing/ros2-ouster/default.nix
diff --git a/dashing/ros2action/default.nix b/distros/dashing/ros2action/default.nix
similarity index 100%
rename from dashing/ros2action/default.nix
rename to distros/dashing/ros2action/default.nix
diff --git a/dashing/ros2bag/default.nix b/distros/dashing/ros2bag/default.nix
similarity index 100%
rename from dashing/ros2bag/default.nix
rename to distros/dashing/ros2bag/default.nix
diff --git a/dashing/ros2cli/default.nix b/distros/dashing/ros2cli/default.nix
similarity index 100%
rename from dashing/ros2cli/default.nix
rename to distros/dashing/ros2cli/default.nix
diff --git a/dashing/ros2component/default.nix b/distros/dashing/ros2component/default.nix
similarity index 100%
rename from dashing/ros2component/default.nix
rename to distros/dashing/ros2component/default.nix
diff --git a/dashing/ros2launch/default.nix b/distros/dashing/ros2launch/default.nix
similarity index 100%
rename from dashing/ros2launch/default.nix
rename to distros/dashing/ros2launch/default.nix
diff --git a/dashing/ros2lifecycle/default.nix b/distros/dashing/ros2lifecycle/default.nix
similarity index 100%
rename from dashing/ros2lifecycle/default.nix
rename to distros/dashing/ros2lifecycle/default.nix
diff --git a/dashing/ros2msg/default.nix b/distros/dashing/ros2msg/default.nix
similarity index 100%
rename from dashing/ros2msg/default.nix
rename to distros/dashing/ros2msg/default.nix
diff --git a/dashing/ros2multicast/default.nix b/distros/dashing/ros2multicast/default.nix
similarity index 100%
rename from dashing/ros2multicast/default.nix
rename to distros/dashing/ros2multicast/default.nix
diff --git a/dashing/ros2node/default.nix b/distros/dashing/ros2node/default.nix
similarity index 100%
rename from dashing/ros2node/default.nix
rename to distros/dashing/ros2node/default.nix
diff --git a/dashing/ros2param/default.nix b/distros/dashing/ros2param/default.nix
similarity index 100%
rename from dashing/ros2param/default.nix
rename to distros/dashing/ros2param/default.nix
diff --git a/dashing/ros2pkg/default.nix b/distros/dashing/ros2pkg/default.nix
similarity index 100%
rename from dashing/ros2pkg/default.nix
rename to distros/dashing/ros2pkg/default.nix
diff --git a/dashing/ros2run/default.nix b/distros/dashing/ros2run/default.nix
similarity index 100%
rename from dashing/ros2run/default.nix
rename to distros/dashing/ros2run/default.nix
diff --git a/dashing/ros2service/default.nix b/distros/dashing/ros2service/default.nix
similarity index 100%
rename from dashing/ros2service/default.nix
rename to distros/dashing/ros2service/default.nix
diff --git a/dashing/ros2srv/default.nix b/distros/dashing/ros2srv/default.nix
similarity index 100%
rename from dashing/ros2srv/default.nix
rename to distros/dashing/ros2srv/default.nix
diff --git a/dashing/ros2test/default.nix b/distros/dashing/ros2test/default.nix
similarity index 100%
rename from dashing/ros2test/default.nix
rename to distros/dashing/ros2test/default.nix
diff --git a/dashing/ros2topic/default.nix b/distros/dashing/ros2topic/default.nix
similarity index 100%
rename from dashing/ros2topic/default.nix
rename to distros/dashing/ros2topic/default.nix
diff --git a/dashing/ros2trace-analysis/default.nix b/distros/dashing/ros2trace-analysis/default.nix
similarity index 100%
rename from dashing/ros2trace-analysis/default.nix
rename to distros/dashing/ros2trace-analysis/default.nix
diff --git a/dashing/ros2trace/default.nix b/distros/dashing/ros2trace/default.nix
similarity index 100%
rename from dashing/ros2trace/default.nix
rename to distros/dashing/ros2trace/default.nix
diff --git a/dashing/rosapi/default.nix b/distros/dashing/rosapi/default.nix
similarity index 100%
rename from dashing/rosapi/default.nix
rename to distros/dashing/rosapi/default.nix
diff --git a/dashing/rosauth/default.nix b/distros/dashing/rosauth/default.nix
similarity index 100%
rename from dashing/rosauth/default.nix
rename to distros/dashing/rosauth/default.nix
diff --git a/dashing/rosbag2-bag-v2-plugins/default.nix b/distros/dashing/rosbag2-bag-v2-plugins/default.nix
similarity index 100%
rename from dashing/rosbag2-bag-v2-plugins/default.nix
rename to distros/dashing/rosbag2-bag-v2-plugins/default.nix
diff --git a/dashing/rosbag2-converter-default-plugins/default.nix b/distros/dashing/rosbag2-converter-default-plugins/default.nix
similarity index 100%
rename from dashing/rosbag2-converter-default-plugins/default.nix
rename to distros/dashing/rosbag2-converter-default-plugins/default.nix
diff --git a/dashing/rosbag2-storage-default-plugins/default.nix b/distros/dashing/rosbag2-storage-default-plugins/default.nix
similarity index 100%
rename from dashing/rosbag2-storage-default-plugins/default.nix
rename to distros/dashing/rosbag2-storage-default-plugins/default.nix
diff --git a/dashing/rosbag2-storage/default.nix b/distros/dashing/rosbag2-storage/default.nix
similarity index 100%
rename from dashing/rosbag2-storage/default.nix
rename to distros/dashing/rosbag2-storage/default.nix
diff --git a/dashing/rosbag2-test-common/default.nix b/distros/dashing/rosbag2-test-common/default.nix
similarity index 100%
rename from dashing/rosbag2-test-common/default.nix
rename to distros/dashing/rosbag2-test-common/default.nix
diff --git a/dashing/rosbag2-tests/default.nix b/distros/dashing/rosbag2-tests/default.nix
similarity index 100%
rename from dashing/rosbag2-tests/default.nix
rename to distros/dashing/rosbag2-tests/default.nix
diff --git a/dashing/rosbag2-transport/default.nix b/distros/dashing/rosbag2-transport/default.nix
similarity index 100%
rename from dashing/rosbag2-transport/default.nix
rename to distros/dashing/rosbag2-transport/default.nix
diff --git a/dashing/rosbag2/default.nix b/distros/dashing/rosbag2/default.nix
similarity index 100%
rename from dashing/rosbag2/default.nix
rename to distros/dashing/rosbag2/default.nix
diff --git a/dashing/rosbridge-msgs/default.nix b/distros/dashing/rosbridge-msgs/default.nix
similarity index 100%
rename from dashing/rosbridge-msgs/default.nix
rename to distros/dashing/rosbridge-msgs/default.nix
diff --git a/dashing/rosbridge-server/default.nix b/distros/dashing/rosbridge-server/default.nix
similarity index 100%
rename from dashing/rosbridge-server/default.nix
rename to distros/dashing/rosbridge-server/default.nix
diff --git a/dashing/rosbridge-suite/default.nix b/distros/dashing/rosbridge-suite/default.nix
similarity index 100%
rename from dashing/rosbridge-suite/default.nix
rename to distros/dashing/rosbridge-suite/default.nix
diff --git a/dashing/rosgraph-msgs/default.nix b/distros/dashing/rosgraph-msgs/default.nix
similarity index 100%
rename from dashing/rosgraph-msgs/default.nix
rename to distros/dashing/rosgraph-msgs/default.nix
diff --git a/dashing/rosidl-adapter/default.nix b/distros/dashing/rosidl-adapter/default.nix
similarity index 100%
rename from dashing/rosidl-adapter/default.nix
rename to distros/dashing/rosidl-adapter/default.nix
diff --git a/dashing/rosidl-cmake/default.nix b/distros/dashing/rosidl-cmake/default.nix
similarity index 100%
rename from dashing/rosidl-cmake/default.nix
rename to distros/dashing/rosidl-cmake/default.nix
diff --git a/dashing/rosidl-default-generators/default.nix b/distros/dashing/rosidl-default-generators/default.nix
similarity index 100%
rename from dashing/rosidl-default-generators/default.nix
rename to distros/dashing/rosidl-default-generators/default.nix
diff --git a/dashing/rosidl-default-runtime/default.nix b/distros/dashing/rosidl-default-runtime/default.nix
similarity index 100%
rename from dashing/rosidl-default-runtime/default.nix
rename to distros/dashing/rosidl-default-runtime/default.nix
diff --git a/dashing/rosidl-generator-c/default.nix b/distros/dashing/rosidl-generator-c/default.nix
similarity index 100%
rename from dashing/rosidl-generator-c/default.nix
rename to distros/dashing/rosidl-generator-c/default.nix
diff --git a/dashing/rosidl-generator-cpp/default.nix b/distros/dashing/rosidl-generator-cpp/default.nix
similarity index 100%
rename from dashing/rosidl-generator-cpp/default.nix
rename to distros/dashing/rosidl-generator-cpp/default.nix
diff --git a/dashing/rosidl-generator-dds-idl/default.nix b/distros/dashing/rosidl-generator-dds-idl/default.nix
similarity index 100%
rename from dashing/rosidl-generator-dds-idl/default.nix
rename to distros/dashing/rosidl-generator-dds-idl/default.nix
diff --git a/dashing/rosidl-generator-py/default.nix b/distros/dashing/rosidl-generator-py/default.nix
similarity index 100%
rename from dashing/rosidl-generator-py/default.nix
rename to distros/dashing/rosidl-generator-py/default.nix
diff --git a/dashing/rosidl-parser/default.nix b/distros/dashing/rosidl-parser/default.nix
similarity index 100%
rename from dashing/rosidl-parser/default.nix
rename to distros/dashing/rosidl-parser/default.nix
diff --git a/dashing/rosidl-runtime-py/default.nix b/distros/dashing/rosidl-runtime-py/default.nix
similarity index 100%
rename from dashing/rosidl-runtime-py/default.nix
rename to distros/dashing/rosidl-runtime-py/default.nix
diff --git a/dashing/rosidl-typesupport-c/default.nix b/distros/dashing/rosidl-typesupport-c/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-c/default.nix
rename to distros/dashing/rosidl-typesupport-c/default.nix
diff --git a/dashing/rosidl-typesupport-connext-c/default.nix b/distros/dashing/rosidl-typesupport-connext-c/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-connext-c/default.nix
rename to distros/dashing/rosidl-typesupport-connext-c/default.nix
diff --git a/dashing/rosidl-typesupport-connext-cpp/default.nix b/distros/dashing/rosidl-typesupport-connext-cpp/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-connext-cpp/default.nix
rename to distros/dashing/rosidl-typesupport-connext-cpp/default.nix
diff --git a/dashing/rosidl-typesupport-cpp/default.nix b/distros/dashing/rosidl-typesupport-cpp/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-cpp/default.nix
rename to distros/dashing/rosidl-typesupport-cpp/default.nix
diff --git a/dashing/rosidl-typesupport-fastrtps-c/default.nix b/distros/dashing/rosidl-typesupport-fastrtps-c/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-fastrtps-c/default.nix
rename to distros/dashing/rosidl-typesupport-fastrtps-c/default.nix
diff --git a/dashing/rosidl-typesupport-fastrtps-cpp/default.nix b/distros/dashing/rosidl-typesupport-fastrtps-cpp/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-fastrtps-cpp/default.nix
rename to distros/dashing/rosidl-typesupport-fastrtps-cpp/default.nix
diff --git a/dashing/rosidl-typesupport-interface/default.nix b/distros/dashing/rosidl-typesupport-interface/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-interface/default.nix
rename to distros/dashing/rosidl-typesupport-interface/default.nix
diff --git a/dashing/rosidl-typesupport-introspection-c/default.nix b/distros/dashing/rosidl-typesupport-introspection-c/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-introspection-c/default.nix
rename to distros/dashing/rosidl-typesupport-introspection-c/default.nix
diff --git a/dashing/rosidl-typesupport-introspection-cpp/default.nix b/distros/dashing/rosidl-typesupport-introspection-cpp/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-introspection-cpp/default.nix
rename to distros/dashing/rosidl-typesupport-introspection-cpp/default.nix
diff --git a/dashing/rosidl-typesupport-opensplice-c/default.nix b/distros/dashing/rosidl-typesupport-opensplice-c/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-opensplice-c/default.nix
rename to distros/dashing/rosidl-typesupport-opensplice-c/default.nix
diff --git a/dashing/rosidl-typesupport-opensplice-cpp/default.nix b/distros/dashing/rosidl-typesupport-opensplice-cpp/default.nix
similarity index 100%
rename from dashing/rosidl-typesupport-opensplice-cpp/default.nix
rename to distros/dashing/rosidl-typesupport-opensplice-cpp/default.nix
diff --git a/dashing/rqt-action/default.nix b/distros/dashing/rqt-action/default.nix
similarity index 100%
rename from dashing/rqt-action/default.nix
rename to distros/dashing/rqt-action/default.nix
diff --git a/dashing/rqt-common-plugins/default.nix b/distros/dashing/rqt-common-plugins/default.nix
similarity index 100%
rename from dashing/rqt-common-plugins/default.nix
rename to distros/dashing/rqt-common-plugins/default.nix
diff --git a/dashing/rqt-console/default.nix b/distros/dashing/rqt-console/default.nix
similarity index 100%
rename from dashing/rqt-console/default.nix
rename to distros/dashing/rqt-console/default.nix
diff --git a/dashing/rqt-graph/default.nix b/distros/dashing/rqt-graph/default.nix
similarity index 100%
rename from dashing/rqt-graph/default.nix
rename to distros/dashing/rqt-graph/default.nix
diff --git a/dashing/rqt-gui-cpp/default.nix b/distros/dashing/rqt-gui-cpp/default.nix
similarity index 100%
rename from dashing/rqt-gui-cpp/default.nix
rename to distros/dashing/rqt-gui-cpp/default.nix
diff --git a/dashing/rqt-gui-py/default.nix b/distros/dashing/rqt-gui-py/default.nix
similarity index 100%
rename from dashing/rqt-gui-py/default.nix
rename to distros/dashing/rqt-gui-py/default.nix
diff --git a/dashing/rqt-gui/default.nix b/distros/dashing/rqt-gui/default.nix
similarity index 100%
rename from dashing/rqt-gui/default.nix
rename to distros/dashing/rqt-gui/default.nix
diff --git a/dashing/rqt-image-view/default.nix b/distros/dashing/rqt-image-view/default.nix
similarity index 100%
rename from dashing/rqt-image-view/default.nix
rename to distros/dashing/rqt-image-view/default.nix
diff --git a/dashing/rqt-msg/default.nix b/distros/dashing/rqt-msg/default.nix
similarity index 100%
rename from dashing/rqt-msg/default.nix
rename to distros/dashing/rqt-msg/default.nix
diff --git a/dashing/rqt-plot/default.nix b/distros/dashing/rqt-plot/default.nix
similarity index 100%
rename from dashing/rqt-plot/default.nix
rename to distros/dashing/rqt-plot/default.nix
diff --git a/dashing/rqt-publisher/default.nix b/distros/dashing/rqt-publisher/default.nix
similarity index 100%
rename from dashing/rqt-publisher/default.nix
rename to distros/dashing/rqt-publisher/default.nix
diff --git a/dashing/rqt-py-common/default.nix b/distros/dashing/rqt-py-common/default.nix
similarity index 100%
rename from dashing/rqt-py-common/default.nix
rename to distros/dashing/rqt-py-common/default.nix
diff --git a/dashing/rqt-py-console/default.nix b/distros/dashing/rqt-py-console/default.nix
similarity index 100%
rename from dashing/rqt-py-console/default.nix
rename to distros/dashing/rqt-py-console/default.nix
diff --git a/dashing/rqt-reconfigure/default.nix b/distros/dashing/rqt-reconfigure/default.nix
similarity index 100%
rename from dashing/rqt-reconfigure/default.nix
rename to distros/dashing/rqt-reconfigure/default.nix
diff --git a/dashing/rqt-robot-steering/default.nix b/distros/dashing/rqt-robot-steering/default.nix
similarity index 100%
rename from dashing/rqt-robot-steering/default.nix
rename to distros/dashing/rqt-robot-steering/default.nix
diff --git a/dashing/rqt-service-caller/default.nix b/distros/dashing/rqt-service-caller/default.nix
similarity index 100%
rename from dashing/rqt-service-caller/default.nix
rename to distros/dashing/rqt-service-caller/default.nix
diff --git a/dashing/rqt-shell/default.nix b/distros/dashing/rqt-shell/default.nix
similarity index 100%
rename from dashing/rqt-shell/default.nix
rename to distros/dashing/rqt-shell/default.nix
diff --git a/dashing/rqt-srv/default.nix b/distros/dashing/rqt-srv/default.nix
similarity index 100%
rename from dashing/rqt-srv/default.nix
rename to distros/dashing/rqt-srv/default.nix
diff --git a/dashing/rqt-tf-tree/default.nix b/distros/dashing/rqt-tf-tree/default.nix
similarity index 100%
rename from dashing/rqt-tf-tree/default.nix
rename to distros/dashing/rqt-tf-tree/default.nix
diff --git a/dashing/rqt-top/default.nix b/distros/dashing/rqt-top/default.nix
similarity index 100%
rename from dashing/rqt-top/default.nix
rename to distros/dashing/rqt-top/default.nix
diff --git a/dashing/rqt-topic/default.nix b/distros/dashing/rqt-topic/default.nix
similarity index 100%
rename from dashing/rqt-topic/default.nix
rename to distros/dashing/rqt-topic/default.nix
diff --git a/dashing/rqt/default.nix b/distros/dashing/rqt/default.nix
similarity index 100%
rename from dashing/rqt/default.nix
rename to distros/dashing/rqt/default.nix
diff --git a/dashing/rttest/default.nix b/distros/dashing/rttest/default.nix
similarity index 100%
rename from dashing/rttest/default.nix
rename to distros/dashing/rttest/default.nix
diff --git a/dashing/rviz-assimp-vendor/default.nix b/distros/dashing/rviz-assimp-vendor/default.nix
similarity index 100%
rename from dashing/rviz-assimp-vendor/default.nix
rename to distros/dashing/rviz-assimp-vendor/default.nix
diff --git a/dashing/rviz-common/default.nix b/distros/dashing/rviz-common/default.nix
similarity index 100%
rename from dashing/rviz-common/default.nix
rename to distros/dashing/rviz-common/default.nix
diff --git a/dashing/rviz-default-plugins/default.nix b/distros/dashing/rviz-default-plugins/default.nix
similarity index 100%
rename from dashing/rviz-default-plugins/default.nix
rename to distros/dashing/rviz-default-plugins/default.nix
diff --git a/dashing/rviz-ogre-vendor/default.nix b/distros/dashing/rviz-ogre-vendor/default.nix
similarity index 100%
rename from dashing/rviz-ogre-vendor/default.nix
rename to distros/dashing/rviz-ogre-vendor/default.nix
diff --git a/dashing/rviz-rendering-tests/default.nix b/distros/dashing/rviz-rendering-tests/default.nix
similarity index 100%
rename from dashing/rviz-rendering-tests/default.nix
rename to distros/dashing/rviz-rendering-tests/default.nix
diff --git a/dashing/rviz-rendering/default.nix b/distros/dashing/rviz-rendering/default.nix
similarity index 100%
rename from dashing/rviz-rendering/default.nix
rename to distros/dashing/rviz-rendering/default.nix
diff --git a/dashing/rviz-visual-testing-framework/default.nix b/distros/dashing/rviz-visual-testing-framework/default.nix
similarity index 100%
rename from dashing/rviz-visual-testing-framework/default.nix
rename to distros/dashing/rviz-visual-testing-framework/default.nix
diff --git a/dashing/rviz2/default.nix b/distros/dashing/rviz2/default.nix
similarity index 100%
rename from dashing/rviz2/default.nix
rename to distros/dashing/rviz2/default.nix
diff --git a/dashing/self-test/default.nix b/distros/dashing/self-test/default.nix
similarity index 100%
rename from dashing/self-test/default.nix
rename to distros/dashing/self-test/default.nix
diff --git a/dashing/sensor-msgs/default.nix b/distros/dashing/sensor-msgs/default.nix
similarity index 100%
rename from dashing/sensor-msgs/default.nix
rename to distros/dashing/sensor-msgs/default.nix
diff --git a/dashing/serial-driver/default.nix b/distros/dashing/serial-driver/default.nix
similarity index 100%
rename from dashing/serial-driver/default.nix
rename to distros/dashing/serial-driver/default.nix
diff --git a/dashing/shape-msgs/default.nix b/distros/dashing/shape-msgs/default.nix
similarity index 100%
rename from dashing/shape-msgs/default.nix
rename to distros/dashing/shape-msgs/default.nix
diff --git a/dashing/shared-queues-vendor/default.nix b/distros/dashing/shared-queues-vendor/default.nix
similarity index 100%
rename from dashing/shared-queues-vendor/default.nix
rename to distros/dashing/shared-queues-vendor/default.nix
diff --git a/dashing/sick-scan2/default.nix b/distros/dashing/sick-scan2/default.nix
similarity index 100%
rename from dashing/sick-scan2/default.nix
rename to distros/dashing/sick-scan2/default.nix
diff --git a/dashing/slam-toolbox/default.nix b/distros/dashing/slam-toolbox/default.nix
similarity index 100%
rename from dashing/slam-toolbox/default.nix
rename to distros/dashing/slam-toolbox/default.nix
diff --git a/dashing/sophus/default.nix b/distros/dashing/sophus/default.nix
similarity index 100%
rename from dashing/sophus/default.nix
rename to distros/dashing/sophus/default.nix
diff --git a/dashing/spatio-temporal-voxel-layer/default.nix b/distros/dashing/spatio-temporal-voxel-layer/default.nix
similarity index 100%
rename from dashing/spatio-temporal-voxel-layer/default.nix
rename to distros/dashing/spatio-temporal-voxel-layer/default.nix
diff --git a/dashing/sqlite3-vendor/default.nix b/distros/dashing/sqlite3-vendor/default.nix
similarity index 100%
rename from dashing/sqlite3-vendor/default.nix
rename to distros/dashing/sqlite3-vendor/default.nix
diff --git a/dashing/sros2-cmake/default.nix b/distros/dashing/sros2-cmake/default.nix
similarity index 100%
rename from dashing/sros2-cmake/default.nix
rename to distros/dashing/sros2-cmake/default.nix
diff --git a/dashing/sros2/default.nix b/distros/dashing/sros2/default.nix
similarity index 100%
rename from dashing/sros2/default.nix
rename to distros/dashing/sros2/default.nix
diff --git a/dashing/std-msgs/default.nix b/distros/dashing/std-msgs/default.nix
similarity index 100%
rename from dashing/std-msgs/default.nix
rename to distros/dashing/std-msgs/default.nix
diff --git a/dashing/std-srvs/default.nix b/distros/dashing/std-srvs/default.nix
similarity index 100%
rename from dashing/std-srvs/default.nix
rename to distros/dashing/std-srvs/default.nix
diff --git a/dashing/stereo-msgs/default.nix b/distros/dashing/stereo-msgs/default.nix
similarity index 100%
rename from dashing/stereo-msgs/default.nix
rename to distros/dashing/stereo-msgs/default.nix
diff --git a/dashing/swri-console-util/default.nix b/distros/dashing/swri-console-util/default.nix
similarity index 100%
rename from dashing/swri-console-util/default.nix
rename to distros/dashing/swri-console-util/default.nix
diff --git a/dashing/swri-dbw-interface/default.nix b/distros/dashing/swri-dbw-interface/default.nix
similarity index 100%
rename from dashing/swri-dbw-interface/default.nix
rename to distros/dashing/swri-dbw-interface/default.nix
diff --git a/dashing/swri-geometry-util/default.nix b/distros/dashing/swri-geometry-util/default.nix
similarity index 100%
rename from dashing/swri-geometry-util/default.nix
rename to distros/dashing/swri-geometry-util/default.nix
diff --git a/dashing/swri-image-util/default.nix b/distros/dashing/swri-image-util/default.nix
similarity index 100%
rename from dashing/swri-image-util/default.nix
rename to distros/dashing/swri-image-util/default.nix
diff --git a/dashing/swri-math-util/default.nix b/distros/dashing/swri-math-util/default.nix
similarity index 100%
rename from dashing/swri-math-util/default.nix
rename to distros/dashing/swri-math-util/default.nix
diff --git a/dashing/swri-opencv-util/default.nix b/distros/dashing/swri-opencv-util/default.nix
similarity index 100%
rename from dashing/swri-opencv-util/default.nix
rename to distros/dashing/swri-opencv-util/default.nix
diff --git a/dashing/swri-prefix-tools/default.nix b/distros/dashing/swri-prefix-tools/default.nix
similarity index 100%
rename from dashing/swri-prefix-tools/default.nix
rename to distros/dashing/swri-prefix-tools/default.nix
diff --git a/dashing/swri-roscpp/default.nix b/distros/dashing/swri-roscpp/default.nix
similarity index 100%
rename from dashing/swri-roscpp/default.nix
rename to distros/dashing/swri-roscpp/default.nix
diff --git a/dashing/swri-route-util/default.nix b/distros/dashing/swri-route-util/default.nix
similarity index 100%
rename from dashing/swri-route-util/default.nix
rename to distros/dashing/swri-route-util/default.nix
diff --git a/dashing/swri-serial-util/default.nix b/distros/dashing/swri-serial-util/default.nix
similarity index 100%
rename from dashing/swri-serial-util/default.nix
rename to distros/dashing/swri-serial-util/default.nix
diff --git a/dashing/swri-system-util/default.nix b/distros/dashing/swri-system-util/default.nix
similarity index 100%
rename from dashing/swri-system-util/default.nix
rename to distros/dashing/swri-system-util/default.nix
diff --git a/dashing/swri-transform-util/default.nix b/distros/dashing/swri-transform-util/default.nix
similarity index 100%
rename from dashing/swri-transform-util/default.nix
rename to distros/dashing/swri-transform-util/default.nix
diff --git a/dashing/system-modes-examples/default.nix b/distros/dashing/system-modes-examples/default.nix
similarity index 100%
rename from dashing/system-modes-examples/default.nix
rename to distros/dashing/system-modes-examples/default.nix
diff --git a/dashing/system-modes/default.nix b/distros/dashing/system-modes/default.nix
similarity index 100%
rename from dashing/system-modes/default.nix
rename to distros/dashing/system-modes/default.nix
diff --git a/dashing/teleop-tools-msgs/default.nix b/distros/dashing/teleop-tools-msgs/default.nix
similarity index 100%
rename from dashing/teleop-tools-msgs/default.nix
rename to distros/dashing/teleop-tools-msgs/default.nix
diff --git a/dashing/teleop-tools/default.nix b/distros/dashing/teleop-tools/default.nix
similarity index 100%
rename from dashing/teleop-tools/default.nix
rename to distros/dashing/teleop-tools/default.nix
diff --git a/dashing/teleop-twist-joy/default.nix b/distros/dashing/teleop-twist-joy/default.nix
similarity index 100%
rename from dashing/teleop-twist-joy/default.nix
rename to distros/dashing/teleop-twist-joy/default.nix
diff --git a/dashing/teleop-twist-keyboard/default.nix b/distros/dashing/teleop-twist-keyboard/default.nix
similarity index 100%
rename from dashing/teleop-twist-keyboard/default.nix
rename to distros/dashing/teleop-twist-keyboard/default.nix
diff --git a/dashing/test-interface-files/default.nix b/distros/dashing/test-interface-files/default.nix
similarity index 100%
rename from dashing/test-interface-files/default.nix
rename to distros/dashing/test-interface-files/default.nix
diff --git a/dashing/test-msgs/default.nix b/distros/dashing/test-msgs/default.nix
similarity index 100%
rename from dashing/test-msgs/default.nix
rename to distros/dashing/test-msgs/default.nix
diff --git a/dashing/test-osrf-testing-tools-cpp/default.nix b/distros/dashing/test-osrf-testing-tools-cpp/default.nix
similarity index 100%
rename from dashing/test-osrf-testing-tools-cpp/default.nix
rename to distros/dashing/test-osrf-testing-tools-cpp/default.nix
diff --git a/dashing/tf2-eigen/default.nix b/distros/dashing/tf2-eigen/default.nix
similarity index 100%
rename from dashing/tf2-eigen/default.nix
rename to distros/dashing/tf2-eigen/default.nix
diff --git a/dashing/tf2-geometry-msgs/default.nix b/distros/dashing/tf2-geometry-msgs/default.nix
similarity index 100%
rename from dashing/tf2-geometry-msgs/default.nix
rename to distros/dashing/tf2-geometry-msgs/default.nix
diff --git a/dashing/tf2-kdl/default.nix b/distros/dashing/tf2-kdl/default.nix
similarity index 100%
rename from dashing/tf2-kdl/default.nix
rename to distros/dashing/tf2-kdl/default.nix
diff --git a/dashing/tf2-msgs/default.nix b/distros/dashing/tf2-msgs/default.nix
similarity index 100%
rename from dashing/tf2-msgs/default.nix
rename to distros/dashing/tf2-msgs/default.nix
diff --git a/dashing/tf2-ros/default.nix b/distros/dashing/tf2-ros/default.nix
similarity index 100%
rename from dashing/tf2-ros/default.nix
rename to distros/dashing/tf2-ros/default.nix
diff --git a/dashing/tf2-sensor-msgs/default.nix b/distros/dashing/tf2-sensor-msgs/default.nix
similarity index 100%
rename from dashing/tf2-sensor-msgs/default.nix
rename to distros/dashing/tf2-sensor-msgs/default.nix
diff --git a/dashing/tf2/default.nix b/distros/dashing/tf2/default.nix
similarity index 100%
rename from dashing/tf2/default.nix
rename to distros/dashing/tf2/default.nix
diff --git a/dashing/theora-image-transport/default.nix b/distros/dashing/theora-image-transport/default.nix
similarity index 100%
rename from dashing/theora-image-transport/default.nix
rename to distros/dashing/theora-image-transport/default.nix
diff --git a/dashing/tinydir-vendor/default.nix b/distros/dashing/tinydir-vendor/default.nix
similarity index 100%
rename from dashing/tinydir-vendor/default.nix
rename to distros/dashing/tinydir-vendor/default.nix
diff --git a/dashing/tinyxml-vendor/default.nix b/distros/dashing/tinyxml-vendor/default.nix
similarity index 100%
rename from dashing/tinyxml-vendor/default.nix
rename to distros/dashing/tinyxml-vendor/default.nix
diff --git a/dashing/tinyxml2-vendor/default.nix b/distros/dashing/tinyxml2-vendor/default.nix
similarity index 100%
rename from dashing/tinyxml2-vendor/default.nix
rename to distros/dashing/tinyxml2-vendor/default.nix
diff --git a/dashing/tlsf-cpp/default.nix b/distros/dashing/tlsf-cpp/default.nix
similarity index 100%
rename from dashing/tlsf-cpp/default.nix
rename to distros/dashing/tlsf-cpp/default.nix
diff --git a/dashing/tlsf/default.nix b/distros/dashing/tlsf/default.nix
similarity index 100%
rename from dashing/tlsf/default.nix
rename to distros/dashing/tlsf/default.nix
diff --git a/dashing/topic-monitor/default.nix b/distros/dashing/topic-monitor/default.nix
similarity index 100%
rename from dashing/topic-monitor/default.nix
rename to distros/dashing/topic-monitor/default.nix
diff --git a/dashing/tracetools-analysis/default.nix b/distros/dashing/tracetools-analysis/default.nix
similarity index 100%
rename from dashing/tracetools-analysis/default.nix
rename to distros/dashing/tracetools-analysis/default.nix
diff --git a/dashing/tracetools-launch/default.nix b/distros/dashing/tracetools-launch/default.nix
similarity index 100%
rename from dashing/tracetools-launch/default.nix
rename to distros/dashing/tracetools-launch/default.nix
diff --git a/dashing/tracetools-test/default.nix b/distros/dashing/tracetools-test/default.nix
similarity index 100%
rename from dashing/tracetools-test/default.nix
rename to distros/dashing/tracetools-test/default.nix
diff --git a/dashing/tracetools/default.nix b/distros/dashing/tracetools/default.nix
similarity index 100%
rename from dashing/tracetools/default.nix
rename to distros/dashing/tracetools/default.nix
diff --git a/dashing/trajectory-msgs/default.nix b/distros/dashing/trajectory-msgs/default.nix
similarity index 100%
rename from dashing/trajectory-msgs/default.nix
rename to distros/dashing/trajectory-msgs/default.nix
diff --git a/dashing/tts-interfaces/default.nix b/distros/dashing/tts-interfaces/default.nix
similarity index 100%
rename from dashing/tts-interfaces/default.nix
rename to distros/dashing/tts-interfaces/default.nix
diff --git a/dashing/turtlebot3-bringup/default.nix b/distros/dashing/turtlebot3-bringup/default.nix
similarity index 100%
rename from dashing/turtlebot3-bringup/default.nix
rename to distros/dashing/turtlebot3-bringup/default.nix
diff --git a/dashing/turtlebot3-cartographer/default.nix b/distros/dashing/turtlebot3-cartographer/default.nix
similarity index 100%
rename from dashing/turtlebot3-cartographer/default.nix
rename to distros/dashing/turtlebot3-cartographer/default.nix
diff --git a/dashing/turtlebot3-description/default.nix b/distros/dashing/turtlebot3-description/default.nix
similarity index 100%
rename from dashing/turtlebot3-description/default.nix
rename to distros/dashing/turtlebot3-description/default.nix
diff --git a/dashing/turtlebot3-gazebo/default.nix b/distros/dashing/turtlebot3-gazebo/default.nix
similarity index 100%
rename from dashing/turtlebot3-gazebo/default.nix
rename to distros/dashing/turtlebot3-gazebo/default.nix
diff --git a/dashing/turtlebot3-msgs/default.nix b/distros/dashing/turtlebot3-msgs/default.nix
similarity index 100%
rename from dashing/turtlebot3-msgs/default.nix
rename to distros/dashing/turtlebot3-msgs/default.nix
diff --git a/dashing/turtlebot3-navigation2/default.nix b/distros/dashing/turtlebot3-navigation2/default.nix
similarity index 100%
rename from dashing/turtlebot3-navigation2/default.nix
rename to distros/dashing/turtlebot3-navigation2/default.nix
diff --git a/dashing/turtlebot3-node/default.nix b/distros/dashing/turtlebot3-node/default.nix
similarity index 100%
rename from dashing/turtlebot3-node/default.nix
rename to distros/dashing/turtlebot3-node/default.nix
diff --git a/dashing/turtlebot3-simulations/default.nix b/distros/dashing/turtlebot3-simulations/default.nix
similarity index 100%
rename from dashing/turtlebot3-simulations/default.nix
rename to distros/dashing/turtlebot3-simulations/default.nix
diff --git a/dashing/turtlebot3-teleop/default.nix b/distros/dashing/turtlebot3-teleop/default.nix
similarity index 100%
rename from dashing/turtlebot3-teleop/default.nix
rename to distros/dashing/turtlebot3-teleop/default.nix
diff --git a/dashing/turtlebot3/default.nix b/distros/dashing/turtlebot3/default.nix
similarity index 100%
rename from dashing/turtlebot3/default.nix
rename to distros/dashing/turtlebot3/default.nix
diff --git a/dashing/turtlesim/default.nix b/distros/dashing/turtlesim/default.nix
similarity index 100%
rename from dashing/turtlesim/default.nix
rename to distros/dashing/turtlesim/default.nix
diff --git a/dashing/udp-driver/default.nix b/distros/dashing/udp-driver/default.nix
similarity index 100%
rename from dashing/udp-driver/default.nix
rename to distros/dashing/udp-driver/default.nix
diff --git a/dashing/uncrustify-vendor/default.nix b/distros/dashing/uncrustify-vendor/default.nix
similarity index 100%
rename from dashing/uncrustify-vendor/default.nix
rename to distros/dashing/uncrustify-vendor/default.nix
diff --git a/dashing/unique-identifier-msgs/default.nix b/distros/dashing/unique-identifier-msgs/default.nix
similarity index 100%
rename from dashing/unique-identifier-msgs/default.nix
rename to distros/dashing/unique-identifier-msgs/default.nix
diff --git a/dashing/urdf/default.nix b/distros/dashing/urdf/default.nix
similarity index 100%
rename from dashing/urdf/default.nix
rename to distros/dashing/urdf/default.nix
diff --git a/dashing/urdfdom-headers/default.nix b/distros/dashing/urdfdom-headers/default.nix
similarity index 100%
rename from dashing/urdfdom-headers/default.nix
rename to distros/dashing/urdfdom-headers/default.nix
diff --git a/dashing/urdfdom/default.nix b/distros/dashing/urdfdom/default.nix
similarity index 100%
rename from dashing/urdfdom/default.nix
rename to distros/dashing/urdfdom/default.nix
diff --git a/dashing/v4l2-camera/default.nix b/distros/dashing/v4l2-camera/default.nix
similarity index 100%
rename from dashing/v4l2-camera/default.nix
rename to distros/dashing/v4l2-camera/default.nix
diff --git a/dashing/velodyne-driver/default.nix b/distros/dashing/velodyne-driver/default.nix
similarity index 100%
rename from dashing/velodyne-driver/default.nix
rename to distros/dashing/velodyne-driver/default.nix
diff --git a/dashing/velodyne-node/default.nix b/distros/dashing/velodyne-node/default.nix
similarity index 100%
rename from dashing/velodyne-node/default.nix
rename to distros/dashing/velodyne-node/default.nix
diff --git a/dashing/vision-opencv/default.nix b/distros/dashing/vision-opencv/default.nix
similarity index 100%
rename from dashing/vision-opencv/default.nix
rename to distros/dashing/vision-opencv/default.nix
diff --git a/dashing/visualization-msgs/default.nix b/distros/dashing/visualization-msgs/default.nix
similarity index 100%
rename from dashing/visualization-msgs/default.nix
rename to distros/dashing/visualization-msgs/default.nix
diff --git a/dashing/voxel-grid-nodes/default.nix b/distros/dashing/voxel-grid-nodes/default.nix
similarity index 100%
rename from dashing/voxel-grid-nodes/default.nix
rename to distros/dashing/voxel-grid-nodes/default.nix
diff --git a/dashing/voxel-grid/default.nix b/distros/dashing/voxel-grid/default.nix
similarity index 100%
rename from dashing/voxel-grid/default.nix
rename to distros/dashing/voxel-grid/default.nix
diff --git a/dashing/web-video-server/default.nix b/distros/dashing/web-video-server/default.nix
similarity index 100%
rename from dashing/web-video-server/default.nix
rename to distros/dashing/web-video-server/default.nix
diff --git a/dashing/xacro/default.nix b/distros/dashing/xacro/default.nix
similarity index 100%
rename from dashing/xacro/default.nix
rename to distros/dashing/xacro/default.nix
diff --git a/dashing/yaml-cpp-vendor/default.nix b/distros/dashing/yaml-cpp-vendor/default.nix
similarity index 100%
rename from dashing/yaml-cpp-vendor/default.nix
rename to distros/dashing/yaml-cpp-vendor/default.nix
diff --git a/distros.nix b/distros/default.nix
similarity index 94%
rename from distros.nix
rename to distros/default.nix
index a2a83dae25..59a4f4eb73 100644
--- a/distros.nix
+++ b/distros/default.nix
@@ -2,7 +2,7 @@
 
 self: super: {
   rosPackages = rec {
-    lib = super.lib // import ./lib { inherit self; };
+    lib = super.lib // import ../lib { inherit self; };
 
     kinetic = import ./distro-overlay.nix {
       distro = "kinetic";
diff --git a/distro-overlay.nix b/distros/distro-overlay.nix
similarity index 99%
rename from distro-overlay.nix
rename to distros/distro-overlay.nix
index da6a14457c..a3454e9b13 100644
--- a/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -2,7 +2,7 @@
 self: super:
 let
   base = rosSelf: rosSuper: {
-    lib = super.lib // import ./lib { inherit self rosSelf; };
+    lib = super.lib // import ../lib { inherit self rosSelf; };
   
     callPackage = self.newScope rosSelf;
 
diff --git a/eloquent/action-msgs/default.nix b/distros/eloquent/action-msgs/default.nix
similarity index 100%
rename from eloquent/action-msgs/default.nix
rename to distros/eloquent/action-msgs/default.nix
diff --git a/eloquent/action-tutorials-cpp/default.nix b/distros/eloquent/action-tutorials-cpp/default.nix
similarity index 100%
rename from eloquent/action-tutorials-cpp/default.nix
rename to distros/eloquent/action-tutorials-cpp/default.nix
diff --git a/eloquent/action-tutorials-interfaces/default.nix b/distros/eloquent/action-tutorials-interfaces/default.nix
similarity index 100%
rename from eloquent/action-tutorials-interfaces/default.nix
rename to distros/eloquent/action-tutorials-interfaces/default.nix
diff --git a/eloquent/action-tutorials-py/default.nix b/distros/eloquent/action-tutorials-py/default.nix
similarity index 100%
rename from eloquent/action-tutorials-py/default.nix
rename to distros/eloquent/action-tutorials-py/default.nix
diff --git a/eloquent/actionlib-msgs/default.nix b/distros/eloquent/actionlib-msgs/default.nix
similarity index 100%
rename from eloquent/actionlib-msgs/default.nix
rename to distros/eloquent/actionlib-msgs/default.nix
diff --git a/eloquent/ament-clang-format/default.nix b/distros/eloquent/ament-clang-format/default.nix
similarity index 100%
rename from eloquent/ament-clang-format/default.nix
rename to distros/eloquent/ament-clang-format/default.nix
diff --git a/eloquent/ament-clang-tidy/default.nix b/distros/eloquent/ament-clang-tidy/default.nix
similarity index 100%
rename from eloquent/ament-clang-tidy/default.nix
rename to distros/eloquent/ament-clang-tidy/default.nix
diff --git a/eloquent/ament-cmake-auto/default.nix b/distros/eloquent/ament-cmake-auto/default.nix
similarity index 100%
rename from eloquent/ament-cmake-auto/default.nix
rename to distros/eloquent/ament-cmake-auto/default.nix
diff --git a/eloquent/ament-cmake-clang-format/default.nix b/distros/eloquent/ament-cmake-clang-format/default.nix
similarity index 100%
rename from eloquent/ament-cmake-clang-format/default.nix
rename to distros/eloquent/ament-cmake-clang-format/default.nix
diff --git a/eloquent/ament-cmake-clang-tidy/default.nix b/distros/eloquent/ament-cmake-clang-tidy/default.nix
similarity index 100%
rename from eloquent/ament-cmake-clang-tidy/default.nix
rename to distros/eloquent/ament-cmake-clang-tidy/default.nix
diff --git a/eloquent/ament-cmake-copyright/default.nix b/distros/eloquent/ament-cmake-copyright/default.nix
similarity index 100%
rename from eloquent/ament-cmake-copyright/default.nix
rename to distros/eloquent/ament-cmake-copyright/default.nix
diff --git a/eloquent/ament-cmake-core/default.nix b/distros/eloquent/ament-cmake-core/default.nix
similarity index 100%
rename from eloquent/ament-cmake-core/default.nix
rename to distros/eloquent/ament-cmake-core/default.nix
diff --git a/eloquent/ament-cmake-cppcheck/default.nix b/distros/eloquent/ament-cmake-cppcheck/default.nix
similarity index 100%
rename from eloquent/ament-cmake-cppcheck/default.nix
rename to distros/eloquent/ament-cmake-cppcheck/default.nix
diff --git a/eloquent/ament-cmake-cpplint/default.nix b/distros/eloquent/ament-cmake-cpplint/default.nix
similarity index 100%
rename from eloquent/ament-cmake-cpplint/default.nix
rename to distros/eloquent/ament-cmake-cpplint/default.nix
diff --git a/eloquent/ament-cmake-export-definitions/default.nix b/distros/eloquent/ament-cmake-export-definitions/default.nix
similarity index 100%
rename from eloquent/ament-cmake-export-definitions/default.nix
rename to distros/eloquent/ament-cmake-export-definitions/default.nix
diff --git a/eloquent/ament-cmake-export-dependencies/default.nix b/distros/eloquent/ament-cmake-export-dependencies/default.nix
similarity index 100%
rename from eloquent/ament-cmake-export-dependencies/default.nix
rename to distros/eloquent/ament-cmake-export-dependencies/default.nix
diff --git a/eloquent/ament-cmake-export-include-directories/default.nix b/distros/eloquent/ament-cmake-export-include-directories/default.nix
similarity index 100%
rename from eloquent/ament-cmake-export-include-directories/default.nix
rename to distros/eloquent/ament-cmake-export-include-directories/default.nix
diff --git a/eloquent/ament-cmake-export-interfaces/default.nix b/distros/eloquent/ament-cmake-export-interfaces/default.nix
similarity index 100%
rename from eloquent/ament-cmake-export-interfaces/default.nix
rename to distros/eloquent/ament-cmake-export-interfaces/default.nix
diff --git a/eloquent/ament-cmake-export-libraries/default.nix b/distros/eloquent/ament-cmake-export-libraries/default.nix
similarity index 100%
rename from eloquent/ament-cmake-export-libraries/default.nix
rename to distros/eloquent/ament-cmake-export-libraries/default.nix
diff --git a/eloquent/ament-cmake-export-link-flags/default.nix b/distros/eloquent/ament-cmake-export-link-flags/default.nix
similarity index 100%
rename from eloquent/ament-cmake-export-link-flags/default.nix
rename to distros/eloquent/ament-cmake-export-link-flags/default.nix
diff --git a/eloquent/ament-cmake-flake8/default.nix b/distros/eloquent/ament-cmake-flake8/default.nix
similarity index 100%
rename from eloquent/ament-cmake-flake8/default.nix
rename to distros/eloquent/ament-cmake-flake8/default.nix
diff --git a/eloquent/ament-cmake-gmock/default.nix b/distros/eloquent/ament-cmake-gmock/default.nix
similarity index 100%
rename from eloquent/ament-cmake-gmock/default.nix
rename to distros/eloquent/ament-cmake-gmock/default.nix
diff --git a/eloquent/ament-cmake-gtest/default.nix b/distros/eloquent/ament-cmake-gtest/default.nix
similarity index 100%
rename from eloquent/ament-cmake-gtest/default.nix
rename to distros/eloquent/ament-cmake-gtest/default.nix
diff --git a/eloquent/ament-cmake-include-directories/default.nix b/distros/eloquent/ament-cmake-include-directories/default.nix
similarity index 100%
rename from eloquent/ament-cmake-include-directories/default.nix
rename to distros/eloquent/ament-cmake-include-directories/default.nix
diff --git a/eloquent/ament-cmake-libraries/default.nix b/distros/eloquent/ament-cmake-libraries/default.nix
similarity index 100%
rename from eloquent/ament-cmake-libraries/default.nix
rename to distros/eloquent/ament-cmake-libraries/default.nix
diff --git a/eloquent/ament-cmake-lint-cmake/default.nix b/distros/eloquent/ament-cmake-lint-cmake/default.nix
similarity index 100%
rename from eloquent/ament-cmake-lint-cmake/default.nix
rename to distros/eloquent/ament-cmake-lint-cmake/default.nix
diff --git a/eloquent/ament-cmake-mypy/default.nix b/distros/eloquent/ament-cmake-mypy/default.nix
similarity index 100%
rename from eloquent/ament-cmake-mypy/default.nix
rename to distros/eloquent/ament-cmake-mypy/default.nix
diff --git a/eloquent/ament-cmake-nose/default.nix b/distros/eloquent/ament-cmake-nose/default.nix
similarity index 100%
rename from eloquent/ament-cmake-nose/default.nix
rename to distros/eloquent/ament-cmake-nose/default.nix
diff --git a/eloquent/ament-cmake-pclint/default.nix b/distros/eloquent/ament-cmake-pclint/default.nix
similarity index 100%
rename from eloquent/ament-cmake-pclint/default.nix
rename to distros/eloquent/ament-cmake-pclint/default.nix
diff --git a/eloquent/ament-cmake-pep257/default.nix b/distros/eloquent/ament-cmake-pep257/default.nix
similarity index 100%
rename from eloquent/ament-cmake-pep257/default.nix
rename to distros/eloquent/ament-cmake-pep257/default.nix
diff --git a/eloquent/ament-cmake-pep8/default.nix b/distros/eloquent/ament-cmake-pep8/default.nix
similarity index 100%
rename from eloquent/ament-cmake-pep8/default.nix
rename to distros/eloquent/ament-cmake-pep8/default.nix
diff --git a/eloquent/ament-cmake-pyflakes/default.nix b/distros/eloquent/ament-cmake-pyflakes/default.nix
similarity index 100%
rename from eloquent/ament-cmake-pyflakes/default.nix
rename to distros/eloquent/ament-cmake-pyflakes/default.nix
diff --git a/eloquent/ament-cmake-pytest/default.nix b/distros/eloquent/ament-cmake-pytest/default.nix
similarity index 100%
rename from eloquent/ament-cmake-pytest/default.nix
rename to distros/eloquent/ament-cmake-pytest/default.nix
diff --git a/eloquent/ament-cmake-python/default.nix b/distros/eloquent/ament-cmake-python/default.nix
similarity index 100%
rename from eloquent/ament-cmake-python/default.nix
rename to distros/eloquent/ament-cmake-python/default.nix
diff --git a/eloquent/ament-cmake-ros/default.nix b/distros/eloquent/ament-cmake-ros/default.nix
similarity index 100%
rename from eloquent/ament-cmake-ros/default.nix
rename to distros/eloquent/ament-cmake-ros/default.nix
diff --git a/eloquent/ament-cmake-target-dependencies/default.nix b/distros/eloquent/ament-cmake-target-dependencies/default.nix
similarity index 100%
rename from eloquent/ament-cmake-target-dependencies/default.nix
rename to distros/eloquent/ament-cmake-target-dependencies/default.nix
diff --git a/eloquent/ament-cmake-test/default.nix b/distros/eloquent/ament-cmake-test/default.nix
similarity index 100%
rename from eloquent/ament-cmake-test/default.nix
rename to distros/eloquent/ament-cmake-test/default.nix
diff --git a/eloquent/ament-cmake-uncrustify/default.nix b/distros/eloquent/ament-cmake-uncrustify/default.nix
similarity index 100%
rename from eloquent/ament-cmake-uncrustify/default.nix
rename to distros/eloquent/ament-cmake-uncrustify/default.nix
diff --git a/eloquent/ament-cmake-version/default.nix b/distros/eloquent/ament-cmake-version/default.nix
similarity index 100%
rename from eloquent/ament-cmake-version/default.nix
rename to distros/eloquent/ament-cmake-version/default.nix
diff --git a/eloquent/ament-cmake-xmllint/default.nix b/distros/eloquent/ament-cmake-xmllint/default.nix
similarity index 100%
rename from eloquent/ament-cmake-xmllint/default.nix
rename to distros/eloquent/ament-cmake-xmllint/default.nix
diff --git a/eloquent/ament-cmake/default.nix b/distros/eloquent/ament-cmake/default.nix
similarity index 100%
rename from eloquent/ament-cmake/default.nix
rename to distros/eloquent/ament-cmake/default.nix
diff --git a/eloquent/ament-copyright/default.nix b/distros/eloquent/ament-copyright/default.nix
similarity index 100%
rename from eloquent/ament-copyright/default.nix
rename to distros/eloquent/ament-copyright/default.nix
diff --git a/eloquent/ament-cppcheck/default.nix b/distros/eloquent/ament-cppcheck/default.nix
similarity index 100%
rename from eloquent/ament-cppcheck/default.nix
rename to distros/eloquent/ament-cppcheck/default.nix
diff --git a/eloquent/ament-cpplint/default.nix b/distros/eloquent/ament-cpplint/default.nix
similarity index 100%
rename from eloquent/ament-cpplint/default.nix
rename to distros/eloquent/ament-cpplint/default.nix
diff --git a/eloquent/ament-flake8/default.nix b/distros/eloquent/ament-flake8/default.nix
similarity index 100%
rename from eloquent/ament-flake8/default.nix
rename to distros/eloquent/ament-flake8/default.nix
diff --git a/eloquent/ament-index-cpp/default.nix b/distros/eloquent/ament-index-cpp/default.nix
similarity index 100%
rename from eloquent/ament-index-cpp/default.nix
rename to distros/eloquent/ament-index-cpp/default.nix
diff --git a/eloquent/ament-index-python/default.nix b/distros/eloquent/ament-index-python/default.nix
similarity index 100%
rename from eloquent/ament-index-python/default.nix
rename to distros/eloquent/ament-index-python/default.nix
diff --git a/eloquent/ament-lint-auto/default.nix b/distros/eloquent/ament-lint-auto/default.nix
similarity index 100%
rename from eloquent/ament-lint-auto/default.nix
rename to distros/eloquent/ament-lint-auto/default.nix
diff --git a/eloquent/ament-lint-cmake/default.nix b/distros/eloquent/ament-lint-cmake/default.nix
similarity index 100%
rename from eloquent/ament-lint-cmake/default.nix
rename to distros/eloquent/ament-lint-cmake/default.nix
diff --git a/eloquent/ament-lint-common/default.nix b/distros/eloquent/ament-lint-common/default.nix
similarity index 100%
rename from eloquent/ament-lint-common/default.nix
rename to distros/eloquent/ament-lint-common/default.nix
diff --git a/eloquent/ament-lint/default.nix b/distros/eloquent/ament-lint/default.nix
similarity index 100%
rename from eloquent/ament-lint/default.nix
rename to distros/eloquent/ament-lint/default.nix
diff --git a/eloquent/ament-mypy/default.nix b/distros/eloquent/ament-mypy/default.nix
similarity index 100%
rename from eloquent/ament-mypy/default.nix
rename to distros/eloquent/ament-mypy/default.nix
diff --git a/eloquent/ament-package/default.nix b/distros/eloquent/ament-package/default.nix
similarity index 100%
rename from eloquent/ament-package/default.nix
rename to distros/eloquent/ament-package/default.nix
diff --git a/eloquent/ament-pclint/default.nix b/distros/eloquent/ament-pclint/default.nix
similarity index 100%
rename from eloquent/ament-pclint/default.nix
rename to distros/eloquent/ament-pclint/default.nix
diff --git a/eloquent/ament-pep257/default.nix b/distros/eloquent/ament-pep257/default.nix
similarity index 100%
rename from eloquent/ament-pep257/default.nix
rename to distros/eloquent/ament-pep257/default.nix
diff --git a/eloquent/ament-pep8/default.nix b/distros/eloquent/ament-pep8/default.nix
similarity index 100%
rename from eloquent/ament-pep8/default.nix
rename to distros/eloquent/ament-pep8/default.nix
diff --git a/eloquent/ament-pyflakes/default.nix b/distros/eloquent/ament-pyflakes/default.nix
similarity index 100%
rename from eloquent/ament-pyflakes/default.nix
rename to distros/eloquent/ament-pyflakes/default.nix
diff --git a/eloquent/ament-uncrustify/default.nix b/distros/eloquent/ament-uncrustify/default.nix
similarity index 100%
rename from eloquent/ament-uncrustify/default.nix
rename to distros/eloquent/ament-uncrustify/default.nix
diff --git a/eloquent/ament-xmllint/default.nix b/distros/eloquent/ament-xmllint/default.nix
similarity index 100%
rename from eloquent/ament-xmllint/default.nix
rename to distros/eloquent/ament-xmllint/default.nix
diff --git a/eloquent/angles/default.nix b/distros/eloquent/angles/default.nix
similarity index 100%
rename from eloquent/angles/default.nix
rename to distros/eloquent/angles/default.nix
diff --git a/eloquent/automotive-autonomy-msgs/default.nix b/distros/eloquent/automotive-autonomy-msgs/default.nix
similarity index 100%
rename from eloquent/automotive-autonomy-msgs/default.nix
rename to distros/eloquent/automotive-autonomy-msgs/default.nix
diff --git a/eloquent/automotive-navigation-msgs/default.nix b/distros/eloquent/automotive-navigation-msgs/default.nix
similarity index 100%
rename from eloquent/automotive-navigation-msgs/default.nix
rename to distros/eloquent/automotive-navigation-msgs/default.nix
diff --git a/eloquent/automotive-platform-msgs/default.nix b/distros/eloquent/automotive-platform-msgs/default.nix
similarity index 100%
rename from eloquent/automotive-platform-msgs/default.nix
rename to distros/eloquent/automotive-platform-msgs/default.nix
diff --git a/eloquent/behaviortree-cpp-v3/default.nix b/distros/eloquent/behaviortree-cpp-v3/default.nix
similarity index 100%
rename from eloquent/behaviortree-cpp-v3/default.nix
rename to distros/eloquent/behaviortree-cpp-v3/default.nix
diff --git a/eloquent/builtin-interfaces/default.nix b/distros/eloquent/builtin-interfaces/default.nix
similarity index 100%
rename from eloquent/builtin-interfaces/default.nix
rename to distros/eloquent/builtin-interfaces/default.nix
diff --git a/eloquent/camera-calibration-parsers/default.nix b/distros/eloquent/camera-calibration-parsers/default.nix
similarity index 100%
rename from eloquent/camera-calibration-parsers/default.nix
rename to distros/eloquent/camera-calibration-parsers/default.nix
diff --git a/eloquent/camera-info-manager/default.nix b/distros/eloquent/camera-info-manager/default.nix
similarity index 100%
rename from eloquent/camera-info-manager/default.nix
rename to distros/eloquent/camera-info-manager/default.nix
diff --git a/eloquent/can-msgs/default.nix b/distros/eloquent/can-msgs/default.nix
similarity index 100%
rename from eloquent/can-msgs/default.nix
rename to distros/eloquent/can-msgs/default.nix
diff --git a/eloquent/cartographer-ros-msgs/default.nix b/distros/eloquent/cartographer-ros-msgs/default.nix
similarity index 100%
rename from eloquent/cartographer-ros-msgs/default.nix
rename to distros/eloquent/cartographer-ros-msgs/default.nix
diff --git a/eloquent/cartographer-ros/default.nix b/distros/eloquent/cartographer-ros/default.nix
similarity index 100%
rename from eloquent/cartographer-ros/default.nix
rename to distros/eloquent/cartographer-ros/default.nix
diff --git a/eloquent/cartographer/default.nix b/distros/eloquent/cartographer/default.nix
similarity index 100%
rename from eloquent/cartographer/default.nix
rename to distros/eloquent/cartographer/default.nix
diff --git a/eloquent/class-loader/default.nix b/distros/eloquent/class-loader/default.nix
similarity index 100%
rename from eloquent/class-loader/default.nix
rename to distros/eloquent/class-loader/default.nix
diff --git a/eloquent/common-interfaces/default.nix b/distros/eloquent/common-interfaces/default.nix
similarity index 100%
rename from eloquent/common-interfaces/default.nix
rename to distros/eloquent/common-interfaces/default.nix
diff --git a/eloquent/composition-interfaces/default.nix b/distros/eloquent/composition-interfaces/default.nix
similarity index 100%
rename from eloquent/composition-interfaces/default.nix
rename to distros/eloquent/composition-interfaces/default.nix
diff --git a/eloquent/composition/default.nix b/distros/eloquent/composition/default.nix
similarity index 100%
rename from eloquent/composition/default.nix
rename to distros/eloquent/composition/default.nix
diff --git a/eloquent/compressed-depth-image-transport/default.nix b/distros/eloquent/compressed-depth-image-transport/default.nix
similarity index 100%
rename from eloquent/compressed-depth-image-transport/default.nix
rename to distros/eloquent/compressed-depth-image-transport/default.nix
diff --git a/eloquent/compressed-image-transport/default.nix b/distros/eloquent/compressed-image-transport/default.nix
similarity index 100%
rename from eloquent/compressed-image-transport/default.nix
rename to distros/eloquent/compressed-image-transport/default.nix
diff --git a/eloquent/connext-cmake-module/default.nix b/distros/eloquent/connext-cmake-module/default.nix
similarity index 100%
rename from eloquent/connext-cmake-module/default.nix
rename to distros/eloquent/connext-cmake-module/default.nix
diff --git a/eloquent/console-bridge-vendor/default.nix b/distros/eloquent/console-bridge-vendor/default.nix
similarity index 100%
rename from eloquent/console-bridge-vendor/default.nix
rename to distros/eloquent/console-bridge-vendor/default.nix
diff --git a/eloquent/control-msgs/default.nix b/distros/eloquent/control-msgs/default.nix
similarity index 100%
rename from eloquent/control-msgs/default.nix
rename to distros/eloquent/control-msgs/default.nix
diff --git a/eloquent/costmap-queue/default.nix b/distros/eloquent/costmap-queue/default.nix
similarity index 100%
rename from eloquent/costmap-queue/default.nix
rename to distros/eloquent/costmap-queue/default.nix
diff --git a/eloquent/cross-compile/default.nix b/distros/eloquent/cross-compile/default.nix
similarity index 100%
rename from eloquent/cross-compile/default.nix
rename to distros/eloquent/cross-compile/default.nix
diff --git a/eloquent/cv-bridge/default.nix b/distros/eloquent/cv-bridge/default.nix
similarity index 100%
rename from eloquent/cv-bridge/default.nix
rename to distros/eloquent/cv-bridge/default.nix
diff --git a/eloquent/cyclonedds-cmake-module/default.nix b/distros/eloquent/cyclonedds-cmake-module/default.nix
similarity index 100%
rename from eloquent/cyclonedds-cmake-module/default.nix
rename to distros/eloquent/cyclonedds-cmake-module/default.nix
diff --git a/eloquent/cyclonedds/default.nix b/distros/eloquent/cyclonedds/default.nix
similarity index 100%
rename from eloquent/cyclonedds/default.nix
rename to distros/eloquent/cyclonedds/default.nix
diff --git a/eloquent/demo-nodes-cpp-native/default.nix b/distros/eloquent/demo-nodes-cpp-native/default.nix
similarity index 100%
rename from eloquent/demo-nodes-cpp-native/default.nix
rename to distros/eloquent/demo-nodes-cpp-native/default.nix
diff --git a/eloquent/demo-nodes-cpp/default.nix b/distros/eloquent/demo-nodes-cpp/default.nix
similarity index 100%
rename from eloquent/demo-nodes-cpp/default.nix
rename to distros/eloquent/demo-nodes-cpp/default.nix
diff --git a/eloquent/demo-nodes-py/default.nix b/distros/eloquent/demo-nodes-py/default.nix
similarity index 100%
rename from eloquent/demo-nodes-py/default.nix
rename to distros/eloquent/demo-nodes-py/default.nix
diff --git a/eloquent/depthimage-to-laserscan/default.nix b/distros/eloquent/depthimage-to-laserscan/default.nix
similarity index 100%
rename from eloquent/depthimage-to-laserscan/default.nix
rename to distros/eloquent/depthimage-to-laserscan/default.nix
diff --git a/eloquent/desktop/default.nix b/distros/eloquent/desktop/default.nix
similarity index 100%
rename from eloquent/desktop/default.nix
rename to distros/eloquent/desktop/default.nix
diff --git a/eloquent/diagnostic-msgs/default.nix b/distros/eloquent/diagnostic-msgs/default.nix
similarity index 100%
rename from eloquent/diagnostic-msgs/default.nix
rename to distros/eloquent/diagnostic-msgs/default.nix
diff --git a/eloquent/diagnostic-updater/default.nix b/distros/eloquent/diagnostic-updater/default.nix
similarity index 100%
rename from eloquent/diagnostic-updater/default.nix
rename to distros/eloquent/diagnostic-updater/default.nix
diff --git a/eloquent/dolly-follow/default.nix b/distros/eloquent/dolly-follow/default.nix
similarity index 100%
rename from eloquent/dolly-follow/default.nix
rename to distros/eloquent/dolly-follow/default.nix
diff --git a/eloquent/dolly-gazebo/default.nix b/distros/eloquent/dolly-gazebo/default.nix
similarity index 100%
rename from eloquent/dolly-gazebo/default.nix
rename to distros/eloquent/dolly-gazebo/default.nix
diff --git a/eloquent/dolly/default.nix b/distros/eloquent/dolly/default.nix
similarity index 100%
rename from eloquent/dolly/default.nix
rename to distros/eloquent/dolly/default.nix
diff --git a/eloquent/domain-coordinator/default.nix b/distros/eloquent/domain-coordinator/default.nix
similarity index 100%
rename from eloquent/domain-coordinator/default.nix
rename to distros/eloquent/domain-coordinator/default.nix
diff --git a/eloquent/dummy-map-server/default.nix b/distros/eloquent/dummy-map-server/default.nix
similarity index 100%
rename from eloquent/dummy-map-server/default.nix
rename to distros/eloquent/dummy-map-server/default.nix
diff --git a/eloquent/dummy-robot-bringup/default.nix b/distros/eloquent/dummy-robot-bringup/default.nix
similarity index 100%
rename from eloquent/dummy-robot-bringup/default.nix
rename to distros/eloquent/dummy-robot-bringup/default.nix
diff --git a/eloquent/dummy-sensors/default.nix b/distros/eloquent/dummy-sensors/default.nix
similarity index 100%
rename from eloquent/dummy-sensors/default.nix
rename to distros/eloquent/dummy-sensors/default.nix
diff --git a/eloquent/dwb-core/default.nix b/distros/eloquent/dwb-core/default.nix
similarity index 100%
rename from eloquent/dwb-core/default.nix
rename to distros/eloquent/dwb-core/default.nix
diff --git a/eloquent/dwb-critics/default.nix b/distros/eloquent/dwb-critics/default.nix
similarity index 100%
rename from eloquent/dwb-critics/default.nix
rename to distros/eloquent/dwb-critics/default.nix
diff --git a/eloquent/dwb-msgs/default.nix b/distros/eloquent/dwb-msgs/default.nix
similarity index 100%
rename from eloquent/dwb-msgs/default.nix
rename to distros/eloquent/dwb-msgs/default.nix
diff --git a/eloquent/dwb-plugins/default.nix b/distros/eloquent/dwb-plugins/default.nix
similarity index 100%
rename from eloquent/dwb-plugins/default.nix
rename to distros/eloquent/dwb-plugins/default.nix
diff --git a/eloquent/dynamic-edt-3d/default.nix b/distros/eloquent/dynamic-edt-3d/default.nix
similarity index 100%
rename from eloquent/dynamic-edt-3d/default.nix
rename to distros/eloquent/dynamic-edt-3d/default.nix
diff --git a/eloquent/ecl-build/default.nix b/distros/eloquent/ecl-build/default.nix
similarity index 100%
rename from eloquent/ecl-build/default.nix
rename to distros/eloquent/ecl-build/default.nix
diff --git a/eloquent/ecl-command-line/default.nix b/distros/eloquent/ecl-command-line/default.nix
similarity index 100%
rename from eloquent/ecl-command-line/default.nix
rename to distros/eloquent/ecl-command-line/default.nix
diff --git a/eloquent/ecl-concepts/default.nix b/distros/eloquent/ecl-concepts/default.nix
similarity index 100%
rename from eloquent/ecl-concepts/default.nix
rename to distros/eloquent/ecl-concepts/default.nix
diff --git a/eloquent/ecl-config/default.nix b/distros/eloquent/ecl-config/default.nix
similarity index 100%
rename from eloquent/ecl-config/default.nix
rename to distros/eloquent/ecl-config/default.nix
diff --git a/eloquent/ecl-console/default.nix b/distros/eloquent/ecl-console/default.nix
similarity index 100%
rename from eloquent/ecl-console/default.nix
rename to distros/eloquent/ecl-console/default.nix
diff --git a/eloquent/ecl-containers/default.nix b/distros/eloquent/ecl-containers/default.nix
similarity index 100%
rename from eloquent/ecl-containers/default.nix
rename to distros/eloquent/ecl-containers/default.nix
diff --git a/eloquent/ecl-converters-lite/default.nix b/distros/eloquent/ecl-converters-lite/default.nix
similarity index 100%
rename from eloquent/ecl-converters-lite/default.nix
rename to distros/eloquent/ecl-converters-lite/default.nix
diff --git a/eloquent/ecl-converters/default.nix b/distros/eloquent/ecl-converters/default.nix
similarity index 100%
rename from eloquent/ecl-converters/default.nix
rename to distros/eloquent/ecl-converters/default.nix
diff --git a/eloquent/ecl-core-apps/default.nix b/distros/eloquent/ecl-core-apps/default.nix
similarity index 100%
rename from eloquent/ecl-core-apps/default.nix
rename to distros/eloquent/ecl-core-apps/default.nix
diff --git a/eloquent/ecl-core/default.nix b/distros/eloquent/ecl-core/default.nix
similarity index 100%
rename from eloquent/ecl-core/default.nix
rename to distros/eloquent/ecl-core/default.nix
diff --git a/eloquent/ecl-devices/default.nix b/distros/eloquent/ecl-devices/default.nix
similarity index 100%
rename from eloquent/ecl-devices/default.nix
rename to distros/eloquent/ecl-devices/default.nix
diff --git a/eloquent/ecl-eigen/default.nix b/distros/eloquent/ecl-eigen/default.nix
similarity index 100%
rename from eloquent/ecl-eigen/default.nix
rename to distros/eloquent/ecl-eigen/default.nix
diff --git a/eloquent/ecl-errors/default.nix b/distros/eloquent/ecl-errors/default.nix
similarity index 100%
rename from eloquent/ecl-errors/default.nix
rename to distros/eloquent/ecl-errors/default.nix
diff --git a/eloquent/ecl-exceptions/default.nix b/distros/eloquent/ecl-exceptions/default.nix
similarity index 100%
rename from eloquent/ecl-exceptions/default.nix
rename to distros/eloquent/ecl-exceptions/default.nix
diff --git a/eloquent/ecl-filesystem/default.nix b/distros/eloquent/ecl-filesystem/default.nix
similarity index 100%
rename from eloquent/ecl-filesystem/default.nix
rename to distros/eloquent/ecl-filesystem/default.nix
diff --git a/eloquent/ecl-formatters/default.nix b/distros/eloquent/ecl-formatters/default.nix
similarity index 100%
rename from eloquent/ecl-formatters/default.nix
rename to distros/eloquent/ecl-formatters/default.nix
diff --git a/eloquent/ecl-geometry/default.nix b/distros/eloquent/ecl-geometry/default.nix
similarity index 100%
rename from eloquent/ecl-geometry/default.nix
rename to distros/eloquent/ecl-geometry/default.nix
diff --git a/eloquent/ecl-io/default.nix b/distros/eloquent/ecl-io/default.nix
similarity index 100%
rename from eloquent/ecl-io/default.nix
rename to distros/eloquent/ecl-io/default.nix
diff --git a/eloquent/ecl-ipc/default.nix b/distros/eloquent/ecl-ipc/default.nix
similarity index 100%
rename from eloquent/ecl-ipc/default.nix
rename to distros/eloquent/ecl-ipc/default.nix
diff --git a/eloquent/ecl-license/default.nix b/distros/eloquent/ecl-license/default.nix
similarity index 100%
rename from eloquent/ecl-license/default.nix
rename to distros/eloquent/ecl-license/default.nix
diff --git a/eloquent/ecl-linear-algebra/default.nix b/distros/eloquent/ecl-linear-algebra/default.nix
similarity index 100%
rename from eloquent/ecl-linear-algebra/default.nix
rename to distros/eloquent/ecl-linear-algebra/default.nix
diff --git a/eloquent/ecl-lite/default.nix b/distros/eloquent/ecl-lite/default.nix
similarity index 100%
rename from eloquent/ecl-lite/default.nix
rename to distros/eloquent/ecl-lite/default.nix
diff --git a/eloquent/ecl-manipulators/default.nix b/distros/eloquent/ecl-manipulators/default.nix
similarity index 100%
rename from eloquent/ecl-manipulators/default.nix
rename to distros/eloquent/ecl-manipulators/default.nix
diff --git a/eloquent/ecl-math/default.nix b/distros/eloquent/ecl-math/default.nix
similarity index 100%
rename from eloquent/ecl-math/default.nix
rename to distros/eloquent/ecl-math/default.nix
diff --git a/eloquent/ecl-mobile-robot/default.nix b/distros/eloquent/ecl-mobile-robot/default.nix
similarity index 100%
rename from eloquent/ecl-mobile-robot/default.nix
rename to distros/eloquent/ecl-mobile-robot/default.nix
diff --git a/eloquent/ecl-mpl/default.nix b/distros/eloquent/ecl-mpl/default.nix
similarity index 100%
rename from eloquent/ecl-mpl/default.nix
rename to distros/eloquent/ecl-mpl/default.nix
diff --git a/eloquent/ecl-sigslots-lite/default.nix b/distros/eloquent/ecl-sigslots-lite/default.nix
similarity index 100%
rename from eloquent/ecl-sigslots-lite/default.nix
rename to distros/eloquent/ecl-sigslots-lite/default.nix
diff --git a/eloquent/ecl-sigslots/default.nix b/distros/eloquent/ecl-sigslots/default.nix
similarity index 100%
rename from eloquent/ecl-sigslots/default.nix
rename to distros/eloquent/ecl-sigslots/default.nix
diff --git a/eloquent/ecl-statistics/default.nix b/distros/eloquent/ecl-statistics/default.nix
similarity index 100%
rename from eloquent/ecl-statistics/default.nix
rename to distros/eloquent/ecl-statistics/default.nix
diff --git a/eloquent/ecl-streams/default.nix b/distros/eloquent/ecl-streams/default.nix
similarity index 100%
rename from eloquent/ecl-streams/default.nix
rename to distros/eloquent/ecl-streams/default.nix
diff --git a/eloquent/ecl-threads/default.nix b/distros/eloquent/ecl-threads/default.nix
similarity index 100%
rename from eloquent/ecl-threads/default.nix
rename to distros/eloquent/ecl-threads/default.nix
diff --git a/eloquent/ecl-time-lite/default.nix b/distros/eloquent/ecl-time-lite/default.nix
similarity index 100%
rename from eloquent/ecl-time-lite/default.nix
rename to distros/eloquent/ecl-time-lite/default.nix
diff --git a/eloquent/ecl-time/default.nix b/distros/eloquent/ecl-time/default.nix
similarity index 100%
rename from eloquent/ecl-time/default.nix
rename to distros/eloquent/ecl-time/default.nix
diff --git a/eloquent/ecl-tools/default.nix b/distros/eloquent/ecl-tools/default.nix
similarity index 100%
rename from eloquent/ecl-tools/default.nix
rename to distros/eloquent/ecl-tools/default.nix
diff --git a/eloquent/ecl-type-traits/default.nix b/distros/eloquent/ecl-type-traits/default.nix
similarity index 100%
rename from eloquent/ecl-type-traits/default.nix
rename to distros/eloquent/ecl-type-traits/default.nix
diff --git a/eloquent/ecl-utilities/default.nix b/distros/eloquent/ecl-utilities/default.nix
similarity index 100%
rename from eloquent/ecl-utilities/default.nix
rename to distros/eloquent/ecl-utilities/default.nix
diff --git a/eloquent/eigen-stl-containers/default.nix b/distros/eloquent/eigen-stl-containers/default.nix
similarity index 100%
rename from eloquent/eigen-stl-containers/default.nix
rename to distros/eloquent/eigen-stl-containers/default.nix
diff --git a/eloquent/eigen3-cmake-module/default.nix b/distros/eloquent/eigen3-cmake-module/default.nix
similarity index 100%
rename from eloquent/eigen3-cmake-module/default.nix
rename to distros/eloquent/eigen3-cmake-module/default.nix
diff --git a/eloquent/example-interfaces/default.nix b/distros/eloquent/example-interfaces/default.nix
similarity index 100%
rename from eloquent/example-interfaces/default.nix
rename to distros/eloquent/example-interfaces/default.nix
diff --git a/eloquent/examples-rclcpp-minimal-action-client/default.nix b/distros/eloquent/examples-rclcpp-minimal-action-client/default.nix
similarity index 100%
rename from eloquent/examples-rclcpp-minimal-action-client/default.nix
rename to distros/eloquent/examples-rclcpp-minimal-action-client/default.nix
diff --git a/eloquent/examples-rclcpp-minimal-action-server/default.nix b/distros/eloquent/examples-rclcpp-minimal-action-server/default.nix
similarity index 100%
rename from eloquent/examples-rclcpp-minimal-action-server/default.nix
rename to distros/eloquent/examples-rclcpp-minimal-action-server/default.nix
diff --git a/eloquent/examples-rclcpp-minimal-client/default.nix b/distros/eloquent/examples-rclcpp-minimal-client/default.nix
similarity index 100%
rename from eloquent/examples-rclcpp-minimal-client/default.nix
rename to distros/eloquent/examples-rclcpp-minimal-client/default.nix
diff --git a/eloquent/examples-rclcpp-minimal-composition/default.nix b/distros/eloquent/examples-rclcpp-minimal-composition/default.nix
similarity index 100%
rename from eloquent/examples-rclcpp-minimal-composition/default.nix
rename to distros/eloquent/examples-rclcpp-minimal-composition/default.nix
diff --git a/eloquent/examples-rclcpp-minimal-publisher/default.nix b/distros/eloquent/examples-rclcpp-minimal-publisher/default.nix
similarity index 100%
rename from eloquent/examples-rclcpp-minimal-publisher/default.nix
rename to distros/eloquent/examples-rclcpp-minimal-publisher/default.nix
diff --git a/eloquent/examples-rclcpp-minimal-service/default.nix b/distros/eloquent/examples-rclcpp-minimal-service/default.nix
similarity index 100%
rename from eloquent/examples-rclcpp-minimal-service/default.nix
rename to distros/eloquent/examples-rclcpp-minimal-service/default.nix
diff --git a/eloquent/examples-rclcpp-minimal-subscriber/default.nix b/distros/eloquent/examples-rclcpp-minimal-subscriber/default.nix
similarity index 100%
rename from eloquent/examples-rclcpp-minimal-subscriber/default.nix
rename to distros/eloquent/examples-rclcpp-minimal-subscriber/default.nix
diff --git a/eloquent/examples-rclcpp-minimal-timer/default.nix b/distros/eloquent/examples-rclcpp-minimal-timer/default.nix
similarity index 100%
rename from eloquent/examples-rclcpp-minimal-timer/default.nix
rename to distros/eloquent/examples-rclcpp-minimal-timer/default.nix
diff --git a/eloquent/examples-rclcpp-multithreaded-executor/default.nix b/distros/eloquent/examples-rclcpp-multithreaded-executor/default.nix
similarity index 100%
rename from eloquent/examples-rclcpp-multithreaded-executor/default.nix
rename to distros/eloquent/examples-rclcpp-multithreaded-executor/default.nix
diff --git a/eloquent/examples-rclpy-executors/default.nix b/distros/eloquent/examples-rclpy-executors/default.nix
similarity index 100%
rename from eloquent/examples-rclpy-executors/default.nix
rename to distros/eloquent/examples-rclpy-executors/default.nix
diff --git a/eloquent/examples-rclpy-minimal-action-client/default.nix b/distros/eloquent/examples-rclpy-minimal-action-client/default.nix
similarity index 100%
rename from eloquent/examples-rclpy-minimal-action-client/default.nix
rename to distros/eloquent/examples-rclpy-minimal-action-client/default.nix
diff --git a/eloquent/examples-rclpy-minimal-action-server/default.nix b/distros/eloquent/examples-rclpy-minimal-action-server/default.nix
similarity index 100%
rename from eloquent/examples-rclpy-minimal-action-server/default.nix
rename to distros/eloquent/examples-rclpy-minimal-action-server/default.nix
diff --git a/eloquent/examples-rclpy-minimal-client/default.nix b/distros/eloquent/examples-rclpy-minimal-client/default.nix
similarity index 100%
rename from eloquent/examples-rclpy-minimal-client/default.nix
rename to distros/eloquent/examples-rclpy-minimal-client/default.nix
diff --git a/eloquent/examples-rclpy-minimal-publisher/default.nix b/distros/eloquent/examples-rclpy-minimal-publisher/default.nix
similarity index 100%
rename from eloquent/examples-rclpy-minimal-publisher/default.nix
rename to distros/eloquent/examples-rclpy-minimal-publisher/default.nix
diff --git a/eloquent/examples-rclpy-minimal-service/default.nix b/distros/eloquent/examples-rclpy-minimal-service/default.nix
similarity index 100%
rename from eloquent/examples-rclpy-minimal-service/default.nix
rename to distros/eloquent/examples-rclpy-minimal-service/default.nix
diff --git a/eloquent/examples-rclpy-minimal-subscriber/default.nix b/distros/eloquent/examples-rclpy-minimal-subscriber/default.nix
similarity index 100%
rename from eloquent/examples-rclpy-minimal-subscriber/default.nix
rename to distros/eloquent/examples-rclpy-minimal-subscriber/default.nix
diff --git a/eloquent/examples-tf2-py/default.nix b/distros/eloquent/examples-tf2-py/default.nix
similarity index 100%
rename from eloquent/examples-tf2-py/default.nix
rename to distros/eloquent/examples-tf2-py/default.nix
diff --git a/eloquent/fastcdr/default.nix b/distros/eloquent/fastcdr/default.nix
similarity index 100%
rename from eloquent/fastcdr/default.nix
rename to distros/eloquent/fastcdr/default.nix
diff --git a/eloquent/fastrtps-cmake-module/default.nix b/distros/eloquent/fastrtps-cmake-module/default.nix
similarity index 100%
rename from eloquent/fastrtps-cmake-module/default.nix
rename to distros/eloquent/fastrtps-cmake-module/default.nix
diff --git a/eloquent/fastrtps/default.nix b/distros/eloquent/fastrtps/default.nix
similarity index 100%
rename from eloquent/fastrtps/default.nix
rename to distros/eloquent/fastrtps/default.nix
diff --git a/eloquent/fmi-adapter-examples/default.nix b/distros/eloquent/fmi-adapter-examples/default.nix
similarity index 100%
rename from eloquent/fmi-adapter-examples/default.nix
rename to distros/eloquent/fmi-adapter-examples/default.nix
diff --git a/eloquent/fmi-adapter/default.nix b/distros/eloquent/fmi-adapter/default.nix
similarity index 100%
rename from eloquent/fmi-adapter/default.nix
rename to distros/eloquent/fmi-adapter/default.nix
diff --git a/eloquent/fmilibrary-vendor/default.nix b/distros/eloquent/fmilibrary-vendor/default.nix
similarity index 100%
rename from eloquent/fmilibrary-vendor/default.nix
rename to distros/eloquent/fmilibrary-vendor/default.nix
diff --git a/eloquent/foonathan-memory-vendor/default.nix b/distros/eloquent/foonathan-memory-vendor/default.nix
similarity index 100%
rename from eloquent/foonathan-memory-vendor/default.nix
rename to distros/eloquent/foonathan-memory-vendor/default.nix
diff --git a/eloquent/gazebo-dev/default.nix b/distros/eloquent/gazebo-dev/default.nix
similarity index 100%
rename from eloquent/gazebo-dev/default.nix
rename to distros/eloquent/gazebo-dev/default.nix
diff --git a/eloquent/gazebo-msgs/default.nix b/distros/eloquent/gazebo-msgs/default.nix
similarity index 100%
rename from eloquent/gazebo-msgs/default.nix
rename to distros/eloquent/gazebo-msgs/default.nix
diff --git a/eloquent/gazebo-plugins/default.nix b/distros/eloquent/gazebo-plugins/default.nix
similarity index 100%
rename from eloquent/gazebo-plugins/default.nix
rename to distros/eloquent/gazebo-plugins/default.nix
diff --git a/eloquent/gazebo-ros-pkgs/default.nix b/distros/eloquent/gazebo-ros-pkgs/default.nix
similarity index 100%
rename from eloquent/gazebo-ros-pkgs/default.nix
rename to distros/eloquent/gazebo-ros-pkgs/default.nix
diff --git a/eloquent/gazebo-ros/default.nix b/distros/eloquent/gazebo-ros/default.nix
similarity index 100%
rename from eloquent/gazebo-ros/default.nix
rename to distros/eloquent/gazebo-ros/default.nix
diff --git a/eloquent/generated.nix b/distros/eloquent/generated.nix
similarity index 100%
rename from eloquent/generated.nix
rename to distros/eloquent/generated.nix
diff --git a/eloquent/geodesy/default.nix b/distros/eloquent/geodesy/default.nix
similarity index 100%
rename from eloquent/geodesy/default.nix
rename to distros/eloquent/geodesy/default.nix
diff --git a/eloquent/geographic-info/default.nix b/distros/eloquent/geographic-info/default.nix
similarity index 100%
rename from eloquent/geographic-info/default.nix
rename to distros/eloquent/geographic-info/default.nix
diff --git a/eloquent/geographic-msgs/default.nix b/distros/eloquent/geographic-msgs/default.nix
similarity index 100%
rename from eloquent/geographic-msgs/default.nix
rename to distros/eloquent/geographic-msgs/default.nix
diff --git a/eloquent/geometry-msgs/default.nix b/distros/eloquent/geometry-msgs/default.nix
similarity index 100%
rename from eloquent/geometry-msgs/default.nix
rename to distros/eloquent/geometry-msgs/default.nix
diff --git a/eloquent/geometry2/default.nix b/distros/eloquent/geometry2/default.nix
similarity index 100%
rename from eloquent/geometry2/default.nix
rename to distros/eloquent/geometry2/default.nix
diff --git a/eloquent/gmock-vendor/default.nix b/distros/eloquent/gmock-vendor/default.nix
similarity index 100%
rename from eloquent/gmock-vendor/default.nix
rename to distros/eloquent/gmock-vendor/default.nix
diff --git a/eloquent/gtest-vendor/default.nix b/distros/eloquent/gtest-vendor/default.nix
similarity index 100%
rename from eloquent/gtest-vendor/default.nix
rename to distros/eloquent/gtest-vendor/default.nix
diff --git a/eloquent/image-common/default.nix b/distros/eloquent/image-common/default.nix
similarity index 100%
rename from eloquent/image-common/default.nix
rename to distros/eloquent/image-common/default.nix
diff --git a/eloquent/image-geometry/default.nix b/distros/eloquent/image-geometry/default.nix
similarity index 100%
rename from eloquent/image-geometry/default.nix
rename to distros/eloquent/image-geometry/default.nix
diff --git a/eloquent/image-tools/default.nix b/distros/eloquent/image-tools/default.nix
similarity index 100%
rename from eloquent/image-tools/default.nix
rename to distros/eloquent/image-tools/default.nix
diff --git a/eloquent/image-transport-plugins/default.nix b/distros/eloquent/image-transport-plugins/default.nix
similarity index 100%
rename from eloquent/image-transport-plugins/default.nix
rename to distros/eloquent/image-transport-plugins/default.nix
diff --git a/eloquent/image-transport/default.nix b/distros/eloquent/image-transport/default.nix
similarity index 100%
rename from eloquent/image-transport/default.nix
rename to distros/eloquent/image-transport/default.nix
diff --git a/eloquent/interactive-markers/default.nix b/distros/eloquent/interactive-markers/default.nix
similarity index 100%
rename from eloquent/interactive-markers/default.nix
rename to distros/eloquent/interactive-markers/default.nix
diff --git a/eloquent/intra-process-demo/default.nix b/distros/eloquent/intra-process-demo/default.nix
similarity index 100%
rename from eloquent/intra-process-demo/default.nix
rename to distros/eloquent/intra-process-demo/default.nix
diff --git a/eloquent/joy-teleop/default.nix b/distros/eloquent/joy-teleop/default.nix
similarity index 100%
rename from eloquent/joy-teleop/default.nix
rename to distros/eloquent/joy-teleop/default.nix
diff --git a/eloquent/joy/default.nix b/distros/eloquent/joy/default.nix
similarity index 100%
rename from eloquent/joy/default.nix
rename to distros/eloquent/joy/default.nix
diff --git a/eloquent/kdl-parser/default.nix b/distros/eloquent/kdl-parser/default.nix
similarity index 100%
rename from eloquent/kdl-parser/default.nix
rename to distros/eloquent/kdl-parser/default.nix
diff --git a/eloquent/key-teleop/default.nix b/distros/eloquent/key-teleop/default.nix
similarity index 100%
rename from eloquent/key-teleop/default.nix
rename to distros/eloquent/key-teleop/default.nix
diff --git a/eloquent/kobuki-core/default.nix b/distros/eloquent/kobuki-core/default.nix
similarity index 100%
rename from eloquent/kobuki-core/default.nix
rename to distros/eloquent/kobuki-core/default.nix
diff --git a/eloquent/kobuki-dock-drive/default.nix b/distros/eloquent/kobuki-dock-drive/default.nix
similarity index 100%
rename from eloquent/kobuki-dock-drive/default.nix
rename to distros/eloquent/kobuki-dock-drive/default.nix
diff --git a/eloquent/kobuki-driver/default.nix b/distros/eloquent/kobuki-driver/default.nix
similarity index 100%
rename from eloquent/kobuki-driver/default.nix
rename to distros/eloquent/kobuki-driver/default.nix
diff --git a/eloquent/kobuki-ftdi/default.nix b/distros/eloquent/kobuki-ftdi/default.nix
similarity index 100%
rename from eloquent/kobuki-ftdi/default.nix
rename to distros/eloquent/kobuki-ftdi/default.nix
diff --git a/eloquent/kobuki-msgs/default.nix b/distros/eloquent/kobuki-msgs/default.nix
similarity index 100%
rename from eloquent/kobuki-msgs/default.nix
rename to distros/eloquent/kobuki-msgs/default.nix
diff --git a/eloquent/kobuki-ros-interfaces/default.nix b/distros/eloquent/kobuki-ros-interfaces/default.nix
similarity index 100%
rename from eloquent/kobuki-ros-interfaces/default.nix
rename to distros/eloquent/kobuki-ros-interfaces/default.nix
diff --git a/eloquent/laser-geometry/default.nix b/distros/eloquent/laser-geometry/default.nix
similarity index 100%
rename from eloquent/laser-geometry/default.nix
rename to distros/eloquent/laser-geometry/default.nix
diff --git a/eloquent/launch-ros/default.nix b/distros/eloquent/launch-ros/default.nix
similarity index 100%
rename from eloquent/launch-ros/default.nix
rename to distros/eloquent/launch-ros/default.nix
diff --git a/eloquent/launch-testing-ament-cmake/default.nix b/distros/eloquent/launch-testing-ament-cmake/default.nix
similarity index 100%
rename from eloquent/launch-testing-ament-cmake/default.nix
rename to distros/eloquent/launch-testing-ament-cmake/default.nix
diff --git a/eloquent/launch-testing-ros/default.nix b/distros/eloquent/launch-testing-ros/default.nix
similarity index 100%
rename from eloquent/launch-testing-ros/default.nix
rename to distros/eloquent/launch-testing-ros/default.nix
diff --git a/eloquent/launch-testing/default.nix b/distros/eloquent/launch-testing/default.nix
similarity index 100%
rename from eloquent/launch-testing/default.nix
rename to distros/eloquent/launch-testing/default.nix
diff --git a/eloquent/launch-xml/default.nix b/distros/eloquent/launch-xml/default.nix
similarity index 100%
rename from eloquent/launch-xml/default.nix
rename to distros/eloquent/launch-xml/default.nix
diff --git a/eloquent/launch-yaml/default.nix b/distros/eloquent/launch-yaml/default.nix
similarity index 100%
rename from eloquent/launch-yaml/default.nix
rename to distros/eloquent/launch-yaml/default.nix
diff --git a/eloquent/launch/default.nix b/distros/eloquent/launch/default.nix
similarity index 100%
rename from eloquent/launch/default.nix
rename to distros/eloquent/launch/default.nix
diff --git a/eloquent/libcurl-vendor/default.nix b/distros/eloquent/libcurl-vendor/default.nix
similarity index 100%
rename from eloquent/libcurl-vendor/default.nix
rename to distros/eloquent/libcurl-vendor/default.nix
diff --git a/eloquent/libphidget22/default.nix b/distros/eloquent/libphidget22/default.nix
similarity index 100%
rename from eloquent/libphidget22/default.nix
rename to distros/eloquent/libphidget22/default.nix
diff --git a/eloquent/libyaml-vendor/default.nix b/distros/eloquent/libyaml-vendor/default.nix
similarity index 100%
rename from eloquent/libyaml-vendor/default.nix
rename to distros/eloquent/libyaml-vendor/default.nix
diff --git a/eloquent/lifecycle-msgs/default.nix b/distros/eloquent/lifecycle-msgs/default.nix
similarity index 100%
rename from eloquent/lifecycle-msgs/default.nix
rename to distros/eloquent/lifecycle-msgs/default.nix
diff --git a/eloquent/lifecycle/default.nix b/distros/eloquent/lifecycle/default.nix
similarity index 100%
rename from eloquent/lifecycle/default.nix
rename to distros/eloquent/lifecycle/default.nix
diff --git a/eloquent/logging-demo/default.nix b/distros/eloquent/logging-demo/default.nix
similarity index 100%
rename from eloquent/logging-demo/default.nix
rename to distros/eloquent/logging-demo/default.nix
diff --git a/eloquent/map-msgs/default.nix b/distros/eloquent/map-msgs/default.nix
similarity index 100%
rename from eloquent/map-msgs/default.nix
rename to distros/eloquent/map-msgs/default.nix
diff --git a/eloquent/message-filters/default.nix b/distros/eloquent/message-filters/default.nix
similarity index 100%
rename from eloquent/message-filters/default.nix
rename to distros/eloquent/message-filters/default.nix
diff --git a/eloquent/mouse-teleop/default.nix b/distros/eloquent/mouse-teleop/default.nix
similarity index 100%
rename from eloquent/mouse-teleop/default.nix
rename to distros/eloquent/mouse-teleop/default.nix
diff --git a/eloquent/move-base-msgs/default.nix b/distros/eloquent/move-base-msgs/default.nix
similarity index 100%
rename from eloquent/move-base-msgs/default.nix
rename to distros/eloquent/move-base-msgs/default.nix
diff --git a/eloquent/nav-2d-msgs/default.nix b/distros/eloquent/nav-2d-msgs/default.nix
similarity index 100%
rename from eloquent/nav-2d-msgs/default.nix
rename to distros/eloquent/nav-2d-msgs/default.nix
diff --git a/eloquent/nav-2d-utils/default.nix b/distros/eloquent/nav-2d-utils/default.nix
similarity index 100%
rename from eloquent/nav-2d-utils/default.nix
rename to distros/eloquent/nav-2d-utils/default.nix
diff --git a/eloquent/nav-msgs/default.nix b/distros/eloquent/nav-msgs/default.nix
similarity index 100%
rename from eloquent/nav-msgs/default.nix
rename to distros/eloquent/nav-msgs/default.nix
diff --git a/eloquent/nav2-amcl/default.nix b/distros/eloquent/nav2-amcl/default.nix
similarity index 100%
rename from eloquent/nav2-amcl/default.nix
rename to distros/eloquent/nav2-amcl/default.nix
diff --git a/eloquent/nav2-behavior-tree/default.nix b/distros/eloquent/nav2-behavior-tree/default.nix
similarity index 100%
rename from eloquent/nav2-behavior-tree/default.nix
rename to distros/eloquent/nav2-behavior-tree/default.nix
diff --git a/eloquent/nav2-bringup/default.nix b/distros/eloquent/nav2-bringup/default.nix
similarity index 100%
rename from eloquent/nav2-bringup/default.nix
rename to distros/eloquent/nav2-bringup/default.nix
diff --git a/eloquent/nav2-bt-navigator/default.nix b/distros/eloquent/nav2-bt-navigator/default.nix
similarity index 100%
rename from eloquent/nav2-bt-navigator/default.nix
rename to distros/eloquent/nav2-bt-navigator/default.nix
diff --git a/eloquent/nav2-common/default.nix b/distros/eloquent/nav2-common/default.nix
similarity index 100%
rename from eloquent/nav2-common/default.nix
rename to distros/eloquent/nav2-common/default.nix
diff --git a/eloquent/nav2-controller/default.nix b/distros/eloquent/nav2-controller/default.nix
similarity index 100%
rename from eloquent/nav2-controller/default.nix
rename to distros/eloquent/nav2-controller/default.nix
diff --git a/eloquent/nav2-core/default.nix b/distros/eloquent/nav2-core/default.nix
similarity index 100%
rename from eloquent/nav2-core/default.nix
rename to distros/eloquent/nav2-core/default.nix
diff --git a/eloquent/nav2-costmap-2d/default.nix b/distros/eloquent/nav2-costmap-2d/default.nix
similarity index 100%
rename from eloquent/nav2-costmap-2d/default.nix
rename to distros/eloquent/nav2-costmap-2d/default.nix
diff --git a/eloquent/nav2-dwb-controller/default.nix b/distros/eloquent/nav2-dwb-controller/default.nix
similarity index 100%
rename from eloquent/nav2-dwb-controller/default.nix
rename to distros/eloquent/nav2-dwb-controller/default.nix
diff --git a/eloquent/nav2-gazebo-spawner/default.nix b/distros/eloquent/nav2-gazebo-spawner/default.nix
similarity index 100%
rename from eloquent/nav2-gazebo-spawner/default.nix
rename to distros/eloquent/nav2-gazebo-spawner/default.nix
diff --git a/eloquent/nav2-lifecycle-manager/default.nix b/distros/eloquent/nav2-lifecycle-manager/default.nix
similarity index 100%
rename from eloquent/nav2-lifecycle-manager/default.nix
rename to distros/eloquent/nav2-lifecycle-manager/default.nix
diff --git a/eloquent/nav2-map-server/default.nix b/distros/eloquent/nav2-map-server/default.nix
similarity index 100%
rename from eloquent/nav2-map-server/default.nix
rename to distros/eloquent/nav2-map-server/default.nix
diff --git a/eloquent/nav2-msgs/default.nix b/distros/eloquent/nav2-msgs/default.nix
similarity index 100%
rename from eloquent/nav2-msgs/default.nix
rename to distros/eloquent/nav2-msgs/default.nix
diff --git a/eloquent/nav2-navfn-planner/default.nix b/distros/eloquent/nav2-navfn-planner/default.nix
similarity index 100%
rename from eloquent/nav2-navfn-planner/default.nix
rename to distros/eloquent/nav2-navfn-planner/default.nix
diff --git a/eloquent/nav2-planner/default.nix b/distros/eloquent/nav2-planner/default.nix
similarity index 100%
rename from eloquent/nav2-planner/default.nix
rename to distros/eloquent/nav2-planner/default.nix
diff --git a/eloquent/nav2-recoveries/default.nix b/distros/eloquent/nav2-recoveries/default.nix
similarity index 100%
rename from eloquent/nav2-recoveries/default.nix
rename to distros/eloquent/nav2-recoveries/default.nix
diff --git a/eloquent/nav2-rviz-plugins/default.nix b/distros/eloquent/nav2-rviz-plugins/default.nix
similarity index 100%
rename from eloquent/nav2-rviz-plugins/default.nix
rename to distros/eloquent/nav2-rviz-plugins/default.nix
diff --git a/eloquent/nav2-system-tests/default.nix b/distros/eloquent/nav2-system-tests/default.nix
similarity index 100%
rename from eloquent/nav2-system-tests/default.nix
rename to distros/eloquent/nav2-system-tests/default.nix
diff --git a/eloquent/nav2-util/default.nix b/distros/eloquent/nav2-util/default.nix
similarity index 100%
rename from eloquent/nav2-util/default.nix
rename to distros/eloquent/nav2-util/default.nix
diff --git a/eloquent/nav2-voxel-grid/default.nix b/distros/eloquent/nav2-voxel-grid/default.nix
similarity index 100%
rename from eloquent/nav2-voxel-grid/default.nix
rename to distros/eloquent/nav2-voxel-grid/default.nix
diff --git a/eloquent/nav2-waypoint-follower/default.nix b/distros/eloquent/nav2-waypoint-follower/default.nix
similarity index 100%
rename from eloquent/nav2-waypoint-follower/default.nix
rename to distros/eloquent/nav2-waypoint-follower/default.nix
diff --git a/eloquent/navigation2/default.nix b/distros/eloquent/navigation2/default.nix
similarity index 100%
rename from eloquent/navigation2/default.nix
rename to distros/eloquent/navigation2/default.nix
diff --git a/eloquent/nonpersistent-voxel-layer/default.nix b/distros/eloquent/nonpersistent-voxel-layer/default.nix
similarity index 100%
rename from eloquent/nonpersistent-voxel-layer/default.nix
rename to distros/eloquent/nonpersistent-voxel-layer/default.nix
diff --git a/eloquent/ntpd-driver/default.nix b/distros/eloquent/ntpd-driver/default.nix
similarity index 100%
rename from eloquent/ntpd-driver/default.nix
rename to distros/eloquent/ntpd-driver/default.nix
diff --git a/eloquent/octomap/default.nix b/distros/eloquent/octomap/default.nix
similarity index 100%
rename from eloquent/octomap/default.nix
rename to distros/eloquent/octomap/default.nix
diff --git a/eloquent/opensplice-cmake-module/default.nix b/distros/eloquent/opensplice-cmake-module/default.nix
similarity index 100%
rename from eloquent/opensplice-cmake-module/default.nix
rename to distros/eloquent/opensplice-cmake-module/default.nix
diff --git a/eloquent/orocos-kdl/default.nix b/distros/eloquent/orocos-kdl/default.nix
similarity index 100%
rename from eloquent/orocos-kdl/default.nix
rename to distros/eloquent/orocos-kdl/default.nix
diff --git a/eloquent/osrf-pycommon/default.nix b/distros/eloquent/osrf-pycommon/default.nix
similarity index 100%
rename from eloquent/osrf-pycommon/default.nix
rename to distros/eloquent/osrf-pycommon/default.nix
diff --git a/eloquent/osrf-testing-tools-cpp/default.nix b/distros/eloquent/osrf-testing-tools-cpp/default.nix
similarity index 100%
rename from eloquent/osrf-testing-tools-cpp/default.nix
rename to distros/eloquent/osrf-testing-tools-cpp/default.nix
diff --git a/eloquent/ouster-msgs/default.nix b/distros/eloquent/ouster-msgs/default.nix
similarity index 100%
rename from eloquent/ouster-msgs/default.nix
rename to distros/eloquent/ouster-msgs/default.nix
diff --git a/eloquent/overrides.nix b/distros/eloquent/overrides.nix
similarity index 100%
rename from eloquent/overrides.nix
rename to distros/eloquent/overrides.nix
diff --git a/eloquent/pcl-conversions/default.nix b/distros/eloquent/pcl-conversions/default.nix
similarity index 100%
rename from eloquent/pcl-conversions/default.nix
rename to distros/eloquent/pcl-conversions/default.nix
diff --git a/eloquent/pcl-msgs/default.nix b/distros/eloquent/pcl-msgs/default.nix
similarity index 100%
rename from eloquent/pcl-msgs/default.nix
rename to distros/eloquent/pcl-msgs/default.nix
diff --git a/eloquent/pendulum-control/default.nix b/distros/eloquent/pendulum-control/default.nix
similarity index 100%
rename from eloquent/pendulum-control/default.nix
rename to distros/eloquent/pendulum-control/default.nix
diff --git a/eloquent/pendulum-msgs/default.nix b/distros/eloquent/pendulum-msgs/default.nix
similarity index 100%
rename from eloquent/pendulum-msgs/default.nix
rename to distros/eloquent/pendulum-msgs/default.nix
diff --git a/eloquent/perception-pcl/default.nix b/distros/eloquent/perception-pcl/default.nix
similarity index 100%
rename from eloquent/perception-pcl/default.nix
rename to distros/eloquent/perception-pcl/default.nix
diff --git a/eloquent/phidgets-accelerometer/default.nix b/distros/eloquent/phidgets-accelerometer/default.nix
similarity index 100%
rename from eloquent/phidgets-accelerometer/default.nix
rename to distros/eloquent/phidgets-accelerometer/default.nix
diff --git a/eloquent/phidgets-analog-inputs/default.nix b/distros/eloquent/phidgets-analog-inputs/default.nix
similarity index 100%
rename from eloquent/phidgets-analog-inputs/default.nix
rename to distros/eloquent/phidgets-analog-inputs/default.nix
diff --git a/eloquent/phidgets-api/default.nix b/distros/eloquent/phidgets-api/default.nix
similarity index 100%
rename from eloquent/phidgets-api/default.nix
rename to distros/eloquent/phidgets-api/default.nix
diff --git a/eloquent/phidgets-digital-inputs/default.nix b/distros/eloquent/phidgets-digital-inputs/default.nix
similarity index 100%
rename from eloquent/phidgets-digital-inputs/default.nix
rename to distros/eloquent/phidgets-digital-inputs/default.nix
diff --git a/eloquent/phidgets-digital-outputs/default.nix b/distros/eloquent/phidgets-digital-outputs/default.nix
similarity index 100%
rename from eloquent/phidgets-digital-outputs/default.nix
rename to distros/eloquent/phidgets-digital-outputs/default.nix
diff --git a/eloquent/phidgets-drivers/default.nix b/distros/eloquent/phidgets-drivers/default.nix
similarity index 100%
rename from eloquent/phidgets-drivers/default.nix
rename to distros/eloquent/phidgets-drivers/default.nix
diff --git a/eloquent/phidgets-gyroscope/default.nix b/distros/eloquent/phidgets-gyroscope/default.nix
similarity index 100%
rename from eloquent/phidgets-gyroscope/default.nix
rename to distros/eloquent/phidgets-gyroscope/default.nix
diff --git a/eloquent/phidgets-high-speed-encoder/default.nix b/distros/eloquent/phidgets-high-speed-encoder/default.nix
similarity index 100%
rename from eloquent/phidgets-high-speed-encoder/default.nix
rename to distros/eloquent/phidgets-high-speed-encoder/default.nix
diff --git a/eloquent/phidgets-ik/default.nix b/distros/eloquent/phidgets-ik/default.nix
similarity index 100%
rename from eloquent/phidgets-ik/default.nix
rename to distros/eloquent/phidgets-ik/default.nix
diff --git a/eloquent/phidgets-magnetometer/default.nix b/distros/eloquent/phidgets-magnetometer/default.nix
similarity index 100%
rename from eloquent/phidgets-magnetometer/default.nix
rename to distros/eloquent/phidgets-magnetometer/default.nix
diff --git a/eloquent/phidgets-motors/default.nix b/distros/eloquent/phidgets-motors/default.nix
similarity index 100%
rename from eloquent/phidgets-motors/default.nix
rename to distros/eloquent/phidgets-motors/default.nix
diff --git a/eloquent/phidgets-msgs/default.nix b/distros/eloquent/phidgets-msgs/default.nix
similarity index 100%
rename from eloquent/phidgets-msgs/default.nix
rename to distros/eloquent/phidgets-msgs/default.nix
diff --git a/eloquent/phidgets-spatial/default.nix b/distros/eloquent/phidgets-spatial/default.nix
similarity index 100%
rename from eloquent/phidgets-spatial/default.nix
rename to distros/eloquent/phidgets-spatial/default.nix
diff --git a/eloquent/phidgets-temperature/default.nix b/distros/eloquent/phidgets-temperature/default.nix
similarity index 100%
rename from eloquent/phidgets-temperature/default.nix
rename to distros/eloquent/phidgets-temperature/default.nix
diff --git a/eloquent/plansys2-bringup/default.nix b/distros/eloquent/plansys2-bringup/default.nix
similarity index 100%
rename from eloquent/plansys2-bringup/default.nix
rename to distros/eloquent/plansys2-bringup/default.nix
diff --git a/eloquent/plansys2-domain-expert/default.nix b/distros/eloquent/plansys2-domain-expert/default.nix
similarity index 100%
rename from eloquent/plansys2-domain-expert/default.nix
rename to distros/eloquent/plansys2-domain-expert/default.nix
diff --git a/eloquent/plansys2-executor/default.nix b/distros/eloquent/plansys2-executor/default.nix
similarity index 100%
rename from eloquent/plansys2-executor/default.nix
rename to distros/eloquent/plansys2-executor/default.nix
diff --git a/eloquent/plansys2-lifecycle-manager/default.nix b/distros/eloquent/plansys2-lifecycle-manager/default.nix
similarity index 100%
rename from eloquent/plansys2-lifecycle-manager/default.nix
rename to distros/eloquent/plansys2-lifecycle-manager/default.nix
diff --git a/eloquent/plansys2-msgs/default.nix b/distros/eloquent/plansys2-msgs/default.nix
similarity index 100%
rename from eloquent/plansys2-msgs/default.nix
rename to distros/eloquent/plansys2-msgs/default.nix
diff --git a/eloquent/plansys2-multidomain-example/default.nix b/distros/eloquent/plansys2-multidomain-example/default.nix
similarity index 100%
rename from eloquent/plansys2-multidomain-example/default.nix
rename to distros/eloquent/plansys2-multidomain-example/default.nix
diff --git a/eloquent/plansys2-patrol-navigation-example/default.nix b/distros/eloquent/plansys2-patrol-navigation-example/default.nix
similarity index 100%
rename from eloquent/plansys2-patrol-navigation-example/default.nix
rename to distros/eloquent/plansys2-patrol-navigation-example/default.nix
diff --git a/eloquent/plansys2-pddl-parser/default.nix b/distros/eloquent/plansys2-pddl-parser/default.nix
similarity index 100%
rename from eloquent/plansys2-pddl-parser/default.nix
rename to distros/eloquent/plansys2-pddl-parser/default.nix
diff --git a/eloquent/plansys2-planner/default.nix b/distros/eloquent/plansys2-planner/default.nix
similarity index 100%
rename from eloquent/plansys2-planner/default.nix
rename to distros/eloquent/plansys2-planner/default.nix
diff --git a/eloquent/plansys2-problem-expert/default.nix b/distros/eloquent/plansys2-problem-expert/default.nix
similarity index 100%
rename from eloquent/plansys2-problem-expert/default.nix
rename to distros/eloquent/plansys2-problem-expert/default.nix
diff --git a/eloquent/plansys2-simple-example/default.nix b/distros/eloquent/plansys2-simple-example/default.nix
similarity index 100%
rename from eloquent/plansys2-simple-example/default.nix
rename to distros/eloquent/plansys2-simple-example/default.nix
diff --git a/eloquent/plansys2-terminal/default.nix b/distros/eloquent/plansys2-terminal/default.nix
similarity index 100%
rename from eloquent/plansys2-terminal/default.nix
rename to distros/eloquent/plansys2-terminal/default.nix
diff --git a/eloquent/pluginlib/default.nix b/distros/eloquent/pluginlib/default.nix
similarity index 100%
rename from eloquent/pluginlib/default.nix
rename to distros/eloquent/pluginlib/default.nix
diff --git a/eloquent/poco-vendor/default.nix b/distros/eloquent/poco-vendor/default.nix
similarity index 100%
rename from eloquent/poco-vendor/default.nix
rename to distros/eloquent/poco-vendor/default.nix
diff --git a/eloquent/popf/default.nix b/distros/eloquent/popf/default.nix
similarity index 100%
rename from eloquent/popf/default.nix
rename to distros/eloquent/popf/default.nix
diff --git a/eloquent/px4-msgs/default.nix b/distros/eloquent/px4-msgs/default.nix
similarity index 100%
rename from eloquent/px4-msgs/default.nix
rename to distros/eloquent/px4-msgs/default.nix
diff --git a/eloquent/py-trees-ros-interfaces/default.nix b/distros/eloquent/py-trees-ros-interfaces/default.nix
similarity index 100%
rename from eloquent/py-trees-ros-interfaces/default.nix
rename to distros/eloquent/py-trees-ros-interfaces/default.nix
diff --git a/eloquent/py-trees-ros/default.nix b/distros/eloquent/py-trees-ros/default.nix
similarity index 100%
rename from eloquent/py-trees-ros/default.nix
rename to distros/eloquent/py-trees-ros/default.nix
diff --git a/eloquent/python-cmake-module/default.nix b/distros/eloquent/python-cmake-module/default.nix
similarity index 100%
rename from eloquent/python-cmake-module/default.nix
rename to distros/eloquent/python-cmake-module/default.nix
diff --git a/eloquent/python-qt-binding/default.nix b/distros/eloquent/python-qt-binding/default.nix
similarity index 100%
rename from eloquent/python-qt-binding/default.nix
rename to distros/eloquent/python-qt-binding/default.nix
diff --git a/eloquent/qt-dotgraph/default.nix b/distros/eloquent/qt-dotgraph/default.nix
similarity index 100%
rename from eloquent/qt-dotgraph/default.nix
rename to distros/eloquent/qt-dotgraph/default.nix
diff --git a/eloquent/qt-gui-app/default.nix b/distros/eloquent/qt-gui-app/default.nix
similarity index 100%
rename from eloquent/qt-gui-app/default.nix
rename to distros/eloquent/qt-gui-app/default.nix
diff --git a/eloquent/qt-gui-core/default.nix b/distros/eloquent/qt-gui-core/default.nix
similarity index 100%
rename from eloquent/qt-gui-core/default.nix
rename to distros/eloquent/qt-gui-core/default.nix
diff --git a/eloquent/qt-gui-cpp/default.nix b/distros/eloquent/qt-gui-cpp/default.nix
similarity index 100%
rename from eloquent/qt-gui-cpp/default.nix
rename to distros/eloquent/qt-gui-cpp/default.nix
diff --git a/eloquent/qt-gui-py-common/default.nix b/distros/eloquent/qt-gui-py-common/default.nix
similarity index 100%
rename from eloquent/qt-gui-py-common/default.nix
rename to distros/eloquent/qt-gui-py-common/default.nix
diff --git a/eloquent/qt-gui/default.nix b/distros/eloquent/qt-gui/default.nix
similarity index 100%
rename from eloquent/qt-gui/default.nix
rename to distros/eloquent/qt-gui/default.nix
diff --git a/eloquent/quality-of-service-demo-cpp/default.nix b/distros/eloquent/quality-of-service-demo-cpp/default.nix
similarity index 100%
rename from eloquent/quality-of-service-demo-cpp/default.nix
rename to distros/eloquent/quality-of-service-demo-cpp/default.nix
diff --git a/eloquent/quality-of-service-demo-py/default.nix b/distros/eloquent/quality-of-service-demo-py/default.nix
similarity index 100%
rename from eloquent/quality-of-service-demo-py/default.nix
rename to distros/eloquent/quality-of-service-demo-py/default.nix
diff --git a/eloquent/rcl-action/default.nix b/distros/eloquent/rcl-action/default.nix
similarity index 100%
rename from eloquent/rcl-action/default.nix
rename to distros/eloquent/rcl-action/default.nix
diff --git a/eloquent/rcl-interfaces/default.nix b/distros/eloquent/rcl-interfaces/default.nix
similarity index 100%
rename from eloquent/rcl-interfaces/default.nix
rename to distros/eloquent/rcl-interfaces/default.nix
diff --git a/eloquent/rcl-lifecycle/default.nix b/distros/eloquent/rcl-lifecycle/default.nix
similarity index 100%
rename from eloquent/rcl-lifecycle/default.nix
rename to distros/eloquent/rcl-lifecycle/default.nix
diff --git a/eloquent/rcl-logging-log4cxx/default.nix b/distros/eloquent/rcl-logging-log4cxx/default.nix
similarity index 100%
rename from eloquent/rcl-logging-log4cxx/default.nix
rename to distros/eloquent/rcl-logging-log4cxx/default.nix
diff --git a/eloquent/rcl-logging-noop/default.nix b/distros/eloquent/rcl-logging-noop/default.nix
similarity index 100%
rename from eloquent/rcl-logging-noop/default.nix
rename to distros/eloquent/rcl-logging-noop/default.nix
diff --git a/eloquent/rcl-logging-spdlog/default.nix b/distros/eloquent/rcl-logging-spdlog/default.nix
similarity index 100%
rename from eloquent/rcl-logging-spdlog/default.nix
rename to distros/eloquent/rcl-logging-spdlog/default.nix
diff --git a/eloquent/rcl-yaml-param-parser/default.nix b/distros/eloquent/rcl-yaml-param-parser/default.nix
similarity index 100%
rename from eloquent/rcl-yaml-param-parser/default.nix
rename to distros/eloquent/rcl-yaml-param-parser/default.nix
diff --git a/eloquent/rcl/default.nix b/distros/eloquent/rcl/default.nix
similarity index 100%
rename from eloquent/rcl/default.nix
rename to distros/eloquent/rcl/default.nix
diff --git a/eloquent/rclcpp-action/default.nix b/distros/eloquent/rclcpp-action/default.nix
similarity index 100%
rename from eloquent/rclcpp-action/default.nix
rename to distros/eloquent/rclcpp-action/default.nix
diff --git a/eloquent/rclcpp-components/default.nix b/distros/eloquent/rclcpp-components/default.nix
similarity index 100%
rename from eloquent/rclcpp-components/default.nix
rename to distros/eloquent/rclcpp-components/default.nix
diff --git a/eloquent/rclcpp-lifecycle/default.nix b/distros/eloquent/rclcpp-lifecycle/default.nix
similarity index 100%
rename from eloquent/rclcpp-lifecycle/default.nix
rename to distros/eloquent/rclcpp-lifecycle/default.nix
diff --git a/eloquent/rclcpp/default.nix b/distros/eloquent/rclcpp/default.nix
similarity index 100%
rename from eloquent/rclcpp/default.nix
rename to distros/eloquent/rclcpp/default.nix
diff --git a/eloquent/rclpy/default.nix b/distros/eloquent/rclpy/default.nix
similarity index 100%
rename from eloquent/rclpy/default.nix
rename to distros/eloquent/rclpy/default.nix
diff --git a/eloquent/rcpputils/default.nix b/distros/eloquent/rcpputils/default.nix
similarity index 100%
rename from eloquent/rcpputils/default.nix
rename to distros/eloquent/rcpputils/default.nix
diff --git a/eloquent/rcutils/default.nix b/distros/eloquent/rcutils/default.nix
similarity index 100%
rename from eloquent/rcutils/default.nix
rename to distros/eloquent/rcutils/default.nix
diff --git a/eloquent/realtime-tools/default.nix b/distros/eloquent/realtime-tools/default.nix
similarity index 100%
rename from eloquent/realtime-tools/default.nix
rename to distros/eloquent/realtime-tools/default.nix
diff --git a/eloquent/resource-retriever/default.nix b/distros/eloquent/resource-retriever/default.nix
similarity index 100%
rename from eloquent/resource-retriever/default.nix
rename to distros/eloquent/resource-retriever/default.nix
diff --git a/eloquent/rmw-connext-cpp/default.nix b/distros/eloquent/rmw-connext-cpp/default.nix
similarity index 100%
rename from eloquent/rmw-connext-cpp/default.nix
rename to distros/eloquent/rmw-connext-cpp/default.nix
diff --git a/eloquent/rmw-connext-shared-cpp/default.nix b/distros/eloquent/rmw-connext-shared-cpp/default.nix
similarity index 100%
rename from eloquent/rmw-connext-shared-cpp/default.nix
rename to distros/eloquent/rmw-connext-shared-cpp/default.nix
diff --git a/eloquent/rmw-cyclonedds-cpp/default.nix b/distros/eloquent/rmw-cyclonedds-cpp/default.nix
similarity index 100%
rename from eloquent/rmw-cyclonedds-cpp/default.nix
rename to distros/eloquent/rmw-cyclonedds-cpp/default.nix
diff --git a/eloquent/rmw-fastrtps-cpp/default.nix b/distros/eloquent/rmw-fastrtps-cpp/default.nix
similarity index 100%
rename from eloquent/rmw-fastrtps-cpp/default.nix
rename to distros/eloquent/rmw-fastrtps-cpp/default.nix
diff --git a/eloquent/rmw-fastrtps-dynamic-cpp/default.nix b/distros/eloquent/rmw-fastrtps-dynamic-cpp/default.nix
similarity index 100%
rename from eloquent/rmw-fastrtps-dynamic-cpp/default.nix
rename to distros/eloquent/rmw-fastrtps-dynamic-cpp/default.nix
diff --git a/eloquent/rmw-fastrtps-shared-cpp/default.nix b/distros/eloquent/rmw-fastrtps-shared-cpp/default.nix
similarity index 100%
rename from eloquent/rmw-fastrtps-shared-cpp/default.nix
rename to distros/eloquent/rmw-fastrtps-shared-cpp/default.nix
diff --git a/eloquent/rmw-implementation-cmake/default.nix b/distros/eloquent/rmw-implementation-cmake/default.nix
similarity index 100%
rename from eloquent/rmw-implementation-cmake/default.nix
rename to distros/eloquent/rmw-implementation-cmake/default.nix
diff --git a/eloquent/rmw-implementation/default.nix b/distros/eloquent/rmw-implementation/default.nix
similarity index 100%
rename from eloquent/rmw-implementation/default.nix
rename to distros/eloquent/rmw-implementation/default.nix
diff --git a/eloquent/rmw-opensplice-cpp/default.nix b/distros/eloquent/rmw-opensplice-cpp/default.nix
similarity index 100%
rename from eloquent/rmw-opensplice-cpp/default.nix
rename to distros/eloquent/rmw-opensplice-cpp/default.nix
diff --git a/eloquent/rmw/default.nix b/distros/eloquent/rmw/default.nix
similarity index 100%
rename from eloquent/rmw/default.nix
rename to distros/eloquent/rmw/default.nix
diff --git a/eloquent/robot-state-publisher/default.nix b/distros/eloquent/robot-state-publisher/default.nix
similarity index 100%
rename from eloquent/robot-state-publisher/default.nix
rename to distros/eloquent/robot-state-publisher/default.nix
diff --git a/eloquent/ros-base/default.nix b/distros/eloquent/ros-base/default.nix
similarity index 100%
rename from eloquent/ros-base/default.nix
rename to distros/eloquent/ros-base/default.nix
diff --git a/eloquent/ros-core/default.nix b/distros/eloquent/ros-core/default.nix
similarity index 100%
rename from eloquent/ros-core/default.nix
rename to distros/eloquent/ros-core/default.nix
diff --git a/eloquent/ros-environment/default.nix b/distros/eloquent/ros-environment/default.nix
similarity index 100%
rename from eloquent/ros-environment/default.nix
rename to distros/eloquent/ros-environment/default.nix
diff --git a/eloquent/ros-testing/default.nix b/distros/eloquent/ros-testing/default.nix
similarity index 100%
rename from eloquent/ros-testing/default.nix
rename to distros/eloquent/ros-testing/default.nix
diff --git a/eloquent/ros-workspace/default.nix b/distros/eloquent/ros-workspace/default.nix
similarity index 100%
rename from eloquent/ros-workspace/default.nix
rename to distros/eloquent/ros-workspace/default.nix
diff --git a/eloquent/ros1-bridge/default.nix b/distros/eloquent/ros1-bridge/default.nix
similarity index 100%
rename from eloquent/ros1-bridge/default.nix
rename to distros/eloquent/ros1-bridge/default.nix
diff --git a/eloquent/ros1-rosbag-storage-vendor/default.nix b/distros/eloquent/ros1-rosbag-storage-vendor/default.nix
similarity index 100%
rename from eloquent/ros1-rosbag-storage-vendor/default.nix
rename to distros/eloquent/ros1-rosbag-storage-vendor/default.nix
diff --git a/eloquent/ros2-ouster/default.nix b/distros/eloquent/ros2-ouster/default.nix
similarity index 100%
rename from eloquent/ros2-ouster/default.nix
rename to distros/eloquent/ros2-ouster/default.nix
diff --git a/eloquent/ros2action/default.nix b/distros/eloquent/ros2action/default.nix
similarity index 100%
rename from eloquent/ros2action/default.nix
rename to distros/eloquent/ros2action/default.nix
diff --git a/eloquent/ros2bag/default.nix b/distros/eloquent/ros2bag/default.nix
similarity index 100%
rename from eloquent/ros2bag/default.nix
rename to distros/eloquent/ros2bag/default.nix
diff --git a/eloquent/ros2cli/default.nix b/distros/eloquent/ros2cli/default.nix
similarity index 100%
rename from eloquent/ros2cli/default.nix
rename to distros/eloquent/ros2cli/default.nix
diff --git a/eloquent/ros2component/default.nix b/distros/eloquent/ros2component/default.nix
similarity index 100%
rename from eloquent/ros2component/default.nix
rename to distros/eloquent/ros2component/default.nix
diff --git a/eloquent/ros2interface/default.nix b/distros/eloquent/ros2interface/default.nix
similarity index 100%
rename from eloquent/ros2interface/default.nix
rename to distros/eloquent/ros2interface/default.nix
diff --git a/eloquent/ros2launch/default.nix b/distros/eloquent/ros2launch/default.nix
similarity index 100%
rename from eloquent/ros2launch/default.nix
rename to distros/eloquent/ros2launch/default.nix
diff --git a/eloquent/ros2lifecycle-test-fixtures/default.nix b/distros/eloquent/ros2lifecycle-test-fixtures/default.nix
similarity index 100%
rename from eloquent/ros2lifecycle-test-fixtures/default.nix
rename to distros/eloquent/ros2lifecycle-test-fixtures/default.nix
diff --git a/eloquent/ros2lifecycle/default.nix b/distros/eloquent/ros2lifecycle/default.nix
similarity index 100%
rename from eloquent/ros2lifecycle/default.nix
rename to distros/eloquent/ros2lifecycle/default.nix
diff --git a/eloquent/ros2msg/default.nix b/distros/eloquent/ros2msg/default.nix
similarity index 100%
rename from eloquent/ros2msg/default.nix
rename to distros/eloquent/ros2msg/default.nix
diff --git a/eloquent/ros2multicast/default.nix b/distros/eloquent/ros2multicast/default.nix
similarity index 100%
rename from eloquent/ros2multicast/default.nix
rename to distros/eloquent/ros2multicast/default.nix
diff --git a/eloquent/ros2node/default.nix b/distros/eloquent/ros2node/default.nix
similarity index 100%
rename from eloquent/ros2node/default.nix
rename to distros/eloquent/ros2node/default.nix
diff --git a/eloquent/ros2param/default.nix b/distros/eloquent/ros2param/default.nix
similarity index 100%
rename from eloquent/ros2param/default.nix
rename to distros/eloquent/ros2param/default.nix
diff --git a/eloquent/ros2pkg/default.nix b/distros/eloquent/ros2pkg/default.nix
similarity index 100%
rename from eloquent/ros2pkg/default.nix
rename to distros/eloquent/ros2pkg/default.nix
diff --git a/eloquent/ros2run/default.nix b/distros/eloquent/ros2run/default.nix
similarity index 100%
rename from eloquent/ros2run/default.nix
rename to distros/eloquent/ros2run/default.nix
diff --git a/eloquent/ros2service/default.nix b/distros/eloquent/ros2service/default.nix
similarity index 100%
rename from eloquent/ros2service/default.nix
rename to distros/eloquent/ros2service/default.nix
diff --git a/eloquent/ros2srv/default.nix b/distros/eloquent/ros2srv/default.nix
similarity index 100%
rename from eloquent/ros2srv/default.nix
rename to distros/eloquent/ros2srv/default.nix
diff --git a/eloquent/ros2test/default.nix b/distros/eloquent/ros2test/default.nix
similarity index 100%
rename from eloquent/ros2test/default.nix
rename to distros/eloquent/ros2test/default.nix
diff --git a/eloquent/ros2topic/default.nix b/distros/eloquent/ros2topic/default.nix
similarity index 100%
rename from eloquent/ros2topic/default.nix
rename to distros/eloquent/ros2topic/default.nix
diff --git a/eloquent/ros2trace-analysis/default.nix b/distros/eloquent/ros2trace-analysis/default.nix
similarity index 100%
rename from eloquent/ros2trace-analysis/default.nix
rename to distros/eloquent/ros2trace-analysis/default.nix
diff --git a/eloquent/ros2trace/default.nix b/distros/eloquent/ros2trace/default.nix
similarity index 100%
rename from eloquent/ros2trace/default.nix
rename to distros/eloquent/ros2trace/default.nix
diff --git a/eloquent/rosbag2-bag-v2-plugins/default.nix b/distros/eloquent/rosbag2-bag-v2-plugins/default.nix
similarity index 100%
rename from eloquent/rosbag2-bag-v2-plugins/default.nix
rename to distros/eloquent/rosbag2-bag-v2-plugins/default.nix
diff --git a/eloquent/rosbag2-converter-default-plugins/default.nix b/distros/eloquent/rosbag2-converter-default-plugins/default.nix
similarity index 100%
rename from eloquent/rosbag2-converter-default-plugins/default.nix
rename to distros/eloquent/rosbag2-converter-default-plugins/default.nix
diff --git a/eloquent/rosbag2-storage-default-plugins/default.nix b/distros/eloquent/rosbag2-storage-default-plugins/default.nix
similarity index 100%
rename from eloquent/rosbag2-storage-default-plugins/default.nix
rename to distros/eloquent/rosbag2-storage-default-plugins/default.nix
diff --git a/eloquent/rosbag2-storage/default.nix b/distros/eloquent/rosbag2-storage/default.nix
similarity index 100%
rename from eloquent/rosbag2-storage/default.nix
rename to distros/eloquent/rosbag2-storage/default.nix
diff --git a/eloquent/rosbag2-test-common/default.nix b/distros/eloquent/rosbag2-test-common/default.nix
similarity index 100%
rename from eloquent/rosbag2-test-common/default.nix
rename to distros/eloquent/rosbag2-test-common/default.nix
diff --git a/eloquent/rosbag2-tests/default.nix b/distros/eloquent/rosbag2-tests/default.nix
similarity index 100%
rename from eloquent/rosbag2-tests/default.nix
rename to distros/eloquent/rosbag2-tests/default.nix
diff --git a/eloquent/rosbag2-transport/default.nix b/distros/eloquent/rosbag2-transport/default.nix
similarity index 100%
rename from eloquent/rosbag2-transport/default.nix
rename to distros/eloquent/rosbag2-transport/default.nix
diff --git a/eloquent/rosbag2/default.nix b/distros/eloquent/rosbag2/default.nix
similarity index 100%
rename from eloquent/rosbag2/default.nix
rename to distros/eloquent/rosbag2/default.nix
diff --git a/eloquent/rosgraph-msgs/default.nix b/distros/eloquent/rosgraph-msgs/default.nix
similarity index 100%
rename from eloquent/rosgraph-msgs/default.nix
rename to distros/eloquent/rosgraph-msgs/default.nix
diff --git a/eloquent/rosidl-adapter/default.nix b/distros/eloquent/rosidl-adapter/default.nix
similarity index 100%
rename from eloquent/rosidl-adapter/default.nix
rename to distros/eloquent/rosidl-adapter/default.nix
diff --git a/eloquent/rosidl-cmake/default.nix b/distros/eloquent/rosidl-cmake/default.nix
similarity index 100%
rename from eloquent/rosidl-cmake/default.nix
rename to distros/eloquent/rosidl-cmake/default.nix
diff --git a/eloquent/rosidl-default-generators/default.nix b/distros/eloquent/rosidl-default-generators/default.nix
similarity index 100%
rename from eloquent/rosidl-default-generators/default.nix
rename to distros/eloquent/rosidl-default-generators/default.nix
diff --git a/eloquent/rosidl-default-runtime/default.nix b/distros/eloquent/rosidl-default-runtime/default.nix
similarity index 100%
rename from eloquent/rosidl-default-runtime/default.nix
rename to distros/eloquent/rosidl-default-runtime/default.nix
diff --git a/eloquent/rosidl-generator-c/default.nix b/distros/eloquent/rosidl-generator-c/default.nix
similarity index 100%
rename from eloquent/rosidl-generator-c/default.nix
rename to distros/eloquent/rosidl-generator-c/default.nix
diff --git a/eloquent/rosidl-generator-cpp/default.nix b/distros/eloquent/rosidl-generator-cpp/default.nix
similarity index 100%
rename from eloquent/rosidl-generator-cpp/default.nix
rename to distros/eloquent/rosidl-generator-cpp/default.nix
diff --git a/eloquent/rosidl-generator-dds-idl/default.nix b/distros/eloquent/rosidl-generator-dds-idl/default.nix
similarity index 100%
rename from eloquent/rosidl-generator-dds-idl/default.nix
rename to distros/eloquent/rosidl-generator-dds-idl/default.nix
diff --git a/eloquent/rosidl-generator-py/default.nix b/distros/eloquent/rosidl-generator-py/default.nix
similarity index 100%
rename from eloquent/rosidl-generator-py/default.nix
rename to distros/eloquent/rosidl-generator-py/default.nix
diff --git a/eloquent/rosidl-parser/default.nix b/distros/eloquent/rosidl-parser/default.nix
similarity index 100%
rename from eloquent/rosidl-parser/default.nix
rename to distros/eloquent/rosidl-parser/default.nix
diff --git a/eloquent/rosidl-runtime-py/default.nix b/distros/eloquent/rosidl-runtime-py/default.nix
similarity index 100%
rename from eloquent/rosidl-runtime-py/default.nix
rename to distros/eloquent/rosidl-runtime-py/default.nix
diff --git a/eloquent/rosidl-typesupport-c/default.nix b/distros/eloquent/rosidl-typesupport-c/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-c/default.nix
rename to distros/eloquent/rosidl-typesupport-c/default.nix
diff --git a/eloquent/rosidl-typesupport-connext-c/default.nix b/distros/eloquent/rosidl-typesupport-connext-c/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-connext-c/default.nix
rename to distros/eloquent/rosidl-typesupport-connext-c/default.nix
diff --git a/eloquent/rosidl-typesupport-connext-cpp/default.nix b/distros/eloquent/rosidl-typesupport-connext-cpp/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-connext-cpp/default.nix
rename to distros/eloquent/rosidl-typesupport-connext-cpp/default.nix
diff --git a/eloquent/rosidl-typesupport-cpp/default.nix b/distros/eloquent/rosidl-typesupport-cpp/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-cpp/default.nix
rename to distros/eloquent/rosidl-typesupport-cpp/default.nix
diff --git a/eloquent/rosidl-typesupport-fastrtps-c/default.nix b/distros/eloquent/rosidl-typesupport-fastrtps-c/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-fastrtps-c/default.nix
rename to distros/eloquent/rosidl-typesupport-fastrtps-c/default.nix
diff --git a/eloquent/rosidl-typesupport-fastrtps-cpp/default.nix b/distros/eloquent/rosidl-typesupport-fastrtps-cpp/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-fastrtps-cpp/default.nix
rename to distros/eloquent/rosidl-typesupport-fastrtps-cpp/default.nix
diff --git a/eloquent/rosidl-typesupport-interface/default.nix b/distros/eloquent/rosidl-typesupport-interface/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-interface/default.nix
rename to distros/eloquent/rosidl-typesupport-interface/default.nix
diff --git a/eloquent/rosidl-typesupport-introspection-c/default.nix b/distros/eloquent/rosidl-typesupport-introspection-c/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-introspection-c/default.nix
rename to distros/eloquent/rosidl-typesupport-introspection-c/default.nix
diff --git a/eloquent/rosidl-typesupport-introspection-cpp/default.nix b/distros/eloquent/rosidl-typesupport-introspection-cpp/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-introspection-cpp/default.nix
rename to distros/eloquent/rosidl-typesupport-introspection-cpp/default.nix
diff --git a/eloquent/rosidl-typesupport-opensplice-c/default.nix b/distros/eloquent/rosidl-typesupport-opensplice-c/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-opensplice-c/default.nix
rename to distros/eloquent/rosidl-typesupport-opensplice-c/default.nix
diff --git a/eloquent/rosidl-typesupport-opensplice-cpp/default.nix b/distros/eloquent/rosidl-typesupport-opensplice-cpp/default.nix
similarity index 100%
rename from eloquent/rosidl-typesupport-opensplice-cpp/default.nix
rename to distros/eloquent/rosidl-typesupport-opensplice-cpp/default.nix
diff --git a/eloquent/rqt-action/default.nix b/distros/eloquent/rqt-action/default.nix
similarity index 100%
rename from eloquent/rqt-action/default.nix
rename to distros/eloquent/rqt-action/default.nix
diff --git a/eloquent/rqt-common-plugins/default.nix b/distros/eloquent/rqt-common-plugins/default.nix
similarity index 100%
rename from eloquent/rqt-common-plugins/default.nix
rename to distros/eloquent/rqt-common-plugins/default.nix
diff --git a/eloquent/rqt-console/default.nix b/distros/eloquent/rqt-console/default.nix
similarity index 100%
rename from eloquent/rqt-console/default.nix
rename to distros/eloquent/rqt-console/default.nix
diff --git a/eloquent/rqt-graph/default.nix b/distros/eloquent/rqt-graph/default.nix
similarity index 100%
rename from eloquent/rqt-graph/default.nix
rename to distros/eloquent/rqt-graph/default.nix
diff --git a/eloquent/rqt-gui-cpp/default.nix b/distros/eloquent/rqt-gui-cpp/default.nix
similarity index 100%
rename from eloquent/rqt-gui-cpp/default.nix
rename to distros/eloquent/rqt-gui-cpp/default.nix
diff --git a/eloquent/rqt-gui-py/default.nix b/distros/eloquent/rqt-gui-py/default.nix
similarity index 100%
rename from eloquent/rqt-gui-py/default.nix
rename to distros/eloquent/rqt-gui-py/default.nix
diff --git a/eloquent/rqt-gui/default.nix b/distros/eloquent/rqt-gui/default.nix
similarity index 100%
rename from eloquent/rqt-gui/default.nix
rename to distros/eloquent/rqt-gui/default.nix
diff --git a/eloquent/rqt-image-view/default.nix b/distros/eloquent/rqt-image-view/default.nix
similarity index 100%
rename from eloquent/rqt-image-view/default.nix
rename to distros/eloquent/rqt-image-view/default.nix
diff --git a/eloquent/rqt-msg/default.nix b/distros/eloquent/rqt-msg/default.nix
similarity index 100%
rename from eloquent/rqt-msg/default.nix
rename to distros/eloquent/rqt-msg/default.nix
diff --git a/eloquent/rqt-plot/default.nix b/distros/eloquent/rqt-plot/default.nix
similarity index 100%
rename from eloquent/rqt-plot/default.nix
rename to distros/eloquent/rqt-plot/default.nix
diff --git a/eloquent/rqt-publisher/default.nix b/distros/eloquent/rqt-publisher/default.nix
similarity index 100%
rename from eloquent/rqt-publisher/default.nix
rename to distros/eloquent/rqt-publisher/default.nix
diff --git a/eloquent/rqt-py-common/default.nix b/distros/eloquent/rqt-py-common/default.nix
similarity index 100%
rename from eloquent/rqt-py-common/default.nix
rename to distros/eloquent/rqt-py-common/default.nix
diff --git a/eloquent/rqt-py-console/default.nix b/distros/eloquent/rqt-py-console/default.nix
similarity index 100%
rename from eloquent/rqt-py-console/default.nix
rename to distros/eloquent/rqt-py-console/default.nix
diff --git a/eloquent/rqt-reconfigure/default.nix b/distros/eloquent/rqt-reconfigure/default.nix
similarity index 100%
rename from eloquent/rqt-reconfigure/default.nix
rename to distros/eloquent/rqt-reconfigure/default.nix
diff --git a/eloquent/rqt-robot-steering/default.nix b/distros/eloquent/rqt-robot-steering/default.nix
similarity index 100%
rename from eloquent/rqt-robot-steering/default.nix
rename to distros/eloquent/rqt-robot-steering/default.nix
diff --git a/eloquent/rqt-service-caller/default.nix b/distros/eloquent/rqt-service-caller/default.nix
similarity index 100%
rename from eloquent/rqt-service-caller/default.nix
rename to distros/eloquent/rqt-service-caller/default.nix
diff --git a/eloquent/rqt-shell/default.nix b/distros/eloquent/rqt-shell/default.nix
similarity index 100%
rename from eloquent/rqt-shell/default.nix
rename to distros/eloquent/rqt-shell/default.nix
diff --git a/eloquent/rqt-srv/default.nix b/distros/eloquent/rqt-srv/default.nix
similarity index 100%
rename from eloquent/rqt-srv/default.nix
rename to distros/eloquent/rqt-srv/default.nix
diff --git a/eloquent/rqt-tf-tree/default.nix b/distros/eloquent/rqt-tf-tree/default.nix
similarity index 100%
rename from eloquent/rqt-tf-tree/default.nix
rename to distros/eloquent/rqt-tf-tree/default.nix
diff --git a/eloquent/rqt-top/default.nix b/distros/eloquent/rqt-top/default.nix
similarity index 100%
rename from eloquent/rqt-top/default.nix
rename to distros/eloquent/rqt-top/default.nix
diff --git a/eloquent/rqt-topic/default.nix b/distros/eloquent/rqt-topic/default.nix
similarity index 100%
rename from eloquent/rqt-topic/default.nix
rename to distros/eloquent/rqt-topic/default.nix
diff --git a/eloquent/rqt/default.nix b/distros/eloquent/rqt/default.nix
similarity index 100%
rename from eloquent/rqt/default.nix
rename to distros/eloquent/rqt/default.nix
diff --git a/eloquent/rttest/default.nix b/distros/eloquent/rttest/default.nix
similarity index 100%
rename from eloquent/rttest/default.nix
rename to distros/eloquent/rttest/default.nix
diff --git a/eloquent/rviz-assimp-vendor/default.nix b/distros/eloquent/rviz-assimp-vendor/default.nix
similarity index 100%
rename from eloquent/rviz-assimp-vendor/default.nix
rename to distros/eloquent/rviz-assimp-vendor/default.nix
diff --git a/eloquent/rviz-common/default.nix b/distros/eloquent/rviz-common/default.nix
similarity index 100%
rename from eloquent/rviz-common/default.nix
rename to distros/eloquent/rviz-common/default.nix
diff --git a/eloquent/rviz-default-plugins/default.nix b/distros/eloquent/rviz-default-plugins/default.nix
similarity index 100%
rename from eloquent/rviz-default-plugins/default.nix
rename to distros/eloquent/rviz-default-plugins/default.nix
diff --git a/eloquent/rviz-ogre-vendor/default.nix b/distros/eloquent/rviz-ogre-vendor/default.nix
similarity index 100%
rename from eloquent/rviz-ogre-vendor/default.nix
rename to distros/eloquent/rviz-ogre-vendor/default.nix
diff --git a/eloquent/rviz-rendering-tests/default.nix b/distros/eloquent/rviz-rendering-tests/default.nix
similarity index 100%
rename from eloquent/rviz-rendering-tests/default.nix
rename to distros/eloquent/rviz-rendering-tests/default.nix
diff --git a/eloquent/rviz-rendering/default.nix b/distros/eloquent/rviz-rendering/default.nix
similarity index 100%
rename from eloquent/rviz-rendering/default.nix
rename to distros/eloquent/rviz-rendering/default.nix
diff --git a/eloquent/rviz-visual-testing-framework/default.nix b/distros/eloquent/rviz-visual-testing-framework/default.nix
similarity index 100%
rename from eloquent/rviz-visual-testing-framework/default.nix
rename to distros/eloquent/rviz-visual-testing-framework/default.nix
diff --git a/eloquent/rviz2/default.nix b/distros/eloquent/rviz2/default.nix
similarity index 100%
rename from eloquent/rviz2/default.nix
rename to distros/eloquent/rviz2/default.nix
diff --git a/eloquent/self-test/default.nix b/distros/eloquent/self-test/default.nix
similarity index 100%
rename from eloquent/self-test/default.nix
rename to distros/eloquent/self-test/default.nix
diff --git a/eloquent/sensor-msgs/default.nix b/distros/eloquent/sensor-msgs/default.nix
similarity index 100%
rename from eloquent/sensor-msgs/default.nix
rename to distros/eloquent/sensor-msgs/default.nix
diff --git a/eloquent/shape-msgs/default.nix b/distros/eloquent/shape-msgs/default.nix
similarity index 100%
rename from eloquent/shape-msgs/default.nix
rename to distros/eloquent/shape-msgs/default.nix
diff --git a/eloquent/shared-queues-vendor/default.nix b/distros/eloquent/shared-queues-vendor/default.nix
similarity index 100%
rename from eloquent/shared-queues-vendor/default.nix
rename to distros/eloquent/shared-queues-vendor/default.nix
diff --git a/eloquent/sophus/default.nix b/distros/eloquent/sophus/default.nix
similarity index 100%
rename from eloquent/sophus/default.nix
rename to distros/eloquent/sophus/default.nix
diff --git a/eloquent/spatio-temporal-voxel-layer/default.nix b/distros/eloquent/spatio-temporal-voxel-layer/default.nix
similarity index 100%
rename from eloquent/spatio-temporal-voxel-layer/default.nix
rename to distros/eloquent/spatio-temporal-voxel-layer/default.nix
diff --git a/eloquent/spdlog-vendor/default.nix b/distros/eloquent/spdlog-vendor/default.nix
similarity index 100%
rename from eloquent/spdlog-vendor/default.nix
rename to distros/eloquent/spdlog-vendor/default.nix
diff --git a/eloquent/sqlite3-vendor/default.nix b/distros/eloquent/sqlite3-vendor/default.nix
similarity index 100%
rename from eloquent/sqlite3-vendor/default.nix
rename to distros/eloquent/sqlite3-vendor/default.nix
diff --git a/eloquent/sros2-cmake/default.nix b/distros/eloquent/sros2-cmake/default.nix
similarity index 100%
rename from eloquent/sros2-cmake/default.nix
rename to distros/eloquent/sros2-cmake/default.nix
diff --git a/eloquent/sros2/default.nix b/distros/eloquent/sros2/default.nix
similarity index 100%
rename from eloquent/sros2/default.nix
rename to distros/eloquent/sros2/default.nix
diff --git a/eloquent/std-msgs/default.nix b/distros/eloquent/std-msgs/default.nix
similarity index 100%
rename from eloquent/std-msgs/default.nix
rename to distros/eloquent/std-msgs/default.nix
diff --git a/eloquent/std-srvs/default.nix b/distros/eloquent/std-srvs/default.nix
similarity index 100%
rename from eloquent/std-srvs/default.nix
rename to distros/eloquent/std-srvs/default.nix
diff --git a/eloquent/stereo-msgs/default.nix b/distros/eloquent/stereo-msgs/default.nix
similarity index 100%
rename from eloquent/stereo-msgs/default.nix
rename to distros/eloquent/stereo-msgs/default.nix
diff --git a/eloquent/system-modes-examples/default.nix b/distros/eloquent/system-modes-examples/default.nix
similarity index 100%
rename from eloquent/system-modes-examples/default.nix
rename to distros/eloquent/system-modes-examples/default.nix
diff --git a/eloquent/system-modes/default.nix b/distros/eloquent/system-modes/default.nix
similarity index 100%
rename from eloquent/system-modes/default.nix
rename to distros/eloquent/system-modes/default.nix
diff --git a/eloquent/teleop-tools-msgs/default.nix b/distros/eloquent/teleop-tools-msgs/default.nix
similarity index 100%
rename from eloquent/teleop-tools-msgs/default.nix
rename to distros/eloquent/teleop-tools-msgs/default.nix
diff --git a/eloquent/teleop-tools/default.nix b/distros/eloquent/teleop-tools/default.nix
similarity index 100%
rename from eloquent/teleop-tools/default.nix
rename to distros/eloquent/teleop-tools/default.nix
diff --git a/eloquent/teleop-twist-joy/default.nix b/distros/eloquent/teleop-twist-joy/default.nix
similarity index 100%
rename from eloquent/teleop-twist-joy/default.nix
rename to distros/eloquent/teleop-twist-joy/default.nix
diff --git a/eloquent/teleop-twist-keyboard/default.nix b/distros/eloquent/teleop-twist-keyboard/default.nix
similarity index 100%
rename from eloquent/teleop-twist-keyboard/default.nix
rename to distros/eloquent/teleop-twist-keyboard/default.nix
diff --git a/eloquent/test-interface-files/default.nix b/distros/eloquent/test-interface-files/default.nix
similarity index 100%
rename from eloquent/test-interface-files/default.nix
rename to distros/eloquent/test-interface-files/default.nix
diff --git a/eloquent/test-msgs/default.nix b/distros/eloquent/test-msgs/default.nix
similarity index 100%
rename from eloquent/test-msgs/default.nix
rename to distros/eloquent/test-msgs/default.nix
diff --git a/eloquent/test-osrf-testing-tools-cpp/default.nix b/distros/eloquent/test-osrf-testing-tools-cpp/default.nix
similarity index 100%
rename from eloquent/test-osrf-testing-tools-cpp/default.nix
rename to distros/eloquent/test-osrf-testing-tools-cpp/default.nix
diff --git a/eloquent/tf2-eigen/default.nix b/distros/eloquent/tf2-eigen/default.nix
similarity index 100%
rename from eloquent/tf2-eigen/default.nix
rename to distros/eloquent/tf2-eigen/default.nix
diff --git a/eloquent/tf2-geometry-msgs/default.nix b/distros/eloquent/tf2-geometry-msgs/default.nix
similarity index 100%
rename from eloquent/tf2-geometry-msgs/default.nix
rename to distros/eloquent/tf2-geometry-msgs/default.nix
diff --git a/eloquent/tf2-kdl/default.nix b/distros/eloquent/tf2-kdl/default.nix
similarity index 100%
rename from eloquent/tf2-kdl/default.nix
rename to distros/eloquent/tf2-kdl/default.nix
diff --git a/eloquent/tf2-msgs/default.nix b/distros/eloquent/tf2-msgs/default.nix
similarity index 100%
rename from eloquent/tf2-msgs/default.nix
rename to distros/eloquent/tf2-msgs/default.nix
diff --git a/eloquent/tf2-py/default.nix b/distros/eloquent/tf2-py/default.nix
similarity index 100%
rename from eloquent/tf2-py/default.nix
rename to distros/eloquent/tf2-py/default.nix
diff --git a/eloquent/tf2-ros/default.nix b/distros/eloquent/tf2-ros/default.nix
similarity index 100%
rename from eloquent/tf2-ros/default.nix
rename to distros/eloquent/tf2-ros/default.nix
diff --git a/eloquent/tf2-sensor-msgs/default.nix b/distros/eloquent/tf2-sensor-msgs/default.nix
similarity index 100%
rename from eloquent/tf2-sensor-msgs/default.nix
rename to distros/eloquent/tf2-sensor-msgs/default.nix
diff --git a/eloquent/tf2/default.nix b/distros/eloquent/tf2/default.nix
similarity index 100%
rename from eloquent/tf2/default.nix
rename to distros/eloquent/tf2/default.nix
diff --git a/eloquent/theora-image-transport/default.nix b/distros/eloquent/theora-image-transport/default.nix
similarity index 100%
rename from eloquent/theora-image-transport/default.nix
rename to distros/eloquent/theora-image-transport/default.nix
diff --git a/eloquent/tinydir-vendor/default.nix b/distros/eloquent/tinydir-vendor/default.nix
similarity index 100%
rename from eloquent/tinydir-vendor/default.nix
rename to distros/eloquent/tinydir-vendor/default.nix
diff --git a/eloquent/tinyxml-vendor/default.nix b/distros/eloquent/tinyxml-vendor/default.nix
similarity index 100%
rename from eloquent/tinyxml-vendor/default.nix
rename to distros/eloquent/tinyxml-vendor/default.nix
diff --git a/eloquent/tinyxml2-vendor/default.nix b/distros/eloquent/tinyxml2-vendor/default.nix
similarity index 100%
rename from eloquent/tinyxml2-vendor/default.nix
rename to distros/eloquent/tinyxml2-vendor/default.nix
diff --git a/eloquent/tlsf-cpp/default.nix b/distros/eloquent/tlsf-cpp/default.nix
similarity index 100%
rename from eloquent/tlsf-cpp/default.nix
rename to distros/eloquent/tlsf-cpp/default.nix
diff --git a/eloquent/tlsf/default.nix b/distros/eloquent/tlsf/default.nix
similarity index 100%
rename from eloquent/tlsf/default.nix
rename to distros/eloquent/tlsf/default.nix
diff --git a/eloquent/topic-monitor/default.nix b/distros/eloquent/topic-monitor/default.nix
similarity index 100%
rename from eloquent/topic-monitor/default.nix
rename to distros/eloquent/topic-monitor/default.nix
diff --git a/eloquent/tracetools-analysis/default.nix b/distros/eloquent/tracetools-analysis/default.nix
similarity index 100%
rename from eloquent/tracetools-analysis/default.nix
rename to distros/eloquent/tracetools-analysis/default.nix
diff --git a/eloquent/tracetools-launch/default.nix b/distros/eloquent/tracetools-launch/default.nix
similarity index 100%
rename from eloquent/tracetools-launch/default.nix
rename to distros/eloquent/tracetools-launch/default.nix
diff --git a/eloquent/tracetools-test/default.nix b/distros/eloquent/tracetools-test/default.nix
similarity index 100%
rename from eloquent/tracetools-test/default.nix
rename to distros/eloquent/tracetools-test/default.nix
diff --git a/eloquent/tracetools/default.nix b/distros/eloquent/tracetools/default.nix
similarity index 100%
rename from eloquent/tracetools/default.nix
rename to distros/eloquent/tracetools/default.nix
diff --git a/eloquent/trajectory-msgs/default.nix b/distros/eloquent/trajectory-msgs/default.nix
similarity index 100%
rename from eloquent/trajectory-msgs/default.nix
rename to distros/eloquent/trajectory-msgs/default.nix
diff --git a/eloquent/turtlesim/default.nix b/distros/eloquent/turtlesim/default.nix
similarity index 100%
rename from eloquent/turtlesim/default.nix
rename to distros/eloquent/turtlesim/default.nix
diff --git a/eloquent/uncrustify-vendor/default.nix b/distros/eloquent/uncrustify-vendor/default.nix
similarity index 100%
rename from eloquent/uncrustify-vendor/default.nix
rename to distros/eloquent/uncrustify-vendor/default.nix
diff --git a/eloquent/unique-identifier-msgs/default.nix b/distros/eloquent/unique-identifier-msgs/default.nix
similarity index 100%
rename from eloquent/unique-identifier-msgs/default.nix
rename to distros/eloquent/unique-identifier-msgs/default.nix
diff --git a/eloquent/urdf/default.nix b/distros/eloquent/urdf/default.nix
similarity index 100%
rename from eloquent/urdf/default.nix
rename to distros/eloquent/urdf/default.nix
diff --git a/eloquent/urdfdom-headers/default.nix b/distros/eloquent/urdfdom-headers/default.nix
similarity index 100%
rename from eloquent/urdfdom-headers/default.nix
rename to distros/eloquent/urdfdom-headers/default.nix
diff --git a/eloquent/urdfdom/default.nix b/distros/eloquent/urdfdom/default.nix
similarity index 100%
rename from eloquent/urdfdom/default.nix
rename to distros/eloquent/urdfdom/default.nix
diff --git a/eloquent/v4l2-camera/default.nix b/distros/eloquent/v4l2-camera/default.nix
similarity index 100%
rename from eloquent/v4l2-camera/default.nix
rename to distros/eloquent/v4l2-camera/default.nix
diff --git a/eloquent/vision-opencv/default.nix b/distros/eloquent/vision-opencv/default.nix
similarity index 100%
rename from eloquent/vision-opencv/default.nix
rename to distros/eloquent/vision-opencv/default.nix
diff --git a/eloquent/visualization-msgs/default.nix b/distros/eloquent/visualization-msgs/default.nix
similarity index 100%
rename from eloquent/visualization-msgs/default.nix
rename to distros/eloquent/visualization-msgs/default.nix
diff --git a/eloquent/xacro/default.nix b/distros/eloquent/xacro/default.nix
similarity index 100%
rename from eloquent/xacro/default.nix
rename to distros/eloquent/xacro/default.nix
diff --git a/eloquent/yaml-cpp-vendor/default.nix b/distros/eloquent/yaml-cpp-vendor/default.nix
similarity index 100%
rename from eloquent/yaml-cpp-vendor/default.nix
rename to distros/eloquent/yaml-cpp-vendor/default.nix
diff --git a/gazebo-ros-setup-hook.sh b/distros/gazebo-ros-setup-hook.sh
similarity index 100%
rename from gazebo-ros-setup-hook.sh
rename to distros/gazebo-ros-setup-hook.sh
diff --git a/kinetic/abb-driver/default.nix b/distros/kinetic/abb-driver/default.nix
similarity index 100%
rename from kinetic/abb-driver/default.nix
rename to distros/kinetic/abb-driver/default.nix
diff --git a/kinetic/abb-irb2400-moveit-config/default.nix b/distros/kinetic/abb-irb2400-moveit-config/default.nix
similarity index 100%
rename from kinetic/abb-irb2400-moveit-config/default.nix
rename to distros/kinetic/abb-irb2400-moveit-config/default.nix
diff --git a/kinetic/abb-irb2400-moveit-plugins/default.nix b/distros/kinetic/abb-irb2400-moveit-plugins/default.nix
similarity index 100%
rename from kinetic/abb-irb2400-moveit-plugins/default.nix
rename to distros/kinetic/abb-irb2400-moveit-plugins/default.nix
diff --git a/kinetic/abb-irb2400-support/default.nix b/distros/kinetic/abb-irb2400-support/default.nix
similarity index 100%
rename from kinetic/abb-irb2400-support/default.nix
rename to distros/kinetic/abb-irb2400-support/default.nix
diff --git a/kinetic/abb-irb4400-support/default.nix b/distros/kinetic/abb-irb4400-support/default.nix
similarity index 100%
rename from kinetic/abb-irb4400-support/default.nix
rename to distros/kinetic/abb-irb4400-support/default.nix
diff --git a/kinetic/abb-irb5400-support/default.nix b/distros/kinetic/abb-irb5400-support/default.nix
similarity index 100%
rename from kinetic/abb-irb5400-support/default.nix
rename to distros/kinetic/abb-irb5400-support/default.nix
diff --git a/kinetic/abb-irb6600-support/default.nix b/distros/kinetic/abb-irb6600-support/default.nix
similarity index 100%
rename from kinetic/abb-irb6600-support/default.nix
rename to distros/kinetic/abb-irb6600-support/default.nix
diff --git a/kinetic/abb-irb6640-moveit-config/default.nix b/distros/kinetic/abb-irb6640-moveit-config/default.nix
similarity index 100%
rename from kinetic/abb-irb6640-moveit-config/default.nix
rename to distros/kinetic/abb-irb6640-moveit-config/default.nix
diff --git a/kinetic/abb-irb6640-support/default.nix b/distros/kinetic/abb-irb6640-support/default.nix
similarity index 100%
rename from kinetic/abb-irb6640-support/default.nix
rename to distros/kinetic/abb-irb6640-support/default.nix
diff --git a/kinetic/abb-resources/default.nix b/distros/kinetic/abb-resources/default.nix
similarity index 100%
rename from kinetic/abb-resources/default.nix
rename to distros/kinetic/abb-resources/default.nix
diff --git a/kinetic/abb/default.nix b/distros/kinetic/abb/default.nix
similarity index 100%
rename from kinetic/abb/default.nix
rename to distros/kinetic/abb/default.nix
diff --git a/kinetic/abseil-cpp/default.nix b/distros/kinetic/abseil-cpp/default.nix
similarity index 100%
rename from kinetic/abseil-cpp/default.nix
rename to distros/kinetic/abseil-cpp/default.nix
diff --git a/kinetic/acado/default.nix b/distros/kinetic/acado/default.nix
similarity index 100%
rename from kinetic/acado/default.nix
rename to distros/kinetic/acado/default.nix
diff --git a/kinetic/access-point-control/default.nix b/distros/kinetic/access-point-control/default.nix
similarity index 100%
rename from kinetic/access-point-control/default.nix
rename to distros/kinetic/access-point-control/default.nix
diff --git a/kinetic/ackermann-controller/default.nix b/distros/kinetic/ackermann-controller/default.nix
similarity index 100%
rename from kinetic/ackermann-controller/default.nix
rename to distros/kinetic/ackermann-controller/default.nix
diff --git a/kinetic/ackermann-msgs/default.nix b/distros/kinetic/ackermann-msgs/default.nix
similarity index 100%
rename from kinetic/ackermann-msgs/default.nix
rename to distros/kinetic/ackermann-msgs/default.nix
diff --git a/kinetic/ackermann-steering-controller/default.nix b/distros/kinetic/ackermann-steering-controller/default.nix
similarity index 100%
rename from kinetic/ackermann-steering-controller/default.nix
rename to distros/kinetic/ackermann-steering-controller/default.nix
diff --git a/kinetic/actionlib-enhanced/default.nix b/distros/kinetic/actionlib-enhanced/default.nix
similarity index 100%
rename from kinetic/actionlib-enhanced/default.nix
rename to distros/kinetic/actionlib-enhanced/default.nix
diff --git a/kinetic/actionlib-lisp/default.nix b/distros/kinetic/actionlib-lisp/default.nix
similarity index 100%
rename from kinetic/actionlib-lisp/default.nix
rename to distros/kinetic/actionlib-lisp/default.nix
diff --git a/kinetic/actionlib-msgs/default.nix b/distros/kinetic/actionlib-msgs/default.nix
similarity index 100%
rename from kinetic/actionlib-msgs/default.nix
rename to distros/kinetic/actionlib-msgs/default.nix
diff --git a/kinetic/actionlib-tutorials/default.nix b/distros/kinetic/actionlib-tutorials/default.nix
similarity index 100%
rename from kinetic/actionlib-tutorials/default.nix
rename to distros/kinetic/actionlib-tutorials/default.nix
diff --git a/kinetic/actionlib/default.nix b/distros/kinetic/actionlib/default.nix
similarity index 100%
rename from kinetic/actionlib/default.nix
rename to distros/kinetic/actionlib/default.nix
diff --git a/kinetic/addwa-local-planner/default.nix b/distros/kinetic/addwa-local-planner/default.nix
similarity index 100%
rename from kinetic/addwa-local-planner/default.nix
rename to distros/kinetic/addwa-local-planner/default.nix
diff --git a/kinetic/adi-driver/default.nix b/distros/kinetic/adi-driver/default.nix
similarity index 100%
rename from kinetic/adi-driver/default.nix
rename to distros/kinetic/adi-driver/default.nix
diff --git a/kinetic/agni-tf-tools/default.nix b/distros/kinetic/agni-tf-tools/default.nix
similarity index 100%
rename from kinetic/agni-tf-tools/default.nix
rename to distros/kinetic/agni-tf-tools/default.nix
diff --git a/kinetic/agvs-common/default.nix b/distros/kinetic/agvs-common/default.nix
similarity index 100%
rename from kinetic/agvs-common/default.nix
rename to distros/kinetic/agvs-common/default.nix
diff --git a/kinetic/agvs-control/default.nix b/distros/kinetic/agvs-control/default.nix
similarity index 100%
rename from kinetic/agvs-control/default.nix
rename to distros/kinetic/agvs-control/default.nix
diff --git a/kinetic/agvs-description/default.nix b/distros/kinetic/agvs-description/default.nix
similarity index 100%
rename from kinetic/agvs-description/default.nix
rename to distros/kinetic/agvs-description/default.nix
diff --git a/kinetic/agvs-gazebo/default.nix b/distros/kinetic/agvs-gazebo/default.nix
similarity index 100%
rename from kinetic/agvs-gazebo/default.nix
rename to distros/kinetic/agvs-gazebo/default.nix
diff --git a/kinetic/agvs-pad/default.nix b/distros/kinetic/agvs-pad/default.nix
similarity index 100%
rename from kinetic/agvs-pad/default.nix
rename to distros/kinetic/agvs-pad/default.nix
diff --git a/kinetic/agvs-robot-control/default.nix b/distros/kinetic/agvs-robot-control/default.nix
similarity index 100%
rename from kinetic/agvs-robot-control/default.nix
rename to distros/kinetic/agvs-robot-control/default.nix
diff --git a/kinetic/agvs-sim-bringup/default.nix b/distros/kinetic/agvs-sim-bringup/default.nix
similarity index 100%
rename from kinetic/agvs-sim-bringup/default.nix
rename to distros/kinetic/agvs-sim-bringup/default.nix
diff --git a/kinetic/agvs-sim/default.nix b/distros/kinetic/agvs-sim/default.nix
similarity index 100%
rename from kinetic/agvs-sim/default.nix
rename to distros/kinetic/agvs-sim/default.nix
diff --git a/kinetic/ainstein-radar-drivers/default.nix b/distros/kinetic/ainstein-radar-drivers/default.nix
similarity index 100%
rename from kinetic/ainstein-radar-drivers/default.nix
rename to distros/kinetic/ainstein-radar-drivers/default.nix
diff --git a/kinetic/ainstein-radar-filters/default.nix b/distros/kinetic/ainstein-radar-filters/default.nix
similarity index 100%
rename from kinetic/ainstein-radar-filters/default.nix
rename to distros/kinetic/ainstein-radar-filters/default.nix
diff --git a/kinetic/ainstein-radar-gazebo-plugins/default.nix b/distros/kinetic/ainstein-radar-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/ainstein-radar-gazebo-plugins/default.nix
rename to distros/kinetic/ainstein-radar-gazebo-plugins/default.nix
diff --git a/kinetic/ainstein-radar-msgs/default.nix b/distros/kinetic/ainstein-radar-msgs/default.nix
similarity index 100%
rename from kinetic/ainstein-radar-msgs/default.nix
rename to distros/kinetic/ainstein-radar-msgs/default.nix
diff --git a/kinetic/ainstein-radar-rviz-plugins/default.nix b/distros/kinetic/ainstein-radar-rviz-plugins/default.nix
similarity index 100%
rename from kinetic/ainstein-radar-rviz-plugins/default.nix
rename to distros/kinetic/ainstein-radar-rviz-plugins/default.nix
diff --git a/kinetic/ainstein-radar-tools/default.nix b/distros/kinetic/ainstein-radar-tools/default.nix
similarity index 100%
rename from kinetic/ainstein-radar-tools/default.nix
rename to distros/kinetic/ainstein-radar-tools/default.nix
diff --git a/kinetic/ainstein-radar/default.nix b/distros/kinetic/ainstein-radar/default.nix
similarity index 100%
rename from kinetic/ainstein-radar/default.nix
rename to distros/kinetic/ainstein-radar/default.nix
diff --git a/kinetic/allocators/default.nix b/distros/kinetic/allocators/default.nix
similarity index 100%
rename from kinetic/allocators/default.nix
rename to distros/kinetic/allocators/default.nix
diff --git a/kinetic/amcl/default.nix b/distros/kinetic/amcl/default.nix
similarity index 100%
rename from kinetic/amcl/default.nix
rename to distros/kinetic/amcl/default.nix
diff --git a/kinetic/angles/default.nix b/distros/kinetic/angles/default.nix
similarity index 100%
rename from kinetic/angles/default.nix
rename to distros/kinetic/angles/default.nix
diff --git a/kinetic/app-manager/default.nix b/distros/kinetic/app-manager/default.nix
similarity index 100%
rename from kinetic/app-manager/default.nix
rename to distros/kinetic/app-manager/default.nix
diff --git a/kinetic/ar-track-alvar-msgs/default.nix b/distros/kinetic/ar-track-alvar-msgs/default.nix
similarity index 100%
rename from kinetic/ar-track-alvar-msgs/default.nix
rename to distros/kinetic/ar-track-alvar-msgs/default.nix
diff --git a/kinetic/ar-track-alvar/default.nix b/distros/kinetic/ar-track-alvar/default.nix
similarity index 100%
rename from kinetic/ar-track-alvar/default.nix
rename to distros/kinetic/ar-track-alvar/default.nix
diff --git a/kinetic/arbotix-controllers/default.nix b/distros/kinetic/arbotix-controllers/default.nix
similarity index 100%
rename from kinetic/arbotix-controllers/default.nix
rename to distros/kinetic/arbotix-controllers/default.nix
diff --git a/kinetic/arbotix-firmware/default.nix b/distros/kinetic/arbotix-firmware/default.nix
similarity index 100%
rename from kinetic/arbotix-firmware/default.nix
rename to distros/kinetic/arbotix-firmware/default.nix
diff --git a/kinetic/arbotix-msgs/default.nix b/distros/kinetic/arbotix-msgs/default.nix
similarity index 100%
rename from kinetic/arbotix-msgs/default.nix
rename to distros/kinetic/arbotix-msgs/default.nix
diff --git a/kinetic/arbotix-python/default.nix b/distros/kinetic/arbotix-python/default.nix
similarity index 100%
rename from kinetic/arbotix-python/default.nix
rename to distros/kinetic/arbotix-python/default.nix
diff --git a/kinetic/arbotix-sensors/default.nix b/distros/kinetic/arbotix-sensors/default.nix
similarity index 100%
rename from kinetic/arbotix-sensors/default.nix
rename to distros/kinetic/arbotix-sensors/default.nix
diff --git a/kinetic/arbotix/default.nix b/distros/kinetic/arbotix/default.nix
similarity index 100%
rename from kinetic/arbotix/default.nix
rename to distros/kinetic/arbotix/default.nix
diff --git a/kinetic/ardrone-autonomy/default.nix b/distros/kinetic/ardrone-autonomy/default.nix
similarity index 100%
rename from kinetic/ardrone-autonomy/default.nix
rename to distros/kinetic/ardrone-autonomy/default.nix
diff --git a/kinetic/arduino-daq/default.nix b/distros/kinetic/arduino-daq/default.nix
similarity index 100%
rename from kinetic/arduino-daq/default.nix
rename to distros/kinetic/arduino-daq/default.nix
diff --git a/kinetic/area-division/default.nix b/distros/kinetic/area-division/default.nix
similarity index 100%
rename from kinetic/area-division/default.nix
rename to distros/kinetic/area-division/default.nix
diff --git a/kinetic/arm-navigation-msgs/default.nix b/distros/kinetic/arm-navigation-msgs/default.nix
similarity index 100%
rename from kinetic/arm-navigation-msgs/default.nix
rename to distros/kinetic/arm-navigation-msgs/default.nix
diff --git a/kinetic/aruco-detect/default.nix b/distros/kinetic/aruco-detect/default.nix
similarity index 100%
rename from kinetic/aruco-detect/default.nix
rename to distros/kinetic/aruco-detect/default.nix
diff --git a/kinetic/aruco-msgs/default.nix b/distros/kinetic/aruco-msgs/default.nix
similarity index 100%
rename from kinetic/aruco-msgs/default.nix
rename to distros/kinetic/aruco-msgs/default.nix
diff --git a/kinetic/aruco-ros/default.nix b/distros/kinetic/aruco-ros/default.nix
similarity index 100%
rename from kinetic/aruco-ros/default.nix
rename to distros/kinetic/aruco-ros/default.nix
diff --git a/kinetic/aruco/default.nix b/distros/kinetic/aruco/default.nix
similarity index 100%
rename from kinetic/aruco/default.nix
rename to distros/kinetic/aruco/default.nix
diff --git a/kinetic/asmach-tutorials/default.nix b/distros/kinetic/asmach-tutorials/default.nix
similarity index 100%
rename from kinetic/asmach-tutorials/default.nix
rename to distros/kinetic/asmach-tutorials/default.nix
diff --git a/kinetic/asmach/default.nix b/distros/kinetic/asmach/default.nix
similarity index 100%
rename from kinetic/asmach/default.nix
rename to distros/kinetic/asmach/default.nix
diff --git a/kinetic/asr-msgs/default.nix b/distros/kinetic/asr-msgs/default.nix
similarity index 100%
rename from kinetic/asr-msgs/default.nix
rename to distros/kinetic/asr-msgs/default.nix
diff --git a/kinetic/assimp-devel/default.nix b/distros/kinetic/assimp-devel/default.nix
similarity index 100%
rename from kinetic/assimp-devel/default.nix
rename to distros/kinetic/assimp-devel/default.nix
diff --git a/kinetic/assisted-teleop/default.nix b/distros/kinetic/assisted-teleop/default.nix
similarity index 100%
rename from kinetic/assisted-teleop/default.nix
rename to distros/kinetic/assisted-teleop/default.nix
diff --git a/kinetic/astra-camera/default.nix b/distros/kinetic/astra-camera/default.nix
similarity index 100%
rename from kinetic/astra-camera/default.nix
rename to distros/kinetic/astra-camera/default.nix
diff --git a/kinetic/astra-launch/default.nix b/distros/kinetic/astra-launch/default.nix
similarity index 100%
rename from kinetic/astra-launch/default.nix
rename to distros/kinetic/astra-launch/default.nix
diff --git a/kinetic/astuff-sensor-msgs/default.nix b/distros/kinetic/astuff-sensor-msgs/default.nix
similarity index 100%
rename from kinetic/astuff-sensor-msgs/default.nix
rename to distros/kinetic/astuff-sensor-msgs/default.nix
diff --git a/kinetic/async-comm/default.nix b/distros/kinetic/async-comm/default.nix
similarity index 100%
rename from kinetic/async-comm/default.nix
rename to distros/kinetic/async-comm/default.nix
diff --git a/kinetic/async-web-server-cpp/default.nix b/distros/kinetic/async-web-server-cpp/default.nix
similarity index 100%
rename from kinetic/async-web-server-cpp/default.nix
rename to distros/kinetic/async-web-server-cpp/default.nix
diff --git a/kinetic/ati-ft-sensor/default.nix b/distros/kinetic/ati-ft-sensor/default.nix
similarity index 100%
rename from kinetic/ati-ft-sensor/default.nix
rename to distros/kinetic/ati-ft-sensor/default.nix
diff --git a/kinetic/audibot-description/default.nix b/distros/kinetic/audibot-description/default.nix
similarity index 100%
rename from kinetic/audibot-description/default.nix
rename to distros/kinetic/audibot-description/default.nix
diff --git a/kinetic/audibot-gazebo/default.nix b/distros/kinetic/audibot-gazebo/default.nix
similarity index 100%
rename from kinetic/audibot-gazebo/default.nix
rename to distros/kinetic/audibot-gazebo/default.nix
diff --git a/kinetic/audibot/default.nix b/distros/kinetic/audibot/default.nix
similarity index 100%
rename from kinetic/audibot/default.nix
rename to distros/kinetic/audibot/default.nix
diff --git a/kinetic/audio-capture/default.nix b/distros/kinetic/audio-capture/default.nix
similarity index 100%
rename from kinetic/audio-capture/default.nix
rename to distros/kinetic/audio-capture/default.nix
diff --git a/kinetic/audio-common-msgs/default.nix b/distros/kinetic/audio-common-msgs/default.nix
similarity index 100%
rename from kinetic/audio-common-msgs/default.nix
rename to distros/kinetic/audio-common-msgs/default.nix
diff --git a/kinetic/audio-common/default.nix b/distros/kinetic/audio-common/default.nix
similarity index 100%
rename from kinetic/audio-common/default.nix
rename to distros/kinetic/audio-common/default.nix
diff --git a/kinetic/audio-play/default.nix b/distros/kinetic/audio-play/default.nix
similarity index 100%
rename from kinetic/audio-play/default.nix
rename to distros/kinetic/audio-play/default.nix
diff --git a/kinetic/automotive-autonomy-msgs/default.nix b/distros/kinetic/automotive-autonomy-msgs/default.nix
similarity index 100%
rename from kinetic/automotive-autonomy-msgs/default.nix
rename to distros/kinetic/automotive-autonomy-msgs/default.nix
diff --git a/kinetic/automotive-navigation-msgs/default.nix b/distros/kinetic/automotive-navigation-msgs/default.nix
similarity index 100%
rename from kinetic/automotive-navigation-msgs/default.nix
rename to distros/kinetic/automotive-navigation-msgs/default.nix
diff --git a/kinetic/automotive-platform-msgs/default.nix b/distros/kinetic/automotive-platform-msgs/default.nix
similarity index 100%
rename from kinetic/automotive-platform-msgs/default.nix
rename to distros/kinetic/automotive-platform-msgs/default.nix
diff --git a/kinetic/auv-msgs/default.nix b/distros/kinetic/auv-msgs/default.nix
similarity index 100%
rename from kinetic/auv-msgs/default.nix
rename to distros/kinetic/auv-msgs/default.nix
diff --git a/kinetic/avt-vimba-camera/default.nix b/distros/kinetic/avt-vimba-camera/default.nix
similarity index 100%
rename from kinetic/avt-vimba-camera/default.nix
rename to distros/kinetic/avt-vimba-camera/default.nix
diff --git a/kinetic/aws-common/default.nix b/distros/kinetic/aws-common/default.nix
similarity index 100%
rename from kinetic/aws-common/default.nix
rename to distros/kinetic/aws-common/default.nix
diff --git a/kinetic/aws-ros1-common/default.nix b/distros/kinetic/aws-ros1-common/default.nix
similarity index 100%
rename from kinetic/aws-ros1-common/default.nix
rename to distros/kinetic/aws-ros1-common/default.nix
diff --git a/kinetic/axcli/default.nix b/distros/kinetic/axcli/default.nix
similarity index 100%
rename from kinetic/axcli/default.nix
rename to distros/kinetic/axcli/default.nix
diff --git a/kinetic/axis-camera/default.nix b/distros/kinetic/axis-camera/default.nix
similarity index 100%
rename from kinetic/axis-camera/default.nix
rename to distros/kinetic/axis-camera/default.nix
diff --git a/kinetic/backward-ros/default.nix b/distros/kinetic/backward-ros/default.nix
similarity index 100%
rename from kinetic/backward-ros/default.nix
rename to distros/kinetic/backward-ros/default.nix
diff --git a/kinetic/bagger/default.nix b/distros/kinetic/bagger/default.nix
similarity index 100%
rename from kinetic/bagger/default.nix
rename to distros/kinetic/bagger/default.nix
diff --git a/kinetic/baldor/default.nix b/distros/kinetic/baldor/default.nix
similarity index 100%
rename from kinetic/baldor/default.nix
rename to distros/kinetic/baldor/default.nix
diff --git a/kinetic/barrett-hand-common/default.nix b/distros/kinetic/barrett-hand-common/default.nix
similarity index 100%
rename from kinetic/barrett-hand-common/default.nix
rename to distros/kinetic/barrett-hand-common/default.nix
diff --git a/kinetic/barrett-hand-control/default.nix b/distros/kinetic/barrett-hand-control/default.nix
similarity index 100%
rename from kinetic/barrett-hand-control/default.nix
rename to distros/kinetic/barrett-hand-control/default.nix
diff --git a/kinetic/barrett-hand-description/default.nix b/distros/kinetic/barrett-hand-description/default.nix
similarity index 100%
rename from kinetic/barrett-hand-description/default.nix
rename to distros/kinetic/barrett-hand-description/default.nix
diff --git a/kinetic/barrett-hand-gazebo/default.nix b/distros/kinetic/barrett-hand-gazebo/default.nix
similarity index 100%
rename from kinetic/barrett-hand-gazebo/default.nix
rename to distros/kinetic/barrett-hand-gazebo/default.nix
diff --git a/kinetic/barrett-hand-sim/default.nix b/distros/kinetic/barrett-hand-sim/default.nix
similarity index 100%
rename from kinetic/barrett-hand-sim/default.nix
rename to distros/kinetic/barrett-hand-sim/default.nix
diff --git a/kinetic/barrett-hand/default.nix b/distros/kinetic/barrett-hand/default.nix
similarity index 100%
rename from kinetic/barrett-hand/default.nix
rename to distros/kinetic/barrett-hand/default.nix
diff --git a/kinetic/base-local-planner/default.nix b/distros/kinetic/base-local-planner/default.nix
similarity index 100%
rename from kinetic/base-local-planner/default.nix
rename to distros/kinetic/base-local-planner/default.nix
diff --git a/kinetic/bayesian-belief-networks/default.nix b/distros/kinetic/bayesian-belief-networks/default.nix
similarity index 100%
rename from kinetic/bayesian-belief-networks/default.nix
rename to distros/kinetic/bayesian-belief-networks/default.nix
diff --git a/kinetic/bcap-core/default.nix b/distros/kinetic/bcap-core/default.nix
similarity index 100%
rename from kinetic/bcap-core/default.nix
rename to distros/kinetic/bcap-core/default.nix
diff --git a/kinetic/bcap-service-test/default.nix b/distros/kinetic/bcap-service-test/default.nix
similarity index 100%
rename from kinetic/bcap-service-test/default.nix
rename to distros/kinetic/bcap-service-test/default.nix
diff --git a/kinetic/bcap-service/default.nix b/distros/kinetic/bcap-service/default.nix
similarity index 100%
rename from kinetic/bcap-service/default.nix
rename to distros/kinetic/bcap-service/default.nix
diff --git a/kinetic/bcap/default.nix b/distros/kinetic/bcap/default.nix
similarity index 100%
rename from kinetic/bcap/default.nix
rename to distros/kinetic/bcap/default.nix
diff --git a/kinetic/behaviortree-cpp-v3/default.nix b/distros/kinetic/behaviortree-cpp-v3/default.nix
similarity index 100%
rename from kinetic/behaviortree-cpp-v3/default.nix
rename to distros/kinetic/behaviortree-cpp-v3/default.nix
diff --git a/kinetic/behaviortree-cpp/default.nix b/distros/kinetic/behaviortree-cpp/default.nix
similarity index 100%
rename from kinetic/behaviortree-cpp/default.nix
rename to distros/kinetic/behaviortree-cpp/default.nix
diff --git a/kinetic/bfl/default.nix b/distros/kinetic/bfl/default.nix
similarity index 100%
rename from kinetic/bfl/default.nix
rename to distros/kinetic/bfl/default.nix
diff --git a/kinetic/bhand-controller/default.nix b/distros/kinetic/bhand-controller/default.nix
similarity index 100%
rename from kinetic/bhand-controller/default.nix
rename to distros/kinetic/bhand-controller/default.nix
diff --git a/kinetic/bin-pose-emulator/default.nix b/distros/kinetic/bin-pose-emulator/default.nix
similarity index 100%
rename from kinetic/bin-pose-emulator/default.nix
rename to distros/kinetic/bin-pose-emulator/default.nix
diff --git a/kinetic/bin-pose-msgs/default.nix b/distros/kinetic/bin-pose-msgs/default.nix
similarity index 100%
rename from kinetic/bin-pose-msgs/default.nix
rename to distros/kinetic/bin-pose-msgs/default.nix
diff --git a/kinetic/binpicking-simple-utils/default.nix b/distros/kinetic/binpicking-simple-utils/default.nix
similarity index 100%
rename from kinetic/binpicking-simple-utils/default.nix
rename to distros/kinetic/binpicking-simple-utils/default.nix
diff --git a/kinetic/binpicking-utils/default.nix b/distros/kinetic/binpicking-utils/default.nix
similarity index 100%
rename from kinetic/binpicking-utils/default.nix
rename to distros/kinetic/binpicking-utils/default.nix
diff --git a/kinetic/blender-gazebo/default.nix b/distros/kinetic/blender-gazebo/default.nix
similarity index 100%
rename from kinetic/blender-gazebo/default.nix
rename to distros/kinetic/blender-gazebo/default.nix
diff --git a/kinetic/bond-core/default.nix b/distros/kinetic/bond-core/default.nix
similarity index 100%
rename from kinetic/bond-core/default.nix
rename to distros/kinetic/bond-core/default.nix
diff --git a/kinetic/bond/default.nix b/distros/kinetic/bond/default.nix
similarity index 100%
rename from kinetic/bond/default.nix
rename to distros/kinetic/bond/default.nix
diff --git a/kinetic/bondcpp/default.nix b/distros/kinetic/bondcpp/default.nix
similarity index 100%
rename from kinetic/bondcpp/default.nix
rename to distros/kinetic/bondcpp/default.nix
diff --git a/kinetic/bondpy/default.nix b/distros/kinetic/bondpy/default.nix
similarity index 100%
rename from kinetic/bondpy/default.nix
rename to distros/kinetic/bondpy/default.nix
diff --git a/kinetic/brics-actuator/default.nix b/distros/kinetic/brics-actuator/default.nix
similarity index 100%
rename from kinetic/brics-actuator/default.nix
rename to distros/kinetic/brics-actuator/default.nix
diff --git a/kinetic/calibration-estimation/default.nix b/distros/kinetic/calibration-estimation/default.nix
similarity index 100%
rename from kinetic/calibration-estimation/default.nix
rename to distros/kinetic/calibration-estimation/default.nix
diff --git a/kinetic/calibration-launch/default.nix b/distros/kinetic/calibration-launch/default.nix
similarity index 100%
rename from kinetic/calibration-launch/default.nix
rename to distros/kinetic/calibration-launch/default.nix
diff --git a/kinetic/calibration-msgs/default.nix b/distros/kinetic/calibration-msgs/default.nix
similarity index 100%
rename from kinetic/calibration-msgs/default.nix
rename to distros/kinetic/calibration-msgs/default.nix
diff --git a/kinetic/calibration-setup-helper/default.nix b/distros/kinetic/calibration-setup-helper/default.nix
similarity index 100%
rename from kinetic/calibration-setup-helper/default.nix
rename to distros/kinetic/calibration-setup-helper/default.nix
diff --git a/kinetic/calibration/default.nix b/distros/kinetic/calibration/default.nix
similarity index 100%
rename from kinetic/calibration/default.nix
rename to distros/kinetic/calibration/default.nix
diff --git a/kinetic/camera-calibration-parsers/default.nix b/distros/kinetic/camera-calibration-parsers/default.nix
similarity index 100%
rename from kinetic/camera-calibration-parsers/default.nix
rename to distros/kinetic/camera-calibration-parsers/default.nix
diff --git a/kinetic/camera-calibration/default.nix b/distros/kinetic/camera-calibration/default.nix
similarity index 100%
rename from kinetic/camera-calibration/default.nix
rename to distros/kinetic/camera-calibration/default.nix
diff --git a/kinetic/camera-info-manager-py/default.nix b/distros/kinetic/camera-info-manager-py/default.nix
similarity index 100%
rename from kinetic/camera-info-manager-py/default.nix
rename to distros/kinetic/camera-info-manager-py/default.nix
diff --git a/kinetic/camera-info-manager/default.nix b/distros/kinetic/camera-info-manager/default.nix
similarity index 100%
rename from kinetic/camera-info-manager/default.nix
rename to distros/kinetic/camera-info-manager/default.nix
diff --git a/kinetic/camera-umd/default.nix b/distros/kinetic/camera-umd/default.nix
similarity index 100%
rename from kinetic/camera-umd/default.nix
rename to distros/kinetic/camera-umd/default.nix
diff --git a/kinetic/camera1394/default.nix b/distros/kinetic/camera1394/default.nix
similarity index 100%
rename from kinetic/camera1394/default.nix
rename to distros/kinetic/camera1394/default.nix
diff --git a/kinetic/can-msgs/default.nix b/distros/kinetic/can-msgs/default.nix
similarity index 100%
rename from kinetic/can-msgs/default.nix
rename to distros/kinetic/can-msgs/default.nix
diff --git a/kinetic/canopen-402/default.nix b/distros/kinetic/canopen-402/default.nix
similarity index 100%
rename from kinetic/canopen-402/default.nix
rename to distros/kinetic/canopen-402/default.nix
diff --git a/kinetic/canopen-chain-node/default.nix b/distros/kinetic/canopen-chain-node/default.nix
similarity index 100%
rename from kinetic/canopen-chain-node/default.nix
rename to distros/kinetic/canopen-chain-node/default.nix
diff --git a/kinetic/canopen-master/default.nix b/distros/kinetic/canopen-master/default.nix
similarity index 100%
rename from kinetic/canopen-master/default.nix
rename to distros/kinetic/canopen-master/default.nix
diff --git a/kinetic/canopen-motor-node/default.nix b/distros/kinetic/canopen-motor-node/default.nix
similarity index 100%
rename from kinetic/canopen-motor-node/default.nix
rename to distros/kinetic/canopen-motor-node/default.nix
diff --git a/kinetic/capabilities/default.nix b/distros/kinetic/capabilities/default.nix
similarity index 100%
rename from kinetic/capabilities/default.nix
rename to distros/kinetic/capabilities/default.nix
diff --git a/kinetic/care-o-bot-robot/default.nix b/distros/kinetic/care-o-bot-robot/default.nix
similarity index 100%
rename from kinetic/care-o-bot-robot/default.nix
rename to distros/kinetic/care-o-bot-robot/default.nix
diff --git a/kinetic/care-o-bot-simulation/default.nix b/distros/kinetic/care-o-bot-simulation/default.nix
similarity index 100%
rename from kinetic/care-o-bot-simulation/default.nix
rename to distros/kinetic/care-o-bot-simulation/default.nix
diff --git a/kinetic/care-o-bot/default.nix b/distros/kinetic/care-o-bot/default.nix
similarity index 100%
rename from kinetic/care-o-bot/default.nix
rename to distros/kinetic/care-o-bot/default.nix
diff --git a/kinetic/carrot-planner/default.nix b/distros/kinetic/carrot-planner/default.nix
similarity index 100%
rename from kinetic/carrot-planner/default.nix
rename to distros/kinetic/carrot-planner/default.nix
diff --git a/kinetic/cartesian-msgs/default.nix b/distros/kinetic/cartesian-msgs/default.nix
similarity index 100%
rename from kinetic/cartesian-msgs/default.nix
rename to distros/kinetic/cartesian-msgs/default.nix
diff --git a/kinetic/cartographer-ros-msgs/default.nix b/distros/kinetic/cartographer-ros-msgs/default.nix
similarity index 100%
rename from kinetic/cartographer-ros-msgs/default.nix
rename to distros/kinetic/cartographer-ros-msgs/default.nix
diff --git a/kinetic/cartographer-ros/default.nix b/distros/kinetic/cartographer-ros/default.nix
similarity index 100%
rename from kinetic/cartographer-ros/default.nix
rename to distros/kinetic/cartographer-ros/default.nix
diff --git a/kinetic/cartographer-rviz/default.nix b/distros/kinetic/cartographer-rviz/default.nix
similarity index 100%
rename from kinetic/cartographer-rviz/default.nix
rename to distros/kinetic/cartographer-rviz/default.nix
diff --git a/kinetic/cartographer/default.nix b/distros/kinetic/cartographer/default.nix
similarity index 100%
rename from kinetic/cartographer/default.nix
rename to distros/kinetic/cartographer/default.nix
diff --git a/kinetic/catch-ros/default.nix b/distros/kinetic/catch-ros/default.nix
similarity index 100%
rename from kinetic/catch-ros/default.nix
rename to distros/kinetic/catch-ros/default.nix
diff --git a/kinetic/catkin-pip/default.nix b/distros/kinetic/catkin-pip/default.nix
similarity index 100%
rename from kinetic/catkin-pip/default.nix
rename to distros/kinetic/catkin-pip/default.nix
diff --git a/kinetic/catkin-virtualenv/default.nix b/distros/kinetic/catkin-virtualenv/default.nix
similarity index 100%
rename from kinetic/catkin-virtualenv/default.nix
rename to distros/kinetic/catkin-virtualenv/default.nix
diff --git a/kinetic/catkin/default.nix b/distros/kinetic/catkin/default.nix
similarity index 100%
rename from kinetic/catkin/default.nix
rename to distros/kinetic/catkin/default.nix
diff --git a/kinetic/certifi/default.nix b/distros/kinetic/certifi/default.nix
similarity index 100%
rename from kinetic/certifi/default.nix
rename to distros/kinetic/certifi/default.nix
diff --git a/kinetic/checkerboard-detector/default.nix b/distros/kinetic/checkerboard-detector/default.nix
similarity index 100%
rename from kinetic/checkerboard-detector/default.nix
rename to distros/kinetic/checkerboard-detector/default.nix
diff --git a/kinetic/chomp-motion-planner/default.nix b/distros/kinetic/chomp-motion-planner/default.nix
similarity index 100%
rename from kinetic/chomp-motion-planner/default.nix
rename to distros/kinetic/chomp-motion-planner/default.nix
diff --git a/kinetic/cht10-node/default.nix b/distros/kinetic/cht10-node/default.nix
similarity index 100%
rename from kinetic/cht10-node/default.nix
rename to distros/kinetic/cht10-node/default.nix
diff --git a/kinetic/cis-camera/default.nix b/distros/kinetic/cis-camera/default.nix
similarity index 100%
rename from kinetic/cis-camera/default.nix
rename to distros/kinetic/cis-camera/default.nix
diff --git a/kinetic/cl-tf/default.nix b/distros/kinetic/cl-tf/default.nix
similarity index 100%
rename from kinetic/cl-tf/default.nix
rename to distros/kinetic/cl-tf/default.nix
diff --git a/kinetic/cl-tf2/default.nix b/distros/kinetic/cl-tf2/default.nix
similarity index 100%
rename from kinetic/cl-tf2/default.nix
rename to distros/kinetic/cl-tf2/default.nix
diff --git a/kinetic/cl-transforms-stamped/default.nix b/distros/kinetic/cl-transforms-stamped/default.nix
similarity index 100%
rename from kinetic/cl-transforms-stamped/default.nix
rename to distros/kinetic/cl-transforms-stamped/default.nix
diff --git a/kinetic/cl-transforms/default.nix b/distros/kinetic/cl-transforms/default.nix
similarity index 100%
rename from kinetic/cl-transforms/default.nix
rename to distros/kinetic/cl-transforms/default.nix
diff --git a/kinetic/cl-urdf/default.nix b/distros/kinetic/cl-urdf/default.nix
similarity index 100%
rename from kinetic/cl-urdf/default.nix
rename to distros/kinetic/cl-urdf/default.nix
diff --git a/kinetic/cl-utils/default.nix b/distros/kinetic/cl-utils/default.nix
similarity index 100%
rename from kinetic/cl-utils/default.nix
rename to distros/kinetic/cl-utils/default.nix
diff --git a/kinetic/class-loader/default.nix b/distros/kinetic/class-loader/default.nix
similarity index 100%
rename from kinetic/class-loader/default.nix
rename to distros/kinetic/class-loader/default.nix
diff --git a/kinetic/clear-costmap-recovery/default.nix b/distros/kinetic/clear-costmap-recovery/default.nix
similarity index 100%
rename from kinetic/clear-costmap-recovery/default.nix
rename to distros/kinetic/clear-costmap-recovery/default.nix
diff --git a/kinetic/click/default.nix b/distros/kinetic/click/default.nix
similarity index 100%
rename from kinetic/click/default.nix
rename to distros/kinetic/click/default.nix
diff --git a/kinetic/clock-relay/default.nix b/distros/kinetic/clock-relay/default.nix
similarity index 100%
rename from kinetic/clock-relay/default.nix
rename to distros/kinetic/clock-relay/default.nix
diff --git a/kinetic/cloudwatch-logger/default.nix b/distros/kinetic/cloudwatch-logger/default.nix
similarity index 100%
rename from kinetic/cloudwatch-logger/default.nix
rename to distros/kinetic/cloudwatch-logger/default.nix
diff --git a/kinetic/cloudwatch-logs-common/default.nix b/distros/kinetic/cloudwatch-logs-common/default.nix
similarity index 100%
rename from kinetic/cloudwatch-logs-common/default.nix
rename to distros/kinetic/cloudwatch-logs-common/default.nix
diff --git a/kinetic/cloudwatch-metrics-collector/default.nix b/distros/kinetic/cloudwatch-metrics-collector/default.nix
similarity index 100%
rename from kinetic/cloudwatch-metrics-collector/default.nix
rename to distros/kinetic/cloudwatch-metrics-collector/default.nix
diff --git a/kinetic/cloudwatch-metrics-common/default.nix b/distros/kinetic/cloudwatch-metrics-common/default.nix
similarity index 100%
rename from kinetic/cloudwatch-metrics-common/default.nix
rename to distros/kinetic/cloudwatch-metrics-common/default.nix
diff --git a/kinetic/cm-740-module/default.nix b/distros/kinetic/cm-740-module/default.nix
similarity index 100%
rename from kinetic/cm-740-module/default.nix
rename to distros/kinetic/cm-740-module/default.nix
diff --git a/kinetic/cmake-modules/default.nix b/distros/kinetic/cmake-modules/default.nix
similarity index 100%
rename from kinetic/cmake-modules/default.nix
rename to distros/kinetic/cmake-modules/default.nix
diff --git a/kinetic/cmd-vel-smoother/default.nix b/distros/kinetic/cmd-vel-smoother/default.nix
similarity index 100%
rename from kinetic/cmd-vel-smoother/default.nix
rename to distros/kinetic/cmd-vel-smoother/default.nix
diff --git a/kinetic/cnn-bridge/default.nix b/distros/kinetic/cnn-bridge/default.nix
similarity index 100%
rename from kinetic/cnn-bridge/default.nix
rename to distros/kinetic/cnn-bridge/default.nix
diff --git a/kinetic/cob-3d-mapping-msgs/default.nix b/distros/kinetic/cob-3d-mapping-msgs/default.nix
similarity index 100%
rename from kinetic/cob-3d-mapping-msgs/default.nix
rename to distros/kinetic/cob-3d-mapping-msgs/default.nix
diff --git a/kinetic/cob-actions/default.nix b/distros/kinetic/cob-actions/default.nix
similarity index 100%
rename from kinetic/cob-actions/default.nix
rename to distros/kinetic/cob-actions/default.nix
diff --git a/kinetic/cob-android-msgs/default.nix b/distros/kinetic/cob-android-msgs/default.nix
similarity index 100%
rename from kinetic/cob-android-msgs/default.nix
rename to distros/kinetic/cob-android-msgs/default.nix
diff --git a/kinetic/cob-android-resource-server/default.nix b/distros/kinetic/cob-android-resource-server/default.nix
similarity index 100%
rename from kinetic/cob-android-resource-server/default.nix
rename to distros/kinetic/cob-android-resource-server/default.nix
diff --git a/kinetic/cob-android-script-server/default.nix b/distros/kinetic/cob-android-script-server/default.nix
similarity index 100%
rename from kinetic/cob-android-script-server/default.nix
rename to distros/kinetic/cob-android-script-server/default.nix
diff --git a/kinetic/cob-android-settings/default.nix b/distros/kinetic/cob-android-settings/default.nix
similarity index 100%
rename from kinetic/cob-android-settings/default.nix
rename to distros/kinetic/cob-android-settings/default.nix
diff --git a/kinetic/cob-android/default.nix b/distros/kinetic/cob-android/default.nix
similarity index 100%
rename from kinetic/cob-android/default.nix
rename to distros/kinetic/cob-android/default.nix
diff --git a/kinetic/cob-base-controller-utils/default.nix b/distros/kinetic/cob-base-controller-utils/default.nix
similarity index 100%
rename from kinetic/cob-base-controller-utils/default.nix
rename to distros/kinetic/cob-base-controller-utils/default.nix
diff --git a/kinetic/cob-base-drive-chain/default.nix b/distros/kinetic/cob-base-drive-chain/default.nix
similarity index 100%
rename from kinetic/cob-base-drive-chain/default.nix
rename to distros/kinetic/cob-base-drive-chain/default.nix
diff --git a/kinetic/cob-base-velocity-smoother/default.nix b/distros/kinetic/cob-base-velocity-smoother/default.nix
similarity index 100%
rename from kinetic/cob-base-velocity-smoother/default.nix
rename to distros/kinetic/cob-base-velocity-smoother/default.nix
diff --git a/kinetic/cob-bms-driver/default.nix b/distros/kinetic/cob-bms-driver/default.nix
similarity index 100%
rename from kinetic/cob-bms-driver/default.nix
rename to distros/kinetic/cob-bms-driver/default.nix
diff --git a/kinetic/cob-bringup-sim/default.nix b/distros/kinetic/cob-bringup-sim/default.nix
similarity index 100%
rename from kinetic/cob-bringup-sim/default.nix
rename to distros/kinetic/cob-bringup-sim/default.nix
diff --git a/kinetic/cob-bringup/default.nix b/distros/kinetic/cob-bringup/default.nix
similarity index 100%
rename from kinetic/cob-bringup/default.nix
rename to distros/kinetic/cob-bringup/default.nix
diff --git a/kinetic/cob-calibration-data/default.nix b/distros/kinetic/cob-calibration-data/default.nix
similarity index 100%
rename from kinetic/cob-calibration-data/default.nix
rename to distros/kinetic/cob-calibration-data/default.nix
diff --git a/kinetic/cob-cam3d-throttle/default.nix b/distros/kinetic/cob-cam3d-throttle/default.nix
similarity index 100%
rename from kinetic/cob-cam3d-throttle/default.nix
rename to distros/kinetic/cob-cam3d-throttle/default.nix
diff --git a/kinetic/cob-camera-sensors/default.nix b/distros/kinetic/cob-camera-sensors/default.nix
similarity index 100%
rename from kinetic/cob-camera-sensors/default.nix
rename to distros/kinetic/cob-camera-sensors/default.nix
diff --git a/kinetic/cob-canopen-motor/default.nix b/distros/kinetic/cob-canopen-motor/default.nix
similarity index 100%
rename from kinetic/cob-canopen-motor/default.nix
rename to distros/kinetic/cob-canopen-motor/default.nix
diff --git a/kinetic/cob-cartesian-controller/default.nix b/distros/kinetic/cob-cartesian-controller/default.nix
similarity index 100%
rename from kinetic/cob-cartesian-controller/default.nix
rename to distros/kinetic/cob-cartesian-controller/default.nix
diff --git a/kinetic/cob-collision-monitor/default.nix b/distros/kinetic/cob-collision-monitor/default.nix
similarity index 100%
rename from kinetic/cob-collision-monitor/default.nix
rename to distros/kinetic/cob-collision-monitor/default.nix
diff --git a/kinetic/cob-collision-velocity-filter/default.nix b/distros/kinetic/cob-collision-velocity-filter/default.nix
similarity index 100%
rename from kinetic/cob-collision-velocity-filter/default.nix
rename to distros/kinetic/cob-collision-velocity-filter/default.nix
diff --git a/kinetic/cob-command-gui/default.nix b/distros/kinetic/cob-command-gui/default.nix
similarity index 100%
rename from kinetic/cob-command-gui/default.nix
rename to distros/kinetic/cob-command-gui/default.nix
diff --git a/kinetic/cob-command-tools/default.nix b/distros/kinetic/cob-command-tools/default.nix
similarity index 100%
rename from kinetic/cob-command-tools/default.nix
rename to distros/kinetic/cob-command-tools/default.nix
diff --git a/kinetic/cob-common/default.nix b/distros/kinetic/cob-common/default.nix
similarity index 100%
rename from kinetic/cob-common/default.nix
rename to distros/kinetic/cob-common/default.nix
diff --git a/kinetic/cob-control-mode-adapter/default.nix b/distros/kinetic/cob-control-mode-adapter/default.nix
similarity index 100%
rename from kinetic/cob-control-mode-adapter/default.nix
rename to distros/kinetic/cob-control-mode-adapter/default.nix
diff --git a/kinetic/cob-control-msgs/default.nix b/distros/kinetic/cob-control-msgs/default.nix
similarity index 100%
rename from kinetic/cob-control-msgs/default.nix
rename to distros/kinetic/cob-control-msgs/default.nix
diff --git a/kinetic/cob-control/default.nix b/distros/kinetic/cob-control/default.nix
similarity index 100%
rename from kinetic/cob-control/default.nix
rename to distros/kinetic/cob-control/default.nix
diff --git a/kinetic/cob-dashboard/default.nix b/distros/kinetic/cob-dashboard/default.nix
similarity index 100%
rename from kinetic/cob-dashboard/default.nix
rename to distros/kinetic/cob-dashboard/default.nix
diff --git a/kinetic/cob-default-env-config/default.nix b/distros/kinetic/cob-default-env-config/default.nix
similarity index 100%
rename from kinetic/cob-default-env-config/default.nix
rename to distros/kinetic/cob-default-env-config/default.nix
diff --git a/kinetic/cob-default-robot-behavior/default.nix b/distros/kinetic/cob-default-robot-behavior/default.nix
similarity index 100%
rename from kinetic/cob-default-robot-behavior/default.nix
rename to distros/kinetic/cob-default-robot-behavior/default.nix
diff --git a/kinetic/cob-default-robot-config/default.nix b/distros/kinetic/cob-default-robot-config/default.nix
similarity index 100%
rename from kinetic/cob-default-robot-config/default.nix
rename to distros/kinetic/cob-default-robot-config/default.nix
diff --git a/kinetic/cob-description/default.nix b/distros/kinetic/cob-description/default.nix
similarity index 100%
rename from kinetic/cob-description/default.nix
rename to distros/kinetic/cob-description/default.nix
diff --git a/kinetic/cob-docker-control/default.nix b/distros/kinetic/cob-docker-control/default.nix
similarity index 100%
rename from kinetic/cob-docker-control/default.nix
rename to distros/kinetic/cob-docker-control/default.nix
diff --git a/kinetic/cob-driver/default.nix b/distros/kinetic/cob-driver/default.nix
similarity index 100%
rename from kinetic/cob-driver/default.nix
rename to distros/kinetic/cob-driver/default.nix
diff --git a/kinetic/cob-elmo-homing/default.nix b/distros/kinetic/cob-elmo-homing/default.nix
similarity index 100%
rename from kinetic/cob-elmo-homing/default.nix
rename to distros/kinetic/cob-elmo-homing/default.nix
diff --git a/kinetic/cob-environments/default.nix b/distros/kinetic/cob-environments/default.nix
similarity index 100%
rename from kinetic/cob-environments/default.nix
rename to distros/kinetic/cob-environments/default.nix
diff --git a/kinetic/cob-extern/default.nix b/distros/kinetic/cob-extern/default.nix
similarity index 100%
rename from kinetic/cob-extern/default.nix
rename to distros/kinetic/cob-extern/default.nix
diff --git a/kinetic/cob-footprint-observer/default.nix b/distros/kinetic/cob-footprint-observer/default.nix
similarity index 100%
rename from kinetic/cob-footprint-observer/default.nix
rename to distros/kinetic/cob-footprint-observer/default.nix
diff --git a/kinetic/cob-frame-tracker/default.nix b/distros/kinetic/cob-frame-tracker/default.nix
similarity index 100%
rename from kinetic/cob-frame-tracker/default.nix
rename to distros/kinetic/cob-frame-tracker/default.nix
diff --git a/kinetic/cob-gazebo-objects/default.nix b/distros/kinetic/cob-gazebo-objects/default.nix
similarity index 100%
rename from kinetic/cob-gazebo-objects/default.nix
rename to distros/kinetic/cob-gazebo-objects/default.nix
diff --git a/kinetic/cob-gazebo-plugins/default.nix b/distros/kinetic/cob-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/cob-gazebo-plugins/default.nix
rename to distros/kinetic/cob-gazebo-plugins/default.nix
diff --git a/kinetic/cob-gazebo-ros-control/default.nix b/distros/kinetic/cob-gazebo-ros-control/default.nix
similarity index 100%
rename from kinetic/cob-gazebo-ros-control/default.nix
rename to distros/kinetic/cob-gazebo-ros-control/default.nix
diff --git a/kinetic/cob-gazebo-tools/default.nix b/distros/kinetic/cob-gazebo-tools/default.nix
similarity index 100%
rename from kinetic/cob-gazebo-tools/default.nix
rename to distros/kinetic/cob-gazebo-tools/default.nix
diff --git a/kinetic/cob-gazebo-worlds/default.nix b/distros/kinetic/cob-gazebo-worlds/default.nix
similarity index 100%
rename from kinetic/cob-gazebo-worlds/default.nix
rename to distros/kinetic/cob-gazebo-worlds/default.nix
diff --git a/kinetic/cob-gazebo/default.nix b/distros/kinetic/cob-gazebo/default.nix
similarity index 100%
rename from kinetic/cob-gazebo/default.nix
rename to distros/kinetic/cob-gazebo/default.nix
diff --git a/kinetic/cob-generic-can/default.nix b/distros/kinetic/cob-generic-can/default.nix
similarity index 100%
rename from kinetic/cob-generic-can/default.nix
rename to distros/kinetic/cob-generic-can/default.nix
diff --git a/kinetic/cob-grasp-generation/default.nix b/distros/kinetic/cob-grasp-generation/default.nix
similarity index 100%
rename from kinetic/cob-grasp-generation/default.nix
rename to distros/kinetic/cob-grasp-generation/default.nix
diff --git a/kinetic/cob-hand-bridge/default.nix b/distros/kinetic/cob-hand-bridge/default.nix
similarity index 100%
rename from kinetic/cob-hand-bridge/default.nix
rename to distros/kinetic/cob-hand-bridge/default.nix
diff --git a/kinetic/cob-hand/default.nix b/distros/kinetic/cob-hand/default.nix
similarity index 100%
rename from kinetic/cob-hand/default.nix
rename to distros/kinetic/cob-hand/default.nix
diff --git a/kinetic/cob-hardware-config/default.nix b/distros/kinetic/cob-hardware-config/default.nix
similarity index 100%
rename from kinetic/cob-hardware-config/default.nix
rename to distros/kinetic/cob-hardware-config/default.nix
diff --git a/kinetic/cob-hardware-emulation/default.nix b/distros/kinetic/cob-hardware-emulation/default.nix
similarity index 100%
rename from kinetic/cob-hardware-emulation/default.nix
rename to distros/kinetic/cob-hardware-emulation/default.nix
diff --git a/kinetic/cob-helper-tools/default.nix b/distros/kinetic/cob-helper-tools/default.nix
similarity index 100%
rename from kinetic/cob-helper-tools/default.nix
rename to distros/kinetic/cob-helper-tools/default.nix
diff --git a/kinetic/cob-image-flip/default.nix b/distros/kinetic/cob-image-flip/default.nix
similarity index 100%
rename from kinetic/cob-image-flip/default.nix
rename to distros/kinetic/cob-image-flip/default.nix
diff --git a/kinetic/cob-interactive-teleop/default.nix b/distros/kinetic/cob-interactive-teleop/default.nix
similarity index 100%
rename from kinetic/cob-interactive-teleop/default.nix
rename to distros/kinetic/cob-interactive-teleop/default.nix
diff --git a/kinetic/cob-light/default.nix b/distros/kinetic/cob-light/default.nix
similarity index 100%
rename from kinetic/cob-light/default.nix
rename to distros/kinetic/cob-light/default.nix
diff --git a/kinetic/cob-linear-nav/default.nix b/distros/kinetic/cob-linear-nav/default.nix
similarity index 100%
rename from kinetic/cob-linear-nav/default.nix
rename to distros/kinetic/cob-linear-nav/default.nix
diff --git a/kinetic/cob-lookat-action/default.nix b/distros/kinetic/cob-lookat-action/default.nix
similarity index 100%
rename from kinetic/cob-lookat-action/default.nix
rename to distros/kinetic/cob-lookat-action/default.nix
diff --git a/kinetic/cob-manipulation/default.nix b/distros/kinetic/cob-manipulation/default.nix
similarity index 100%
rename from kinetic/cob-manipulation/default.nix
rename to distros/kinetic/cob-manipulation/default.nix
diff --git a/kinetic/cob-map-accessibility-analysis/default.nix b/distros/kinetic/cob-map-accessibility-analysis/default.nix
similarity index 100%
rename from kinetic/cob-map-accessibility-analysis/default.nix
rename to distros/kinetic/cob-map-accessibility-analysis/default.nix
diff --git a/kinetic/cob-mapping-slam/default.nix b/distros/kinetic/cob-mapping-slam/default.nix
similarity index 100%
rename from kinetic/cob-mapping-slam/default.nix
rename to distros/kinetic/cob-mapping-slam/default.nix
diff --git a/kinetic/cob-mimic/default.nix b/distros/kinetic/cob-mimic/default.nix
similarity index 100%
rename from kinetic/cob-mimic/default.nix
rename to distros/kinetic/cob-mimic/default.nix
diff --git a/kinetic/cob-model-identifier/default.nix b/distros/kinetic/cob-model-identifier/default.nix
similarity index 100%
rename from kinetic/cob-model-identifier/default.nix
rename to distros/kinetic/cob-model-identifier/default.nix
diff --git a/kinetic/cob-monitoring/default.nix b/distros/kinetic/cob-monitoring/default.nix
similarity index 100%
rename from kinetic/cob-monitoring/default.nix
rename to distros/kinetic/cob-monitoring/default.nix
diff --git a/kinetic/cob-moveit-bringup/default.nix b/distros/kinetic/cob-moveit-bringup/default.nix
similarity index 100%
rename from kinetic/cob-moveit-bringup/default.nix
rename to distros/kinetic/cob-moveit-bringup/default.nix
diff --git a/kinetic/cob-moveit-config/default.nix b/distros/kinetic/cob-moveit-config/default.nix
similarity index 100%
rename from kinetic/cob-moveit-config/default.nix
rename to distros/kinetic/cob-moveit-config/default.nix
diff --git a/kinetic/cob-moveit-interface/default.nix b/distros/kinetic/cob-moveit-interface/default.nix
similarity index 100%
rename from kinetic/cob-moveit-interface/default.nix
rename to distros/kinetic/cob-moveit-interface/default.nix
diff --git a/kinetic/cob-msgs/default.nix b/distros/kinetic/cob-msgs/default.nix
similarity index 100%
rename from kinetic/cob-msgs/default.nix
rename to distros/kinetic/cob-msgs/default.nix
diff --git a/kinetic/cob-navigation-config/default.nix b/distros/kinetic/cob-navigation-config/default.nix
similarity index 100%
rename from kinetic/cob-navigation-config/default.nix
rename to distros/kinetic/cob-navigation-config/default.nix
diff --git a/kinetic/cob-navigation-global/default.nix b/distros/kinetic/cob-navigation-global/default.nix
similarity index 100%
rename from kinetic/cob-navigation-global/default.nix
rename to distros/kinetic/cob-navigation-global/default.nix
diff --git a/kinetic/cob-navigation-local/default.nix b/distros/kinetic/cob-navigation-local/default.nix
similarity index 100%
rename from kinetic/cob-navigation-local/default.nix
rename to distros/kinetic/cob-navigation-local/default.nix
diff --git a/kinetic/cob-navigation-slam/default.nix b/distros/kinetic/cob-navigation-slam/default.nix
similarity index 100%
rename from kinetic/cob-navigation-slam/default.nix
rename to distros/kinetic/cob-navigation-slam/default.nix
diff --git a/kinetic/cob-navigation/default.nix b/distros/kinetic/cob-navigation/default.nix
similarity index 100%
rename from kinetic/cob-navigation/default.nix
rename to distros/kinetic/cob-navigation/default.nix
diff --git a/kinetic/cob-object-detection-msgs/default.nix b/distros/kinetic/cob-object-detection-msgs/default.nix
similarity index 100%
rename from kinetic/cob-object-detection-msgs/default.nix
rename to distros/kinetic/cob-object-detection-msgs/default.nix
diff --git a/kinetic/cob-object-detection-visualizer/default.nix b/distros/kinetic/cob-object-detection-visualizer/default.nix
similarity index 100%
rename from kinetic/cob-object-detection-visualizer/default.nix
rename to distros/kinetic/cob-object-detection-visualizer/default.nix
diff --git a/kinetic/cob-omni-drive-controller/default.nix b/distros/kinetic/cob-omni-drive-controller/default.nix
similarity index 100%
rename from kinetic/cob-omni-drive-controller/default.nix
rename to distros/kinetic/cob-omni-drive-controller/default.nix
diff --git a/kinetic/cob-perception-common/default.nix b/distros/kinetic/cob-perception-common/default.nix
similarity index 100%
rename from kinetic/cob-perception-common/default.nix
rename to distros/kinetic/cob-perception-common/default.nix
diff --git a/kinetic/cob-perception-msgs/default.nix b/distros/kinetic/cob-perception-msgs/default.nix
similarity index 100%
rename from kinetic/cob-perception-msgs/default.nix
rename to distros/kinetic/cob-perception-msgs/default.nix
diff --git a/kinetic/cob-phidget-em-state/default.nix b/distros/kinetic/cob-phidget-em-state/default.nix
similarity index 100%
rename from kinetic/cob-phidget-em-state/default.nix
rename to distros/kinetic/cob-phidget-em-state/default.nix
diff --git a/kinetic/cob-phidget-power-state/default.nix b/distros/kinetic/cob-phidget-power-state/default.nix
similarity index 100%
rename from kinetic/cob-phidget-power-state/default.nix
rename to distros/kinetic/cob-phidget-power-state/default.nix
diff --git a/kinetic/cob-phidgets/default.nix b/distros/kinetic/cob-phidgets/default.nix
similarity index 100%
rename from kinetic/cob-phidgets/default.nix
rename to distros/kinetic/cob-phidgets/default.nix
diff --git a/kinetic/cob-pick-place-action/default.nix b/distros/kinetic/cob-pick-place-action/default.nix
similarity index 100%
rename from kinetic/cob-pick-place-action/default.nix
rename to distros/kinetic/cob-pick-place-action/default.nix
diff --git a/kinetic/cob-reflector-referencing/default.nix b/distros/kinetic/cob-reflector-referencing/default.nix
similarity index 100%
rename from kinetic/cob-reflector-referencing/default.nix
rename to distros/kinetic/cob-reflector-referencing/default.nix
diff --git a/kinetic/cob-relayboard/default.nix b/distros/kinetic/cob-relayboard/default.nix
similarity index 100%
rename from kinetic/cob-relayboard/default.nix
rename to distros/kinetic/cob-relayboard/default.nix
diff --git a/kinetic/cob-robots/default.nix b/distros/kinetic/cob-robots/default.nix
similarity index 100%
rename from kinetic/cob-robots/default.nix
rename to distros/kinetic/cob-robots/default.nix
diff --git a/kinetic/cob-safety-controller/default.nix b/distros/kinetic/cob-safety-controller/default.nix
similarity index 100%
rename from kinetic/cob-safety-controller/default.nix
rename to distros/kinetic/cob-safety-controller/default.nix
diff --git a/kinetic/cob-scan-unifier/default.nix b/distros/kinetic/cob-scan-unifier/default.nix
similarity index 100%
rename from kinetic/cob-scan-unifier/default.nix
rename to distros/kinetic/cob-scan-unifier/default.nix
diff --git a/kinetic/cob-script-server/default.nix b/distros/kinetic/cob-script-server/default.nix
similarity index 100%
rename from kinetic/cob-script-server/default.nix
rename to distros/kinetic/cob-script-server/default.nix
diff --git a/kinetic/cob-sick-lms1xx/default.nix b/distros/kinetic/cob-sick-lms1xx/default.nix
similarity index 100%
rename from kinetic/cob-sick-lms1xx/default.nix
rename to distros/kinetic/cob-sick-lms1xx/default.nix
diff --git a/kinetic/cob-sick-s300/default.nix b/distros/kinetic/cob-sick-s300/default.nix
similarity index 100%
rename from kinetic/cob-sick-s300/default.nix
rename to distros/kinetic/cob-sick-s300/default.nix
diff --git a/kinetic/cob-simulation/default.nix b/distros/kinetic/cob-simulation/default.nix
similarity index 100%
rename from kinetic/cob-simulation/default.nix
rename to distros/kinetic/cob-simulation/default.nix
diff --git a/kinetic/cob-sound/default.nix b/distros/kinetic/cob-sound/default.nix
similarity index 100%
rename from kinetic/cob-sound/default.nix
rename to distros/kinetic/cob-sound/default.nix
diff --git a/kinetic/cob-srvs/default.nix b/distros/kinetic/cob-srvs/default.nix
similarity index 100%
rename from kinetic/cob-srvs/default.nix
rename to distros/kinetic/cob-srvs/default.nix
diff --git a/kinetic/cob-substitute/default.nix b/distros/kinetic/cob-substitute/default.nix
similarity index 100%
rename from kinetic/cob-substitute/default.nix
rename to distros/kinetic/cob-substitute/default.nix
diff --git a/kinetic/cob-supported-robots/default.nix b/distros/kinetic/cob-supported-robots/default.nix
similarity index 100%
rename from kinetic/cob-supported-robots/default.nix
rename to distros/kinetic/cob-supported-robots/default.nix
diff --git a/kinetic/cob-teleop/default.nix b/distros/kinetic/cob-teleop/default.nix
similarity index 100%
rename from kinetic/cob-teleop/default.nix
rename to distros/kinetic/cob-teleop/default.nix
diff --git a/kinetic/cob-trajectory-controller/default.nix b/distros/kinetic/cob-trajectory-controller/default.nix
similarity index 100%
rename from kinetic/cob-trajectory-controller/default.nix
rename to distros/kinetic/cob-trajectory-controller/default.nix
diff --git a/kinetic/cob-tricycle-controller/default.nix b/distros/kinetic/cob-tricycle-controller/default.nix
similarity index 100%
rename from kinetic/cob-tricycle-controller/default.nix
rename to distros/kinetic/cob-tricycle-controller/default.nix
diff --git a/kinetic/cob-twist-controller/default.nix b/distros/kinetic/cob-twist-controller/default.nix
similarity index 100%
rename from kinetic/cob-twist-controller/default.nix
rename to distros/kinetic/cob-twist-controller/default.nix
diff --git a/kinetic/cob-undercarriage-ctrl/default.nix b/distros/kinetic/cob-undercarriage-ctrl/default.nix
similarity index 100%
rename from kinetic/cob-undercarriage-ctrl/default.nix
rename to distros/kinetic/cob-undercarriage-ctrl/default.nix
diff --git a/kinetic/cob-utilities/default.nix b/distros/kinetic/cob-utilities/default.nix
similarity index 100%
rename from kinetic/cob-utilities/default.nix
rename to distros/kinetic/cob-utilities/default.nix
diff --git a/kinetic/cob-vision-utils/default.nix b/distros/kinetic/cob-vision-utils/default.nix
similarity index 100%
rename from kinetic/cob-vision-utils/default.nix
rename to distros/kinetic/cob-vision-utils/default.nix
diff --git a/kinetic/cob-voltage-control/default.nix b/distros/kinetic/cob-voltage-control/default.nix
similarity index 100%
rename from kinetic/cob-voltage-control/default.nix
rename to distros/kinetic/cob-voltage-control/default.nix
diff --git a/kinetic/code-coverage/default.nix b/distros/kinetic/code-coverage/default.nix
similarity index 100%
rename from kinetic/code-coverage/default.nix
rename to distros/kinetic/code-coverage/default.nix
diff --git a/kinetic/codec-image-transport/default.nix b/distros/kinetic/codec-image-transport/default.nix
similarity index 100%
rename from kinetic/codec-image-transport/default.nix
rename to distros/kinetic/codec-image-transport/default.nix
diff --git a/kinetic/cog-publisher/default.nix b/distros/kinetic/cog-publisher/default.nix
similarity index 100%
rename from kinetic/cog-publisher/default.nix
rename to distros/kinetic/cog-publisher/default.nix
diff --git a/kinetic/collada-robots/default.nix b/distros/kinetic/collada-robots/default.nix
similarity index 100%
rename from kinetic/collada-robots/default.nix
rename to distros/kinetic/collada-robots/default.nix
diff --git a/kinetic/combined-robot-hw-tests/default.nix b/distros/kinetic/combined-robot-hw-tests/default.nix
similarity index 100%
rename from kinetic/combined-robot-hw-tests/default.nix
rename to distros/kinetic/combined-robot-hw-tests/default.nix
diff --git a/kinetic/combined-robot-hw/default.nix b/distros/kinetic/combined-robot-hw/default.nix
similarity index 100%
rename from kinetic/combined-robot-hw/default.nix
rename to distros/kinetic/combined-robot-hw/default.nix
diff --git a/kinetic/common-msgs/default.nix b/distros/kinetic/common-msgs/default.nix
similarity index 100%
rename from kinetic/common-msgs/default.nix
rename to distros/kinetic/common-msgs/default.nix
diff --git a/kinetic/common-tutorials/default.nix b/distros/kinetic/common-tutorials/default.nix
similarity index 100%
rename from kinetic/common-tutorials/default.nix
rename to distros/kinetic/common-tutorials/default.nix
diff --git a/kinetic/compressed-depth-image-transport/default.nix b/distros/kinetic/compressed-depth-image-transport/default.nix
similarity index 100%
rename from kinetic/compressed-depth-image-transport/default.nix
rename to distros/kinetic/compressed-depth-image-transport/default.nix
diff --git a/kinetic/compressed-image-transport/default.nix b/distros/kinetic/compressed-image-transport/default.nix
similarity index 100%
rename from kinetic/compressed-image-transport/default.nix
rename to distros/kinetic/compressed-image-transport/default.nix
diff --git a/kinetic/concert-msgs/default.nix b/distros/kinetic/concert-msgs/default.nix
similarity index 100%
rename from kinetic/concert-msgs/default.nix
rename to distros/kinetic/concert-msgs/default.nix
diff --git a/kinetic/concert-service-msgs/default.nix b/distros/kinetic/concert-service-msgs/default.nix
similarity index 100%
rename from kinetic/concert-service-msgs/default.nix
rename to distros/kinetic/concert-service-msgs/default.nix
diff --git a/kinetic/concert-workflow-engine-msgs/default.nix b/distros/kinetic/concert-workflow-engine-msgs/default.nix
similarity index 100%
rename from kinetic/concert-workflow-engine-msgs/default.nix
rename to distros/kinetic/concert-workflow-engine-msgs/default.nix
diff --git a/kinetic/contact-states-observer/default.nix b/distros/kinetic/contact-states-observer/default.nix
similarity index 100%
rename from kinetic/contact-states-observer/default.nix
rename to distros/kinetic/contact-states-observer/default.nix
diff --git a/kinetic/control-msgs/default.nix b/distros/kinetic/control-msgs/default.nix
similarity index 100%
rename from kinetic/control-msgs/default.nix
rename to distros/kinetic/control-msgs/default.nix
diff --git a/kinetic/control-toolbox/default.nix b/distros/kinetic/control-toolbox/default.nix
similarity index 100%
rename from kinetic/control-toolbox/default.nix
rename to distros/kinetic/control-toolbox/default.nix
diff --git a/kinetic/controller-interface/default.nix b/distros/kinetic/controller-interface/default.nix
similarity index 100%
rename from kinetic/controller-interface/default.nix
rename to distros/kinetic/controller-interface/default.nix
diff --git a/kinetic/controller-manager-msgs/default.nix b/distros/kinetic/controller-manager-msgs/default.nix
similarity index 100%
rename from kinetic/controller-manager-msgs/default.nix
rename to distros/kinetic/controller-manager-msgs/default.nix
diff --git a/kinetic/controller-manager-tests/default.nix b/distros/kinetic/controller-manager-tests/default.nix
similarity index 100%
rename from kinetic/controller-manager-tests/default.nix
rename to distros/kinetic/controller-manager-tests/default.nix
diff --git a/kinetic/controller-manager/default.nix b/distros/kinetic/controller-manager/default.nix
similarity index 100%
rename from kinetic/controller-manager/default.nix
rename to distros/kinetic/controller-manager/default.nix
diff --git a/kinetic/convex-decomposition/default.nix b/distros/kinetic/convex-decomposition/default.nix
similarity index 100%
rename from kinetic/convex-decomposition/default.nix
rename to distros/kinetic/convex-decomposition/default.nix
diff --git a/kinetic/cost-map-core/default.nix b/distros/kinetic/cost-map-core/default.nix
similarity index 100%
rename from kinetic/cost-map-core/default.nix
rename to distros/kinetic/cost-map-core/default.nix
diff --git a/kinetic/cost-map-cv/default.nix b/distros/kinetic/cost-map-cv/default.nix
similarity index 100%
rename from kinetic/cost-map-cv/default.nix
rename to distros/kinetic/cost-map-cv/default.nix
diff --git a/kinetic/cost-map-demos/default.nix b/distros/kinetic/cost-map-demos/default.nix
similarity index 100%
rename from kinetic/cost-map-demos/default.nix
rename to distros/kinetic/cost-map-demos/default.nix
diff --git a/kinetic/cost-map-msgs/default.nix b/distros/kinetic/cost-map-msgs/default.nix
similarity index 100%
rename from kinetic/cost-map-msgs/default.nix
rename to distros/kinetic/cost-map-msgs/default.nix
diff --git a/kinetic/cost-map-ros/default.nix b/distros/kinetic/cost-map-ros/default.nix
similarity index 100%
rename from kinetic/cost-map-ros/default.nix
rename to distros/kinetic/cost-map-ros/default.nix
diff --git a/kinetic/cost-map-visualisations/default.nix b/distros/kinetic/cost-map-visualisations/default.nix
similarity index 100%
rename from kinetic/cost-map-visualisations/default.nix
rename to distros/kinetic/cost-map-visualisations/default.nix
diff --git a/kinetic/cost-map/default.nix b/distros/kinetic/cost-map/default.nix
similarity index 100%
rename from kinetic/cost-map/default.nix
rename to distros/kinetic/cost-map/default.nix
diff --git a/kinetic/costmap-2d/default.nix b/distros/kinetic/costmap-2d/default.nix
similarity index 100%
rename from kinetic/costmap-2d/default.nix
rename to distros/kinetic/costmap-2d/default.nix
diff --git a/kinetic/costmap-converter/default.nix b/distros/kinetic/costmap-converter/default.nix
similarity index 100%
rename from kinetic/costmap-converter/default.nix
rename to distros/kinetic/costmap-converter/default.nix
diff --git a/kinetic/costmap-cspace-msgs/default.nix b/distros/kinetic/costmap-cspace-msgs/default.nix
similarity index 100%
rename from kinetic/costmap-cspace-msgs/default.nix
rename to distros/kinetic/costmap-cspace-msgs/default.nix
diff --git a/kinetic/costmap-cspace/default.nix b/distros/kinetic/costmap-cspace/default.nix
similarity index 100%
rename from kinetic/costmap-cspace/default.nix
rename to distros/kinetic/costmap-cspace/default.nix
diff --git a/kinetic/costmap-prohibition-layer/default.nix b/distros/kinetic/costmap-prohibition-layer/default.nix
similarity index 100%
rename from kinetic/costmap-prohibition-layer/default.nix
rename to distros/kinetic/costmap-prohibition-layer/default.nix
diff --git a/kinetic/costmap-queue/default.nix b/distros/kinetic/costmap-queue/default.nix
similarity index 100%
rename from kinetic/costmap-queue/default.nix
rename to distros/kinetic/costmap-queue/default.nix
diff --git a/kinetic/coverage-path/default.nix b/distros/kinetic/coverage-path/default.nix
similarity index 100%
rename from kinetic/coverage-path/default.nix
rename to distros/kinetic/coverage-path/default.nix
diff --git a/kinetic/cpp-common/default.nix b/distros/kinetic/cpp-common/default.nix
similarity index 100%
rename from kinetic/cpp-common/default.nix
rename to distros/kinetic/cpp-common/default.nix
diff --git a/kinetic/cpr-multimaster-tools/default.nix b/distros/kinetic/cpr-multimaster-tools/default.nix
similarity index 100%
rename from kinetic/cpr-multimaster-tools/default.nix
rename to distros/kinetic/cpr-multimaster-tools/default.nix
diff --git a/kinetic/cpswarm-msgs/default.nix b/distros/kinetic/cpswarm-msgs/default.nix
similarity index 100%
rename from kinetic/cpswarm-msgs/default.nix
rename to distros/kinetic/cpswarm-msgs/default.nix
diff --git a/kinetic/create-dashboard/default.nix b/distros/kinetic/create-dashboard/default.nix
similarity index 100%
rename from kinetic/create-dashboard/default.nix
rename to distros/kinetic/create-dashboard/default.nix
diff --git a/kinetic/create-description/default.nix b/distros/kinetic/create-description/default.nix
similarity index 100%
rename from kinetic/create-description/default.nix
rename to distros/kinetic/create-description/default.nix
diff --git a/kinetic/create-driver/default.nix b/distros/kinetic/create-driver/default.nix
similarity index 100%
rename from kinetic/create-driver/default.nix
rename to distros/kinetic/create-driver/default.nix
diff --git a/kinetic/create-node/default.nix b/distros/kinetic/create-node/default.nix
similarity index 100%
rename from kinetic/create-node/default.nix
rename to distros/kinetic/create-node/default.nix
diff --git a/kinetic/criutils/default.nix b/distros/kinetic/criutils/default.nix
similarity index 100%
rename from kinetic/criutils/default.nix
rename to distros/kinetic/criutils/default.nix
diff --git a/kinetic/csm/default.nix b/distros/kinetic/csm/default.nix
similarity index 100%
rename from kinetic/csm/default.nix
rename to distros/kinetic/csm/default.nix
diff --git a/kinetic/cv-bridge/default.nix b/distros/kinetic/cv-bridge/default.nix
similarity index 100%
rename from kinetic/cv-bridge/default.nix
rename to distros/kinetic/cv-bridge/default.nix
diff --git a/kinetic/cv-camera/default.nix b/distros/kinetic/cv-camera/default.nix
similarity index 100%
rename from kinetic/cv-camera/default.nix
rename to distros/kinetic/cv-camera/default.nix
diff --git a/kinetic/darknet-ros-msgs/default.nix b/distros/kinetic/darknet-ros-msgs/default.nix
similarity index 100%
rename from kinetic/darknet-ros-msgs/default.nix
rename to distros/kinetic/darknet-ros-msgs/default.nix
diff --git a/kinetic/dataflow-lite/default.nix b/distros/kinetic/dataflow-lite/default.nix
similarity index 100%
rename from kinetic/dataflow-lite/default.nix
rename to distros/kinetic/dataflow-lite/default.nix
diff --git a/kinetic/dataspeed-can-msg-filters/default.nix b/distros/kinetic/dataspeed-can-msg-filters/default.nix
similarity index 100%
rename from kinetic/dataspeed-can-msg-filters/default.nix
rename to distros/kinetic/dataspeed-can-msg-filters/default.nix
diff --git a/kinetic/dataspeed-can-tools/default.nix b/distros/kinetic/dataspeed-can-tools/default.nix
similarity index 100%
rename from kinetic/dataspeed-can-tools/default.nix
rename to distros/kinetic/dataspeed-can-tools/default.nix
diff --git a/kinetic/dataspeed-can-usb/default.nix b/distros/kinetic/dataspeed-can-usb/default.nix
similarity index 100%
rename from kinetic/dataspeed-can-usb/default.nix
rename to distros/kinetic/dataspeed-can-usb/default.nix
diff --git a/kinetic/dataspeed-can/default.nix b/distros/kinetic/dataspeed-can/default.nix
similarity index 100%
rename from kinetic/dataspeed-can/default.nix
rename to distros/kinetic/dataspeed-can/default.nix
diff --git a/kinetic/dataspeed-pds-can/default.nix b/distros/kinetic/dataspeed-pds-can/default.nix
similarity index 100%
rename from kinetic/dataspeed-pds-can/default.nix
rename to distros/kinetic/dataspeed-pds-can/default.nix
diff --git a/kinetic/dataspeed-pds-msgs/default.nix b/distros/kinetic/dataspeed-pds-msgs/default.nix
similarity index 100%
rename from kinetic/dataspeed-pds-msgs/default.nix
rename to distros/kinetic/dataspeed-pds-msgs/default.nix
diff --git a/kinetic/dataspeed-pds-rqt/default.nix b/distros/kinetic/dataspeed-pds-rqt/default.nix
similarity index 100%
rename from kinetic/dataspeed-pds-rqt/default.nix
rename to distros/kinetic/dataspeed-pds-rqt/default.nix
diff --git a/kinetic/dataspeed-pds-scripts/default.nix b/distros/kinetic/dataspeed-pds-scripts/default.nix
similarity index 100%
rename from kinetic/dataspeed-pds-scripts/default.nix
rename to distros/kinetic/dataspeed-pds-scripts/default.nix
diff --git a/kinetic/dataspeed-pds/default.nix b/distros/kinetic/dataspeed-pds/default.nix
similarity index 100%
rename from kinetic/dataspeed-pds/default.nix
rename to distros/kinetic/dataspeed-pds/default.nix
diff --git a/kinetic/dataspeed-ulc-can/default.nix b/distros/kinetic/dataspeed-ulc-can/default.nix
similarity index 100%
rename from kinetic/dataspeed-ulc-can/default.nix
rename to distros/kinetic/dataspeed-ulc-can/default.nix
diff --git a/kinetic/dataspeed-ulc-msgs/default.nix b/distros/kinetic/dataspeed-ulc-msgs/default.nix
similarity index 100%
rename from kinetic/dataspeed-ulc-msgs/default.nix
rename to distros/kinetic/dataspeed-ulc-msgs/default.nix
diff --git a/kinetic/dataspeed-ulc/default.nix b/distros/kinetic/dataspeed-ulc/default.nix
similarity index 100%
rename from kinetic/dataspeed-ulc/default.nix
rename to distros/kinetic/dataspeed-ulc/default.nix
diff --git a/kinetic/dbw-fca-can/default.nix b/distros/kinetic/dbw-fca-can/default.nix
similarity index 100%
rename from kinetic/dbw-fca-can/default.nix
rename to distros/kinetic/dbw-fca-can/default.nix
diff --git a/kinetic/dbw-fca-description/default.nix b/distros/kinetic/dbw-fca-description/default.nix
similarity index 100%
rename from kinetic/dbw-fca-description/default.nix
rename to distros/kinetic/dbw-fca-description/default.nix
diff --git a/kinetic/dbw-fca-joystick-demo/default.nix b/distros/kinetic/dbw-fca-joystick-demo/default.nix
similarity index 100%
rename from kinetic/dbw-fca-joystick-demo/default.nix
rename to distros/kinetic/dbw-fca-joystick-demo/default.nix
diff --git a/kinetic/dbw-fca-msgs/default.nix b/distros/kinetic/dbw-fca-msgs/default.nix
similarity index 100%
rename from kinetic/dbw-fca-msgs/default.nix
rename to distros/kinetic/dbw-fca-msgs/default.nix
diff --git a/kinetic/dbw-fca/default.nix b/distros/kinetic/dbw-fca/default.nix
similarity index 100%
rename from kinetic/dbw-fca/default.nix
rename to distros/kinetic/dbw-fca/default.nix
diff --git a/kinetic/dbw-mkz-can/default.nix b/distros/kinetic/dbw-mkz-can/default.nix
similarity index 100%
rename from kinetic/dbw-mkz-can/default.nix
rename to distros/kinetic/dbw-mkz-can/default.nix
diff --git a/kinetic/dbw-mkz-description/default.nix b/distros/kinetic/dbw-mkz-description/default.nix
similarity index 100%
rename from kinetic/dbw-mkz-description/default.nix
rename to distros/kinetic/dbw-mkz-description/default.nix
diff --git a/kinetic/dbw-mkz-joystick-demo/default.nix b/distros/kinetic/dbw-mkz-joystick-demo/default.nix
similarity index 100%
rename from kinetic/dbw-mkz-joystick-demo/default.nix
rename to distros/kinetic/dbw-mkz-joystick-demo/default.nix
diff --git a/kinetic/dbw-mkz-msgs/default.nix b/distros/kinetic/dbw-mkz-msgs/default.nix
similarity index 100%
rename from kinetic/dbw-mkz-msgs/default.nix
rename to distros/kinetic/dbw-mkz-msgs/default.nix
diff --git a/kinetic/dbw-mkz-twist-controller/default.nix b/distros/kinetic/dbw-mkz-twist-controller/default.nix
similarity index 100%
rename from kinetic/dbw-mkz-twist-controller/default.nix
rename to distros/kinetic/dbw-mkz-twist-controller/default.nix
diff --git a/kinetic/dbw-mkz/default.nix b/distros/kinetic/dbw-mkz/default.nix
similarity index 100%
rename from kinetic/dbw-mkz/default.nix
rename to distros/kinetic/dbw-mkz/default.nix
diff --git a/kinetic/ddwrt-access-point/default.nix b/distros/kinetic/ddwrt-access-point/default.nix
similarity index 100%
rename from kinetic/ddwrt-access-point/default.nix
rename to distros/kinetic/ddwrt-access-point/default.nix
diff --git a/kinetic/ddynamic-reconfigure-python/default.nix b/distros/kinetic/ddynamic-reconfigure-python/default.nix
similarity index 100%
rename from kinetic/ddynamic-reconfigure-python/default.nix
rename to distros/kinetic/ddynamic-reconfigure-python/default.nix
diff --git a/kinetic/ddynamic-reconfigure/default.nix b/distros/kinetic/ddynamic-reconfigure/default.nix
similarity index 100%
rename from kinetic/ddynamic-reconfigure/default.nix
rename to distros/kinetic/ddynamic-reconfigure/default.nix
diff --git a/kinetic/declination/default.nix b/distros/kinetic/declination/default.nix
similarity index 100%
rename from kinetic/declination/default.nix
rename to distros/kinetic/declination/default.nix
diff --git a/kinetic/default-cfg-fkie/default.nix b/distros/kinetic/default-cfg-fkie/default.nix
similarity index 100%
rename from kinetic/default-cfg-fkie/default.nix
rename to distros/kinetic/default-cfg-fkie/default.nix
diff --git a/kinetic/delphi-esr-msgs/default.nix b/distros/kinetic/delphi-esr-msgs/default.nix
similarity index 100%
rename from kinetic/delphi-esr-msgs/default.nix
rename to distros/kinetic/delphi-esr-msgs/default.nix
diff --git a/kinetic/delphi-mrr-msgs/default.nix b/distros/kinetic/delphi-mrr-msgs/default.nix
similarity index 100%
rename from kinetic/delphi-mrr-msgs/default.nix
rename to distros/kinetic/delphi-mrr-msgs/default.nix
diff --git a/kinetic/delphi-srr-msgs/default.nix b/distros/kinetic/delphi-srr-msgs/default.nix
similarity index 100%
rename from kinetic/delphi-srr-msgs/default.nix
rename to distros/kinetic/delphi-srr-msgs/default.nix
diff --git a/kinetic/dense-laser-assembler/default.nix b/distros/kinetic/dense-laser-assembler/default.nix
similarity index 100%
rename from kinetic/dense-laser-assembler/default.nix
rename to distros/kinetic/dense-laser-assembler/default.nix
diff --git a/kinetic/denso-launch/default.nix b/distros/kinetic/denso-launch/default.nix
similarity index 100%
rename from kinetic/denso-launch/default.nix
rename to distros/kinetic/denso-launch/default.nix
diff --git a/kinetic/denso-robot-bringup/default.nix b/distros/kinetic/denso-robot-bringup/default.nix
similarity index 100%
rename from kinetic/denso-robot-bringup/default.nix
rename to distros/kinetic/denso-robot-bringup/default.nix
diff --git a/kinetic/denso-robot-control/default.nix b/distros/kinetic/denso-robot-control/default.nix
similarity index 100%
rename from kinetic/denso-robot-control/default.nix
rename to distros/kinetic/denso-robot-control/default.nix
diff --git a/kinetic/denso-robot-core-test/default.nix b/distros/kinetic/denso-robot-core-test/default.nix
similarity index 100%
rename from kinetic/denso-robot-core-test/default.nix
rename to distros/kinetic/denso-robot-core-test/default.nix
diff --git a/kinetic/denso-robot-core/default.nix b/distros/kinetic/denso-robot-core/default.nix
similarity index 100%
rename from kinetic/denso-robot-core/default.nix
rename to distros/kinetic/denso-robot-core/default.nix
diff --git a/kinetic/denso-robot-descriptions/default.nix b/distros/kinetic/denso-robot-descriptions/default.nix
similarity index 100%
rename from kinetic/denso-robot-descriptions/default.nix
rename to distros/kinetic/denso-robot-descriptions/default.nix
diff --git a/kinetic/denso-robot-gazebo/default.nix b/distros/kinetic/denso-robot-gazebo/default.nix
similarity index 100%
rename from kinetic/denso-robot-gazebo/default.nix
rename to distros/kinetic/denso-robot-gazebo/default.nix
diff --git a/kinetic/denso-robot-moveit-config/default.nix b/distros/kinetic/denso-robot-moveit-config/default.nix
similarity index 100%
rename from kinetic/denso-robot-moveit-config/default.nix
rename to distros/kinetic/denso-robot-moveit-config/default.nix
diff --git a/kinetic/denso-robot-ros/default.nix b/distros/kinetic/denso-robot-ros/default.nix
similarity index 100%
rename from kinetic/denso-robot-ros/default.nix
rename to distros/kinetic/denso-robot-ros/default.nix
diff --git a/kinetic/denso-ros-control/default.nix b/distros/kinetic/denso-ros-control/default.nix
similarity index 100%
rename from kinetic/denso-ros-control/default.nix
rename to distros/kinetic/denso-ros-control/default.nix
diff --git a/kinetic/denso/default.nix b/distros/kinetic/denso/default.nix
similarity index 100%
rename from kinetic/denso/default.nix
rename to distros/kinetic/denso/default.nix
diff --git a/kinetic/depth-image-proc/default.nix b/distros/kinetic/depth-image-proc/default.nix
similarity index 100%
rename from kinetic/depth-image-proc/default.nix
rename to distros/kinetic/depth-image-proc/default.nix
diff --git a/kinetic/depthcloud-encoder/default.nix b/distros/kinetic/depthcloud-encoder/default.nix
similarity index 100%
rename from kinetic/depthcloud-encoder/default.nix
rename to distros/kinetic/depthcloud-encoder/default.nix
diff --git a/kinetic/depthimage-to-laserscan/default.nix b/distros/kinetic/depthimage-to-laserscan/default.nix
similarity index 100%
rename from kinetic/depthimage-to-laserscan/default.nix
rename to distros/kinetic/depthimage-to-laserscan/default.nix
diff --git a/kinetic/derived-object-msgs/default.nix b/distros/kinetic/derived-object-msgs/default.nix
similarity index 100%
rename from kinetic/derived-object-msgs/default.nix
rename to distros/kinetic/derived-object-msgs/default.nix
diff --git a/kinetic/desistek-saga-control/default.nix b/distros/kinetic/desistek-saga-control/default.nix
similarity index 100%
rename from kinetic/desistek-saga-control/default.nix
rename to distros/kinetic/desistek-saga-control/default.nix
diff --git a/kinetic/desistek-saga-description/default.nix b/distros/kinetic/desistek-saga-description/default.nix
similarity index 100%
rename from kinetic/desistek-saga-description/default.nix
rename to distros/kinetic/desistek-saga-description/default.nix
diff --git a/kinetic/desistek-saga-gazebo/default.nix b/distros/kinetic/desistek-saga-gazebo/default.nix
similarity index 100%
rename from kinetic/desistek-saga-gazebo/default.nix
rename to distros/kinetic/desistek-saga-gazebo/default.nix
diff --git a/kinetic/desktop-full/default.nix b/distros/kinetic/desktop-full/default.nix
similarity index 100%
rename from kinetic/desktop-full/default.nix
rename to distros/kinetic/desktop-full/default.nix
diff --git a/kinetic/desktop/default.nix b/distros/kinetic/desktop/default.nix
similarity index 100%
rename from kinetic/desktop/default.nix
rename to distros/kinetic/desktop/default.nix
diff --git a/kinetic/diagnostic-aggregator/default.nix b/distros/kinetic/diagnostic-aggregator/default.nix
similarity index 100%
rename from kinetic/diagnostic-aggregator/default.nix
rename to distros/kinetic/diagnostic-aggregator/default.nix
diff --git a/kinetic/diagnostic-analysis/default.nix b/distros/kinetic/diagnostic-analysis/default.nix
similarity index 100%
rename from kinetic/diagnostic-analysis/default.nix
rename to distros/kinetic/diagnostic-analysis/default.nix
diff --git a/kinetic/diagnostic-common-diagnostics/default.nix b/distros/kinetic/diagnostic-common-diagnostics/default.nix
similarity index 100%
rename from kinetic/diagnostic-common-diagnostics/default.nix
rename to distros/kinetic/diagnostic-common-diagnostics/default.nix
diff --git a/kinetic/diagnostic-msgs/default.nix b/distros/kinetic/diagnostic-msgs/default.nix
similarity index 100%
rename from kinetic/diagnostic-msgs/default.nix
rename to distros/kinetic/diagnostic-msgs/default.nix
diff --git a/kinetic/diagnostic-updater/default.nix b/distros/kinetic/diagnostic-updater/default.nix
similarity index 100%
rename from kinetic/diagnostic-updater/default.nix
rename to distros/kinetic/diagnostic-updater/default.nix
diff --git a/kinetic/diagnostics/default.nix b/distros/kinetic/diagnostics/default.nix
similarity index 100%
rename from kinetic/diagnostics/default.nix
rename to distros/kinetic/diagnostics/default.nix
diff --git a/kinetic/diff-drive-controller/default.nix b/distros/kinetic/diff-drive-controller/default.nix
similarity index 100%
rename from kinetic/diff-drive-controller/default.nix
rename to distros/kinetic/diff-drive-controller/default.nix
diff --git a/kinetic/distance-map-core/default.nix b/distros/kinetic/distance-map-core/default.nix
similarity index 100%
rename from kinetic/distance-map-core/default.nix
rename to distros/kinetic/distance-map-core/default.nix
diff --git a/kinetic/distance-map-deadreck/default.nix b/distros/kinetic/distance-map-deadreck/default.nix
similarity index 100%
rename from kinetic/distance-map-deadreck/default.nix
rename to distros/kinetic/distance-map-deadreck/default.nix
diff --git a/kinetic/distance-map-msgs/default.nix b/distros/kinetic/distance-map-msgs/default.nix
similarity index 100%
rename from kinetic/distance-map-msgs/default.nix
rename to distros/kinetic/distance-map-msgs/default.nix
diff --git a/kinetic/distance-map-node/default.nix b/distros/kinetic/distance-map-node/default.nix
similarity index 100%
rename from kinetic/distance-map-node/default.nix
rename to distros/kinetic/distance-map-node/default.nix
diff --git a/kinetic/distance-map-opencv/default.nix b/distros/kinetic/distance-map-opencv/default.nix
similarity index 100%
rename from kinetic/distance-map-opencv/default.nix
rename to distros/kinetic/distance-map-opencv/default.nix
diff --git a/kinetic/distance-map-rviz/default.nix b/distros/kinetic/distance-map-rviz/default.nix
similarity index 100%
rename from kinetic/distance-map-rviz/default.nix
rename to distros/kinetic/distance-map-rviz/default.nix
diff --git a/kinetic/distance-map-tools/default.nix b/distros/kinetic/distance-map-tools/default.nix
similarity index 100%
rename from kinetic/distance-map-tools/default.nix
rename to distros/kinetic/distance-map-tools/default.nix
diff --git a/kinetic/distance-map/default.nix b/distros/kinetic/distance-map/default.nix
similarity index 100%
rename from kinetic/distance-map/default.nix
rename to distros/kinetic/distance-map/default.nix
diff --git a/kinetic/dlux-global-planner/default.nix b/distros/kinetic/dlux-global-planner/default.nix
similarity index 100%
rename from kinetic/dlux-global-planner/default.nix
rename to distros/kinetic/dlux-global-planner/default.nix
diff --git a/kinetic/dlux-plugins/default.nix b/distros/kinetic/dlux-plugins/default.nix
similarity index 100%
rename from kinetic/dlux-plugins/default.nix
rename to distros/kinetic/dlux-plugins/default.nix
diff --git a/kinetic/dnn-detect/default.nix b/distros/kinetic/dnn-detect/default.nix
similarity index 100%
rename from kinetic/dnn-detect/default.nix
rename to distros/kinetic/dnn-detect/default.nix
diff --git a/kinetic/dockeros/default.nix b/distros/kinetic/dockeros/default.nix
similarity index 100%
rename from kinetic/dockeros/default.nix
rename to distros/kinetic/dockeros/default.nix
diff --git a/kinetic/doosan-robot/default.nix b/distros/kinetic/doosan-robot/default.nix
similarity index 100%
rename from kinetic/doosan-robot/default.nix
rename to distros/kinetic/doosan-robot/default.nix
diff --git a/kinetic/doosan-robotics/default.nix b/distros/kinetic/doosan-robotics/default.nix
similarity index 100%
rename from kinetic/doosan-robotics/default.nix
rename to distros/kinetic/doosan-robotics/default.nix
diff --git a/kinetic/downward/default.nix b/distros/kinetic/downward/default.nix
similarity index 100%
rename from kinetic/downward/default.nix
rename to distros/kinetic/downward/default.nix
diff --git a/kinetic/dr-base/default.nix b/distros/kinetic/dr-base/default.nix
similarity index 100%
rename from kinetic/dr-base/default.nix
rename to distros/kinetic/dr-base/default.nix
diff --git a/kinetic/dr-cmake/default.nix b/distros/kinetic/dr-cmake/default.nix
similarity index 100%
rename from kinetic/dr-cmake/default.nix
rename to distros/kinetic/dr-cmake/default.nix
diff --git a/kinetic/driver-base/default.nix b/distros/kinetic/driver-base/default.nix
similarity index 100%
rename from kinetic/driver-base/default.nix
rename to distros/kinetic/driver-base/default.nix
diff --git a/kinetic/driver-common/default.nix b/distros/kinetic/driver-common/default.nix
similarity index 100%
rename from kinetic/driver-common/default.nix
rename to distros/kinetic/driver-common/default.nix
diff --git a/kinetic/drone-wrapper/default.nix b/distros/kinetic/drone-wrapper/default.nix
similarity index 100%
rename from kinetic/drone-wrapper/default.nix
rename to distros/kinetic/drone-wrapper/default.nix
diff --git a/kinetic/dsr-control/default.nix b/distros/kinetic/dsr-control/default.nix
similarity index 100%
rename from kinetic/dsr-control/default.nix
rename to distros/kinetic/dsr-control/default.nix
diff --git a/kinetic/dsr-description/default.nix b/distros/kinetic/dsr-description/default.nix
similarity index 100%
rename from kinetic/dsr-description/default.nix
rename to distros/kinetic/dsr-description/default.nix
diff --git a/kinetic/dsr-example-cpp/default.nix b/distros/kinetic/dsr-example-cpp/default.nix
similarity index 100%
rename from kinetic/dsr-example-cpp/default.nix
rename to distros/kinetic/dsr-example-cpp/default.nix
diff --git a/kinetic/dsr-example-py/default.nix b/distros/kinetic/dsr-example-py/default.nix
similarity index 100%
rename from kinetic/dsr-example-py/default.nix
rename to distros/kinetic/dsr-example-py/default.nix
diff --git a/kinetic/dsr-gazebo/default.nix b/distros/kinetic/dsr-gazebo/default.nix
similarity index 100%
rename from kinetic/dsr-gazebo/default.nix
rename to distros/kinetic/dsr-gazebo/default.nix
diff --git a/kinetic/dsr-launcher/default.nix b/distros/kinetic/dsr-launcher/default.nix
similarity index 100%
rename from kinetic/dsr-launcher/default.nix
rename to distros/kinetic/dsr-launcher/default.nix
diff --git a/kinetic/dsr-msgs/default.nix b/distros/kinetic/dsr-msgs/default.nix
similarity index 100%
rename from kinetic/dsr-msgs/default.nix
rename to distros/kinetic/dsr-msgs/default.nix
diff --git a/kinetic/dwa-local-planner/default.nix b/distros/kinetic/dwa-local-planner/default.nix
similarity index 100%
rename from kinetic/dwa-local-planner/default.nix
rename to distros/kinetic/dwa-local-planner/default.nix
diff --git a/kinetic/dwb-critics/default.nix b/distros/kinetic/dwb-critics/default.nix
similarity index 100%
rename from kinetic/dwb-critics/default.nix
rename to distros/kinetic/dwb-critics/default.nix
diff --git a/kinetic/dwb-local-planner/default.nix b/distros/kinetic/dwb-local-planner/default.nix
similarity index 100%
rename from kinetic/dwb-local-planner/default.nix
rename to distros/kinetic/dwb-local-planner/default.nix
diff --git a/kinetic/dwb-msgs/default.nix b/distros/kinetic/dwb-msgs/default.nix
similarity index 100%
rename from kinetic/dwb-msgs/default.nix
rename to distros/kinetic/dwb-msgs/default.nix
diff --git a/kinetic/dwb-plugins/default.nix b/distros/kinetic/dwb-plugins/default.nix
similarity index 100%
rename from kinetic/dwb-plugins/default.nix
rename to distros/kinetic/dwb-plugins/default.nix
diff --git a/kinetic/dynamic-edt-3d/default.nix b/distros/kinetic/dynamic-edt-3d/default.nix
similarity index 100%
rename from kinetic/dynamic-edt-3d/default.nix
rename to distros/kinetic/dynamic-edt-3d/default.nix
diff --git a/kinetic/dynamic-reconfigure/default.nix b/distros/kinetic/dynamic-reconfigure/default.nix
similarity index 100%
rename from kinetic/dynamic-reconfigure/default.nix
rename to distros/kinetic/dynamic-reconfigure/default.nix
diff --git a/kinetic/dynamic-robot-state-publisher/default.nix b/distros/kinetic/dynamic-robot-state-publisher/default.nix
similarity index 100%
rename from kinetic/dynamic-robot-state-publisher/default.nix
rename to distros/kinetic/dynamic-robot-state-publisher/default.nix
diff --git a/kinetic/dynamic-tf-publisher/default.nix b/distros/kinetic/dynamic-tf-publisher/default.nix
similarity index 100%
rename from kinetic/dynamic-tf-publisher/default.nix
rename to distros/kinetic/dynamic-tf-publisher/default.nix
diff --git a/kinetic/dynamixel-controllers/default.nix b/distros/kinetic/dynamixel-controllers/default.nix
similarity index 100%
rename from kinetic/dynamixel-controllers/default.nix
rename to distros/kinetic/dynamixel-controllers/default.nix
diff --git a/kinetic/dynamixel-driver/default.nix b/distros/kinetic/dynamixel-driver/default.nix
similarity index 100%
rename from kinetic/dynamixel-driver/default.nix
rename to distros/kinetic/dynamixel-driver/default.nix
diff --git a/kinetic/dynamixel-motor/default.nix b/distros/kinetic/dynamixel-motor/default.nix
similarity index 100%
rename from kinetic/dynamixel-motor/default.nix
rename to distros/kinetic/dynamixel-motor/default.nix
diff --git a/kinetic/dynamixel-msgs/default.nix b/distros/kinetic/dynamixel-msgs/default.nix
similarity index 100%
rename from kinetic/dynamixel-msgs/default.nix
rename to distros/kinetic/dynamixel-msgs/default.nix
diff --git a/kinetic/dynamixel-sdk/default.nix b/distros/kinetic/dynamixel-sdk/default.nix
similarity index 100%
rename from kinetic/dynamixel-sdk/default.nix
rename to distros/kinetic/dynamixel-sdk/default.nix
diff --git a/kinetic/dynamixel-tutorials/default.nix b/distros/kinetic/dynamixel-tutorials/default.nix
similarity index 100%
rename from kinetic/dynamixel-tutorials/default.nix
rename to distros/kinetic/dynamixel-tutorials/default.nix
diff --git a/kinetic/dynamixel-workbench-controllers/default.nix b/distros/kinetic/dynamixel-workbench-controllers/default.nix
similarity index 100%
rename from kinetic/dynamixel-workbench-controllers/default.nix
rename to distros/kinetic/dynamixel-workbench-controllers/default.nix
diff --git a/kinetic/dynamixel-workbench-msgs/default.nix b/distros/kinetic/dynamixel-workbench-msgs/default.nix
similarity index 100%
rename from kinetic/dynamixel-workbench-msgs/default.nix
rename to distros/kinetic/dynamixel-workbench-msgs/default.nix
diff --git a/kinetic/dynamixel-workbench-operators/default.nix b/distros/kinetic/dynamixel-workbench-operators/default.nix
similarity index 100%
rename from kinetic/dynamixel-workbench-operators/default.nix
rename to distros/kinetic/dynamixel-workbench-operators/default.nix
diff --git a/kinetic/dynamixel-workbench-single-manager-gui/default.nix b/distros/kinetic/dynamixel-workbench-single-manager-gui/default.nix
similarity index 100%
rename from kinetic/dynamixel-workbench-single-manager-gui/default.nix
rename to distros/kinetic/dynamixel-workbench-single-manager-gui/default.nix
diff --git a/kinetic/dynamixel-workbench-single-manager/default.nix b/distros/kinetic/dynamixel-workbench-single-manager/default.nix
similarity index 100%
rename from kinetic/dynamixel-workbench-single-manager/default.nix
rename to distros/kinetic/dynamixel-workbench-single-manager/default.nix
diff --git a/kinetic/dynamixel-workbench-toolbox/default.nix b/distros/kinetic/dynamixel-workbench-toolbox/default.nix
similarity index 100%
rename from kinetic/dynamixel-workbench-toolbox/default.nix
rename to distros/kinetic/dynamixel-workbench-toolbox/default.nix
diff --git a/kinetic/dynamixel-workbench/default.nix b/distros/kinetic/dynamixel-workbench/default.nix
similarity index 100%
rename from kinetic/dynamixel-workbench/default.nix
rename to distros/kinetic/dynamixel-workbench/default.nix
diff --git a/kinetic/dynpick-driver/default.nix b/distros/kinetic/dynpick-driver/default.nix
similarity index 100%
rename from kinetic/dynpick-driver/default.nix
rename to distros/kinetic/dynpick-driver/default.nix
diff --git a/kinetic/earth-rover-piksi/default.nix b/distros/kinetic/earth-rover-piksi/default.nix
similarity index 100%
rename from kinetic/earth-rover-piksi/default.nix
rename to distros/kinetic/earth-rover-piksi/default.nix
diff --git a/kinetic/easy-markers/default.nix b/distros/kinetic/easy-markers/default.nix
similarity index 100%
rename from kinetic/easy-markers/default.nix
rename to distros/kinetic/easy-markers/default.nix
diff --git a/kinetic/eband-local-planner/default.nix b/distros/kinetic/eband-local-planner/default.nix
similarity index 100%
rename from kinetic/eband-local-planner/default.nix
rename to distros/kinetic/eband-local-planner/default.nix
diff --git a/kinetic/eca-a9-control/default.nix b/distros/kinetic/eca-a9-control/default.nix
similarity index 100%
rename from kinetic/eca-a9-control/default.nix
rename to distros/kinetic/eca-a9-control/default.nix
diff --git a/kinetic/eca-a9-description/default.nix b/distros/kinetic/eca-a9-description/default.nix
similarity index 100%
rename from kinetic/eca-a9-description/default.nix
rename to distros/kinetic/eca-a9-description/default.nix
diff --git a/kinetic/eca-a9-gazebo/default.nix b/distros/kinetic/eca-a9-gazebo/default.nix
similarity index 100%
rename from kinetic/eca-a9-gazebo/default.nix
rename to distros/kinetic/eca-a9-gazebo/default.nix
diff --git a/kinetic/ecl-build/default.nix b/distros/kinetic/ecl-build/default.nix
similarity index 100%
rename from kinetic/ecl-build/default.nix
rename to distros/kinetic/ecl-build/default.nix
diff --git a/kinetic/ecl-command-line/default.nix b/distros/kinetic/ecl-command-line/default.nix
similarity index 100%
rename from kinetic/ecl-command-line/default.nix
rename to distros/kinetic/ecl-command-line/default.nix
diff --git a/kinetic/ecl-concepts/default.nix b/distros/kinetic/ecl-concepts/default.nix
similarity index 100%
rename from kinetic/ecl-concepts/default.nix
rename to distros/kinetic/ecl-concepts/default.nix
diff --git a/kinetic/ecl-config/default.nix b/distros/kinetic/ecl-config/default.nix
similarity index 100%
rename from kinetic/ecl-config/default.nix
rename to distros/kinetic/ecl-config/default.nix
diff --git a/kinetic/ecl-console/default.nix b/distros/kinetic/ecl-console/default.nix
similarity index 100%
rename from kinetic/ecl-console/default.nix
rename to distros/kinetic/ecl-console/default.nix
diff --git a/kinetic/ecl-containers/default.nix b/distros/kinetic/ecl-containers/default.nix
similarity index 100%
rename from kinetic/ecl-containers/default.nix
rename to distros/kinetic/ecl-containers/default.nix
diff --git a/kinetic/ecl-converters-lite/default.nix b/distros/kinetic/ecl-converters-lite/default.nix
similarity index 100%
rename from kinetic/ecl-converters-lite/default.nix
rename to distros/kinetic/ecl-converters-lite/default.nix
diff --git a/kinetic/ecl-converters/default.nix b/distros/kinetic/ecl-converters/default.nix
similarity index 100%
rename from kinetic/ecl-converters/default.nix
rename to distros/kinetic/ecl-converters/default.nix
diff --git a/kinetic/ecl-core-apps/default.nix b/distros/kinetic/ecl-core-apps/default.nix
similarity index 100%
rename from kinetic/ecl-core-apps/default.nix
rename to distros/kinetic/ecl-core-apps/default.nix
diff --git a/kinetic/ecl-core/default.nix b/distros/kinetic/ecl-core/default.nix
similarity index 100%
rename from kinetic/ecl-core/default.nix
rename to distros/kinetic/ecl-core/default.nix
diff --git a/kinetic/ecl-devices/default.nix b/distros/kinetic/ecl-devices/default.nix
similarity index 100%
rename from kinetic/ecl-devices/default.nix
rename to distros/kinetic/ecl-devices/default.nix
diff --git a/kinetic/ecl-eigen/default.nix b/distros/kinetic/ecl-eigen/default.nix
similarity index 100%
rename from kinetic/ecl-eigen/default.nix
rename to distros/kinetic/ecl-eigen/default.nix
diff --git a/kinetic/ecl-errors/default.nix b/distros/kinetic/ecl-errors/default.nix
similarity index 100%
rename from kinetic/ecl-errors/default.nix
rename to distros/kinetic/ecl-errors/default.nix
diff --git a/kinetic/ecl-exceptions/default.nix b/distros/kinetic/ecl-exceptions/default.nix
similarity index 100%
rename from kinetic/ecl-exceptions/default.nix
rename to distros/kinetic/ecl-exceptions/default.nix
diff --git a/kinetic/ecl-filesystem/default.nix b/distros/kinetic/ecl-filesystem/default.nix
similarity index 100%
rename from kinetic/ecl-filesystem/default.nix
rename to distros/kinetic/ecl-filesystem/default.nix
diff --git a/kinetic/ecl-formatters/default.nix b/distros/kinetic/ecl-formatters/default.nix
similarity index 100%
rename from kinetic/ecl-formatters/default.nix
rename to distros/kinetic/ecl-formatters/default.nix
diff --git a/kinetic/ecl-geometry/default.nix b/distros/kinetic/ecl-geometry/default.nix
similarity index 100%
rename from kinetic/ecl-geometry/default.nix
rename to distros/kinetic/ecl-geometry/default.nix
diff --git a/kinetic/ecl-io/default.nix b/distros/kinetic/ecl-io/default.nix
similarity index 100%
rename from kinetic/ecl-io/default.nix
rename to distros/kinetic/ecl-io/default.nix
diff --git a/kinetic/ecl-ipc/default.nix b/distros/kinetic/ecl-ipc/default.nix
similarity index 100%
rename from kinetic/ecl-ipc/default.nix
rename to distros/kinetic/ecl-ipc/default.nix
diff --git a/kinetic/ecl-license/default.nix b/distros/kinetic/ecl-license/default.nix
similarity index 100%
rename from kinetic/ecl-license/default.nix
rename to distros/kinetic/ecl-license/default.nix
diff --git a/kinetic/ecl-linear-algebra/default.nix b/distros/kinetic/ecl-linear-algebra/default.nix
similarity index 100%
rename from kinetic/ecl-linear-algebra/default.nix
rename to distros/kinetic/ecl-linear-algebra/default.nix
diff --git a/kinetic/ecl-lite/default.nix b/distros/kinetic/ecl-lite/default.nix
similarity index 100%
rename from kinetic/ecl-lite/default.nix
rename to distros/kinetic/ecl-lite/default.nix
diff --git a/kinetic/ecl-manipulation/default.nix b/distros/kinetic/ecl-manipulation/default.nix
similarity index 100%
rename from kinetic/ecl-manipulation/default.nix
rename to distros/kinetic/ecl-manipulation/default.nix
diff --git a/kinetic/ecl-manipulators/default.nix b/distros/kinetic/ecl-manipulators/default.nix
similarity index 100%
rename from kinetic/ecl-manipulators/default.nix
rename to distros/kinetic/ecl-manipulators/default.nix
diff --git a/kinetic/ecl-math/default.nix b/distros/kinetic/ecl-math/default.nix
similarity index 100%
rename from kinetic/ecl-math/default.nix
rename to distros/kinetic/ecl-math/default.nix
diff --git a/kinetic/ecl-mobile-robot/default.nix b/distros/kinetic/ecl-mobile-robot/default.nix
similarity index 100%
rename from kinetic/ecl-mobile-robot/default.nix
rename to distros/kinetic/ecl-mobile-robot/default.nix
diff --git a/kinetic/ecl-mpl/default.nix b/distros/kinetic/ecl-mpl/default.nix
similarity index 100%
rename from kinetic/ecl-mpl/default.nix
rename to distros/kinetic/ecl-mpl/default.nix
diff --git a/kinetic/ecl-navigation/default.nix b/distros/kinetic/ecl-navigation/default.nix
similarity index 100%
rename from kinetic/ecl-navigation/default.nix
rename to distros/kinetic/ecl-navigation/default.nix
diff --git a/kinetic/ecl-sigslots-lite/default.nix b/distros/kinetic/ecl-sigslots-lite/default.nix
similarity index 100%
rename from kinetic/ecl-sigslots-lite/default.nix
rename to distros/kinetic/ecl-sigslots-lite/default.nix
diff --git a/kinetic/ecl-sigslots/default.nix b/distros/kinetic/ecl-sigslots/default.nix
similarity index 100%
rename from kinetic/ecl-sigslots/default.nix
rename to distros/kinetic/ecl-sigslots/default.nix
diff --git a/kinetic/ecl-statistics/default.nix b/distros/kinetic/ecl-statistics/default.nix
similarity index 100%
rename from kinetic/ecl-statistics/default.nix
rename to distros/kinetic/ecl-statistics/default.nix
diff --git a/kinetic/ecl-streams/default.nix b/distros/kinetic/ecl-streams/default.nix
similarity index 100%
rename from kinetic/ecl-streams/default.nix
rename to distros/kinetic/ecl-streams/default.nix
diff --git a/kinetic/ecl-threads/default.nix b/distros/kinetic/ecl-threads/default.nix
similarity index 100%
rename from kinetic/ecl-threads/default.nix
rename to distros/kinetic/ecl-threads/default.nix
diff --git a/kinetic/ecl-time-lite/default.nix b/distros/kinetic/ecl-time-lite/default.nix
similarity index 100%
rename from kinetic/ecl-time-lite/default.nix
rename to distros/kinetic/ecl-time-lite/default.nix
diff --git a/kinetic/ecl-time/default.nix b/distros/kinetic/ecl-time/default.nix
similarity index 100%
rename from kinetic/ecl-time/default.nix
rename to distros/kinetic/ecl-time/default.nix
diff --git a/kinetic/ecl-tools/default.nix b/distros/kinetic/ecl-tools/default.nix
similarity index 100%
rename from kinetic/ecl-tools/default.nix
rename to distros/kinetic/ecl-tools/default.nix
diff --git a/kinetic/ecl-type-traits/default.nix b/distros/kinetic/ecl-type-traits/default.nix
similarity index 100%
rename from kinetic/ecl-type-traits/default.nix
rename to distros/kinetic/ecl-type-traits/default.nix
diff --git a/kinetic/ecl-utilities/default.nix b/distros/kinetic/ecl-utilities/default.nix
similarity index 100%
rename from kinetic/ecl-utilities/default.nix
rename to distros/kinetic/ecl-utilities/default.nix
diff --git a/kinetic/ecl/default.nix b/distros/kinetic/ecl/default.nix
similarity index 100%
rename from kinetic/ecl/default.nix
rename to distros/kinetic/ecl/default.nix
diff --git a/kinetic/ecto-image-pipeline/default.nix b/distros/kinetic/ecto-image-pipeline/default.nix
similarity index 100%
rename from kinetic/ecto-image-pipeline/default.nix
rename to distros/kinetic/ecto-image-pipeline/default.nix
diff --git a/kinetic/ecto-opencv/default.nix b/distros/kinetic/ecto-opencv/default.nix
similarity index 100%
rename from kinetic/ecto-opencv/default.nix
rename to distros/kinetic/ecto-opencv/default.nix
diff --git a/kinetic/ecto-pcl/default.nix b/distros/kinetic/ecto-pcl/default.nix
similarity index 100%
rename from kinetic/ecto-pcl/default.nix
rename to distros/kinetic/ecto-pcl/default.nix
diff --git a/kinetic/ecto-ros/default.nix b/distros/kinetic/ecto-ros/default.nix
similarity index 100%
rename from kinetic/ecto-ros/default.nix
rename to distros/kinetic/ecto-ros/default.nix
diff --git a/kinetic/effort-controllers/default.nix b/distros/kinetic/effort-controllers/default.nix
similarity index 100%
rename from kinetic/effort-controllers/default.nix
rename to distros/kinetic/effort-controllers/default.nix
diff --git a/kinetic/eigen-conversions/default.nix b/distros/kinetic/eigen-conversions/default.nix
similarity index 100%
rename from kinetic/eigen-conversions/default.nix
rename to distros/kinetic/eigen-conversions/default.nix
diff --git a/kinetic/eigen-stl-containers/default.nix b/distros/kinetic/eigen-stl-containers/default.nix
similarity index 100%
rename from kinetic/eigen-stl-containers/default.nix
rename to distros/kinetic/eigen-stl-containers/default.nix
diff --git a/kinetic/eigen-typekit/default.nix b/distros/kinetic/eigen-typekit/default.nix
similarity index 100%
rename from kinetic/eigen-typekit/default.nix
rename to distros/kinetic/eigen-typekit/default.nix
diff --git a/kinetic/eigenpy/default.nix b/distros/kinetic/eigenpy/default.nix
similarity index 100%
rename from kinetic/eigenpy/default.nix
rename to distros/kinetic/eigenpy/default.nix
diff --git a/kinetic/eml/default.nix b/distros/kinetic/eml/default.nix
similarity index 100%
rename from kinetic/eml/default.nix
rename to distros/kinetic/eml/default.nix
diff --git a/kinetic/epson-imu-driver/default.nix b/distros/kinetic/epson-imu-driver/default.nix
similarity index 100%
rename from kinetic/epson-imu-driver/default.nix
rename to distros/kinetic/epson-imu-driver/default.nix
diff --git a/kinetic/ethercat-grant/default.nix b/distros/kinetic/ethercat-grant/default.nix
similarity index 100%
rename from kinetic/ethercat-grant/default.nix
rename to distros/kinetic/ethercat-grant/default.nix
diff --git a/kinetic/ethercat-hardware/default.nix b/distros/kinetic/ethercat-hardware/default.nix
similarity index 100%
rename from kinetic/ethercat-hardware/default.nix
rename to distros/kinetic/ethercat-hardware/default.nix
diff --git a/kinetic/ethercat-manager/default.nix b/distros/kinetic/ethercat-manager/default.nix
similarity index 100%
rename from kinetic/ethercat-manager/default.nix
rename to distros/kinetic/ethercat-manager/default.nix
diff --git a/kinetic/ethercat-trigger-controllers/default.nix b/distros/kinetic/ethercat-trigger-controllers/default.nix
similarity index 100%
rename from kinetic/ethercat-trigger-controllers/default.nix
rename to distros/kinetic/ethercat-trigger-controllers/default.nix
diff --git a/kinetic/eus-assimp/default.nix b/distros/kinetic/eus-assimp/default.nix
similarity index 100%
rename from kinetic/eus-assimp/default.nix
rename to distros/kinetic/eus-assimp/default.nix
diff --git a/kinetic/eus-nlopt/default.nix b/distros/kinetic/eus-nlopt/default.nix
similarity index 100%
rename from kinetic/eus-nlopt/default.nix
rename to distros/kinetic/eus-nlopt/default.nix
diff --git a/kinetic/eus-qp/default.nix b/distros/kinetic/eus-qp/default.nix
similarity index 100%
rename from kinetic/eus-qp/default.nix
rename to distros/kinetic/eus-qp/default.nix
diff --git a/kinetic/eus-qpoases/default.nix b/distros/kinetic/eus-qpoases/default.nix
similarity index 100%
rename from kinetic/eus-qpoases/default.nix
rename to distros/kinetic/eus-qpoases/default.nix
diff --git a/kinetic/euslisp/default.nix b/distros/kinetic/euslisp/default.nix
similarity index 100%
rename from kinetic/euslisp/default.nix
rename to distros/kinetic/euslisp/default.nix
diff --git a/kinetic/eusurdf/default.nix b/distros/kinetic/eusurdf/default.nix
similarity index 100%
rename from kinetic/eusurdf/default.nix
rename to distros/kinetic/eusurdf/default.nix
diff --git a/kinetic/executive-smach-visualization/default.nix b/distros/kinetic/executive-smach-visualization/default.nix
similarity index 100%
rename from kinetic/executive-smach-visualization/default.nix
rename to distros/kinetic/executive-smach-visualization/default.nix
diff --git a/kinetic/executive-smach/default.nix b/distros/kinetic/executive-smach/default.nix
similarity index 100%
rename from kinetic/executive-smach/default.nix
rename to distros/kinetic/executive-smach/default.nix
diff --git a/kinetic/exotica-aico-solver/default.nix b/distros/kinetic/exotica-aico-solver/default.nix
similarity index 100%
rename from kinetic/exotica-aico-solver/default.nix
rename to distros/kinetic/exotica-aico-solver/default.nix
diff --git a/kinetic/exotica-collision-scene-fcl-latest/default.nix b/distros/kinetic/exotica-collision-scene-fcl-latest/default.nix
similarity index 100%
rename from kinetic/exotica-collision-scene-fcl-latest/default.nix
rename to distros/kinetic/exotica-collision-scene-fcl-latest/default.nix
diff --git a/kinetic/exotica-core-task-maps/default.nix b/distros/kinetic/exotica-core-task-maps/default.nix
similarity index 100%
rename from kinetic/exotica-core-task-maps/default.nix
rename to distros/kinetic/exotica-core-task-maps/default.nix
diff --git a/kinetic/exotica-core/default.nix b/distros/kinetic/exotica-core/default.nix
similarity index 100%
rename from kinetic/exotica-core/default.nix
rename to distros/kinetic/exotica-core/default.nix
diff --git a/kinetic/exotica-examples/default.nix b/distros/kinetic/exotica-examples/default.nix
similarity index 100%
rename from kinetic/exotica-examples/default.nix
rename to distros/kinetic/exotica-examples/default.nix
diff --git a/kinetic/exotica-ik-solver/default.nix b/distros/kinetic/exotica-ik-solver/default.nix
similarity index 100%
rename from kinetic/exotica-ik-solver/default.nix
rename to distros/kinetic/exotica-ik-solver/default.nix
diff --git a/kinetic/exotica-levenberg-marquardt-solver/default.nix b/distros/kinetic/exotica-levenberg-marquardt-solver/default.nix
similarity index 100%
rename from kinetic/exotica-levenberg-marquardt-solver/default.nix
rename to distros/kinetic/exotica-levenberg-marquardt-solver/default.nix
diff --git a/kinetic/exotica-ompl-solver/default.nix b/distros/kinetic/exotica-ompl-solver/default.nix
similarity index 100%
rename from kinetic/exotica-ompl-solver/default.nix
rename to distros/kinetic/exotica-ompl-solver/default.nix
diff --git a/kinetic/exotica-time-indexed-rrt-connect-solver/default.nix b/distros/kinetic/exotica-time-indexed-rrt-connect-solver/default.nix
similarity index 100%
rename from kinetic/exotica-time-indexed-rrt-connect-solver/default.nix
rename to distros/kinetic/exotica-time-indexed-rrt-connect-solver/default.nix
diff --git a/kinetic/exotica-val-description/default.nix b/distros/kinetic/exotica-val-description/default.nix
similarity index 100%
rename from kinetic/exotica-val-description/default.nix
rename to distros/kinetic/exotica-val-description/default.nix
diff --git a/kinetic/exotica/default.nix b/distros/kinetic/exotica/default.nix
similarity index 100%
rename from kinetic/exotica/default.nix
rename to distros/kinetic/exotica/default.nix
diff --git a/kinetic/explore-lite/default.nix b/distros/kinetic/explore-lite/default.nix
similarity index 100%
rename from kinetic/explore-lite/default.nix
rename to distros/kinetic/explore-lite/default.nix
diff --git a/kinetic/ez-interactive-marker/default.nix b/distros/kinetic/ez-interactive-marker/default.nix
similarity index 100%
rename from kinetic/ez-interactive-marker/default.nix
rename to distros/kinetic/ez-interactive-marker/default.nix
diff --git a/kinetic/face-detector/default.nix b/distros/kinetic/face-detector/default.nix
similarity index 100%
rename from kinetic/face-detector/default.nix
rename to distros/kinetic/face-detector/default.nix
diff --git a/kinetic/fake-joint-driver/default.nix b/distros/kinetic/fake-joint-driver/default.nix
similarity index 100%
rename from kinetic/fake-joint-driver/default.nix
rename to distros/kinetic/fake-joint-driver/default.nix
diff --git a/kinetic/fake-joint-launch/default.nix b/distros/kinetic/fake-joint-launch/default.nix
similarity index 100%
rename from kinetic/fake-joint-launch/default.nix
rename to distros/kinetic/fake-joint-launch/default.nix
diff --git a/kinetic/fake-joint/default.nix b/distros/kinetic/fake-joint/default.nix
similarity index 100%
rename from kinetic/fake-joint/default.nix
rename to distros/kinetic/fake-joint/default.nix
diff --git a/kinetic/fake-localization/default.nix b/distros/kinetic/fake-localization/default.nix
similarity index 100%
rename from kinetic/fake-localization/default.nix
rename to distros/kinetic/fake-localization/default.nix
diff --git a/kinetic/fanuc-cr35ia-support/default.nix b/distros/kinetic/fanuc-cr35ia-support/default.nix
similarity index 100%
rename from kinetic/fanuc-cr35ia-support/default.nix
rename to distros/kinetic/fanuc-cr35ia-support/default.nix
diff --git a/kinetic/fanuc-cr7ia-support/default.nix b/distros/kinetic/fanuc-cr7ia-support/default.nix
similarity index 100%
rename from kinetic/fanuc-cr7ia-support/default.nix
rename to distros/kinetic/fanuc-cr7ia-support/default.nix
diff --git a/kinetic/fanuc-driver/default.nix b/distros/kinetic/fanuc-driver/default.nix
similarity index 100%
rename from kinetic/fanuc-driver/default.nix
rename to distros/kinetic/fanuc-driver/default.nix
diff --git a/kinetic/fanuc-lrmate200i-support/default.nix b/distros/kinetic/fanuc-lrmate200i-support/default.nix
similarity index 100%
rename from kinetic/fanuc-lrmate200i-support/default.nix
rename to distros/kinetic/fanuc-lrmate200i-support/default.nix
diff --git a/kinetic/fanuc-lrmate200ib-support/default.nix b/distros/kinetic/fanuc-lrmate200ib-support/default.nix
similarity index 100%
rename from kinetic/fanuc-lrmate200ib-support/default.nix
rename to distros/kinetic/fanuc-lrmate200ib-support/default.nix
diff --git a/kinetic/fanuc-lrmate200ic-support/default.nix b/distros/kinetic/fanuc-lrmate200ic-support/default.nix
similarity index 100%
rename from kinetic/fanuc-lrmate200ic-support/default.nix
rename to distros/kinetic/fanuc-lrmate200ic-support/default.nix
diff --git a/kinetic/fanuc-m10ia-support/default.nix b/distros/kinetic/fanuc-m10ia-support/default.nix
similarity index 100%
rename from kinetic/fanuc-m10ia-support/default.nix
rename to distros/kinetic/fanuc-m10ia-support/default.nix
diff --git a/kinetic/fanuc-m16ib-support/default.nix b/distros/kinetic/fanuc-m16ib-support/default.nix
similarity index 100%
rename from kinetic/fanuc-m16ib-support/default.nix
rename to distros/kinetic/fanuc-m16ib-support/default.nix
diff --git a/kinetic/fanuc-m20ia-support/default.nix b/distros/kinetic/fanuc-m20ia-support/default.nix
similarity index 100%
rename from kinetic/fanuc-m20ia-support/default.nix
rename to distros/kinetic/fanuc-m20ia-support/default.nix
diff --git a/kinetic/fanuc-m20ib-support/default.nix b/distros/kinetic/fanuc-m20ib-support/default.nix
similarity index 100%
rename from kinetic/fanuc-m20ib-support/default.nix
rename to distros/kinetic/fanuc-m20ib-support/default.nix
diff --git a/kinetic/fanuc-m430ia-support/default.nix b/distros/kinetic/fanuc-m430ia-support/default.nix
similarity index 100%
rename from kinetic/fanuc-m430ia-support/default.nix
rename to distros/kinetic/fanuc-m430ia-support/default.nix
diff --git a/kinetic/fanuc-m6ib-support/default.nix b/distros/kinetic/fanuc-m6ib-support/default.nix
similarity index 100%
rename from kinetic/fanuc-m6ib-support/default.nix
rename to distros/kinetic/fanuc-m6ib-support/default.nix
diff --git a/kinetic/fanuc-m710ic-support/default.nix b/distros/kinetic/fanuc-m710ic-support/default.nix
similarity index 100%
rename from kinetic/fanuc-m710ic-support/default.nix
rename to distros/kinetic/fanuc-m710ic-support/default.nix
diff --git a/kinetic/fanuc-m900ia-support/default.nix b/distros/kinetic/fanuc-m900ia-support/default.nix
similarity index 100%
rename from kinetic/fanuc-m900ia-support/default.nix
rename to distros/kinetic/fanuc-m900ia-support/default.nix
diff --git a/kinetic/fanuc-m900ib-support/default.nix b/distros/kinetic/fanuc-m900ib-support/default.nix
similarity index 100%
rename from kinetic/fanuc-m900ib-support/default.nix
rename to distros/kinetic/fanuc-m900ib-support/default.nix
diff --git a/kinetic/fanuc-r1000ia-support/default.nix b/distros/kinetic/fanuc-r1000ia-support/default.nix
similarity index 100%
rename from kinetic/fanuc-r1000ia-support/default.nix
rename to distros/kinetic/fanuc-r1000ia-support/default.nix
diff --git a/kinetic/fanuc-resources/default.nix b/distros/kinetic/fanuc-resources/default.nix
similarity index 100%
rename from kinetic/fanuc-resources/default.nix
rename to distros/kinetic/fanuc-resources/default.nix
diff --git a/kinetic/feed-the-troll-msgs/default.nix b/distros/kinetic/feed-the-troll-msgs/default.nix
similarity index 100%
rename from kinetic/feed-the-troll-msgs/default.nix
rename to distros/kinetic/feed-the-troll-msgs/default.nix
diff --git a/kinetic/feed-the-troll/default.nix b/distros/kinetic/feed-the-troll/default.nix
similarity index 100%
rename from kinetic/feed-the-troll/default.nix
rename to distros/kinetic/feed-the-troll/default.nix
diff --git a/kinetic/fetch-calibration/default.nix b/distros/kinetic/fetch-calibration/default.nix
similarity index 100%
rename from kinetic/fetch-calibration/default.nix
rename to distros/kinetic/fetch-calibration/default.nix
diff --git a/kinetic/fetch-depth-layer/default.nix b/distros/kinetic/fetch-depth-layer/default.nix
similarity index 100%
rename from kinetic/fetch-depth-layer/default.nix
rename to distros/kinetic/fetch-depth-layer/default.nix
diff --git a/kinetic/fetch-description/default.nix b/distros/kinetic/fetch-description/default.nix
similarity index 100%
rename from kinetic/fetch-description/default.nix
rename to distros/kinetic/fetch-description/default.nix
diff --git a/kinetic/fetch-gazebo-demo/default.nix b/distros/kinetic/fetch-gazebo-demo/default.nix
similarity index 100%
rename from kinetic/fetch-gazebo-demo/default.nix
rename to distros/kinetic/fetch-gazebo-demo/default.nix
diff --git a/kinetic/fetch-gazebo/default.nix b/distros/kinetic/fetch-gazebo/default.nix
similarity index 100%
rename from kinetic/fetch-gazebo/default.nix
rename to distros/kinetic/fetch-gazebo/default.nix
diff --git a/kinetic/fetch-ikfast-plugin/default.nix b/distros/kinetic/fetch-ikfast-plugin/default.nix
similarity index 100%
rename from kinetic/fetch-ikfast-plugin/default.nix
rename to distros/kinetic/fetch-ikfast-plugin/default.nix
diff --git a/kinetic/fetch-maps/default.nix b/distros/kinetic/fetch-maps/default.nix
similarity index 100%
rename from kinetic/fetch-maps/default.nix
rename to distros/kinetic/fetch-maps/default.nix
diff --git a/kinetic/fetch-moveit-config/default.nix b/distros/kinetic/fetch-moveit-config/default.nix
similarity index 100%
rename from kinetic/fetch-moveit-config/default.nix
rename to distros/kinetic/fetch-moveit-config/default.nix
diff --git a/kinetic/fetch-navigation/default.nix b/distros/kinetic/fetch-navigation/default.nix
similarity index 100%
rename from kinetic/fetch-navigation/default.nix
rename to distros/kinetic/fetch-navigation/default.nix
diff --git a/kinetic/fetch-ros/default.nix b/distros/kinetic/fetch-ros/default.nix
similarity index 100%
rename from kinetic/fetch-ros/default.nix
rename to distros/kinetic/fetch-ros/default.nix
diff --git a/kinetic/fetch-simulation/default.nix b/distros/kinetic/fetch-simulation/default.nix
similarity index 100%
rename from kinetic/fetch-simulation/default.nix
rename to distros/kinetic/fetch-simulation/default.nix
diff --git a/kinetic/fetch-teleop/default.nix b/distros/kinetic/fetch-teleop/default.nix
similarity index 100%
rename from kinetic/fetch-teleop/default.nix
rename to distros/kinetic/fetch-teleop/default.nix
diff --git a/kinetic/fetchit-challenge/default.nix b/distros/kinetic/fetchit-challenge/default.nix
similarity index 100%
rename from kinetic/fetchit-challenge/default.nix
rename to distros/kinetic/fetchit-challenge/default.nix
diff --git a/kinetic/ff/default.nix b/distros/kinetic/ff/default.nix
similarity index 100%
rename from kinetic/ff/default.nix
rename to distros/kinetic/ff/default.nix
diff --git a/kinetic/ffha/default.nix b/distros/kinetic/ffha/default.nix
similarity index 100%
rename from kinetic/ffha/default.nix
rename to distros/kinetic/ffha/default.nix
diff --git a/kinetic/fiducial-msgs/default.nix b/distros/kinetic/fiducial-msgs/default.nix
similarity index 100%
rename from kinetic/fiducial-msgs/default.nix
rename to distros/kinetic/fiducial-msgs/default.nix
diff --git a/kinetic/fiducial-slam/default.nix b/distros/kinetic/fiducial-slam/default.nix
similarity index 100%
rename from kinetic/fiducial-slam/default.nix
rename to distros/kinetic/fiducial-slam/default.nix
diff --git a/kinetic/fiducials/default.nix b/distros/kinetic/fiducials/default.nix
similarity index 100%
rename from kinetic/fiducials/default.nix
rename to distros/kinetic/fiducials/default.nix
diff --git a/kinetic/file-management/default.nix b/distros/kinetic/file-management/default.nix
similarity index 100%
rename from kinetic/file-management/default.nix
rename to distros/kinetic/file-management/default.nix
diff --git a/kinetic/filters/default.nix b/distros/kinetic/filters/default.nix
similarity index 100%
rename from kinetic/filters/default.nix
rename to distros/kinetic/filters/default.nix
diff --git a/kinetic/find-object-2d/default.nix b/distros/kinetic/find-object-2d/default.nix
similarity index 100%
rename from kinetic/find-object-2d/default.nix
rename to distros/kinetic/find-object-2d/default.nix
diff --git a/kinetic/fingertip-pressure/default.nix b/distros/kinetic/fingertip-pressure/default.nix
similarity index 100%
rename from kinetic/fingertip-pressure/default.nix
rename to distros/kinetic/fingertip-pressure/default.nix
diff --git a/kinetic/fkie-potree-rviz-plugin/default.nix b/distros/kinetic/fkie-potree-rviz-plugin/default.nix
similarity index 100%
rename from kinetic/fkie-potree-rviz-plugin/default.nix
rename to distros/kinetic/fkie-potree-rviz-plugin/default.nix
diff --git a/kinetic/flask-cors/default.nix b/distros/kinetic/flask-cors/default.nix
similarity index 100%
rename from kinetic/flask-cors/default.nix
rename to distros/kinetic/flask-cors/default.nix
diff --git a/kinetic/flask-reverse-proxy/default.nix b/distros/kinetic/flask-reverse-proxy/default.nix
similarity index 100%
rename from kinetic/flask-reverse-proxy/default.nix
rename to distros/kinetic/flask-reverse-proxy/default.nix
diff --git a/kinetic/flatbuffers/default.nix b/distros/kinetic/flatbuffers/default.nix
similarity index 100%
rename from kinetic/flatbuffers/default.nix
rename to distros/kinetic/flatbuffers/default.nix
diff --git a/kinetic/flexbe-behavior-engine/default.nix b/distros/kinetic/flexbe-behavior-engine/default.nix
similarity index 100%
rename from kinetic/flexbe-behavior-engine/default.nix
rename to distros/kinetic/flexbe-behavior-engine/default.nix
diff --git a/kinetic/flexbe-core/default.nix b/distros/kinetic/flexbe-core/default.nix
similarity index 100%
rename from kinetic/flexbe-core/default.nix
rename to distros/kinetic/flexbe-core/default.nix
diff --git a/kinetic/flexbe-input/default.nix b/distros/kinetic/flexbe-input/default.nix
similarity index 100%
rename from kinetic/flexbe-input/default.nix
rename to distros/kinetic/flexbe-input/default.nix
diff --git a/kinetic/flexbe-mirror/default.nix b/distros/kinetic/flexbe-mirror/default.nix
similarity index 100%
rename from kinetic/flexbe-mirror/default.nix
rename to distros/kinetic/flexbe-mirror/default.nix
diff --git a/kinetic/flexbe-msgs/default.nix b/distros/kinetic/flexbe-msgs/default.nix
similarity index 100%
rename from kinetic/flexbe-msgs/default.nix
rename to distros/kinetic/flexbe-msgs/default.nix
diff --git a/kinetic/flexbe-onboard/default.nix b/distros/kinetic/flexbe-onboard/default.nix
similarity index 100%
rename from kinetic/flexbe-onboard/default.nix
rename to distros/kinetic/flexbe-onboard/default.nix
diff --git a/kinetic/flexbe-states/default.nix b/distros/kinetic/flexbe-states/default.nix
similarity index 100%
rename from kinetic/flexbe-states/default.nix
rename to distros/kinetic/flexbe-states/default.nix
diff --git a/kinetic/flexbe-testing/default.nix b/distros/kinetic/flexbe-testing/default.nix
similarity index 100%
rename from kinetic/flexbe-testing/default.nix
rename to distros/kinetic/flexbe-testing/default.nix
diff --git a/kinetic/flexbe-widget/default.nix b/distros/kinetic/flexbe-widget/default.nix
similarity index 100%
rename from kinetic/flexbe-widget/default.nix
rename to distros/kinetic/flexbe-widget/default.nix
diff --git a/kinetic/flir-boson-usb/default.nix b/distros/kinetic/flir-boson-usb/default.nix
similarity index 100%
rename from kinetic/flir-boson-usb/default.nix
rename to distros/kinetic/flir-boson-usb/default.nix
diff --git a/kinetic/flir-ptu-description/default.nix b/distros/kinetic/flir-ptu-description/default.nix
similarity index 100%
rename from kinetic/flir-ptu-description/default.nix
rename to distros/kinetic/flir-ptu-description/default.nix
diff --git a/kinetic/flir-ptu-driver/default.nix b/distros/kinetic/flir-ptu-driver/default.nix
similarity index 100%
rename from kinetic/flir-ptu-driver/default.nix
rename to distros/kinetic/flir-ptu-driver/default.nix
diff --git a/kinetic/flir-ptu-viz/default.nix b/distros/kinetic/flir-ptu-viz/default.nix
similarity index 100%
rename from kinetic/flir-ptu-viz/default.nix
rename to distros/kinetic/flir-ptu-viz/default.nix
diff --git a/kinetic/follow-waypoints/default.nix b/distros/kinetic/follow-waypoints/default.nix
similarity index 100%
rename from kinetic/follow-waypoints/default.nix
rename to distros/kinetic/follow-waypoints/default.nix
diff --git a/kinetic/footstep-planner/default.nix b/distros/kinetic/footstep-planner/default.nix
similarity index 100%
rename from kinetic/footstep-planner/default.nix
rename to distros/kinetic/footstep-planner/default.nix
diff --git a/kinetic/force-torque-sensor-controller/default.nix b/distros/kinetic/force-torque-sensor-controller/default.nix
similarity index 100%
rename from kinetic/force-torque-sensor-controller/default.nix
rename to distros/kinetic/force-torque-sensor-controller/default.nix
diff --git a/kinetic/force-torque-sensor/default.nix b/distros/kinetic/force-torque-sensor/default.nix
similarity index 100%
rename from kinetic/force-torque-sensor/default.nix
rename to distros/kinetic/force-torque-sensor/default.nix
diff --git a/kinetic/forward-command-controller/default.nix b/distros/kinetic/forward-command-controller/default.nix
similarity index 100%
rename from kinetic/forward-command-controller/default.nix
rename to distros/kinetic/forward-command-controller/default.nix
diff --git a/kinetic/four-wheel-steering-controller/default.nix b/distros/kinetic/four-wheel-steering-controller/default.nix
similarity index 100%
rename from kinetic/four-wheel-steering-controller/default.nix
rename to distros/kinetic/four-wheel-steering-controller/default.nix
diff --git a/kinetic/four-wheel-steering-msgs/default.nix b/distros/kinetic/four-wheel-steering-msgs/default.nix
similarity index 100%
rename from kinetic/four-wheel-steering-msgs/default.nix
rename to distros/kinetic/four-wheel-steering-msgs/default.nix
diff --git a/kinetic/frame-editor/default.nix b/distros/kinetic/frame-editor/default.nix
similarity index 100%
rename from kinetic/frame-editor/default.nix
rename to distros/kinetic/frame-editor/default.nix
diff --git a/kinetic/franka-control/default.nix b/distros/kinetic/franka-control/default.nix
similarity index 100%
rename from kinetic/franka-control/default.nix
rename to distros/kinetic/franka-control/default.nix
diff --git a/kinetic/franka-description/default.nix b/distros/kinetic/franka-description/default.nix
similarity index 100%
rename from kinetic/franka-description/default.nix
rename to distros/kinetic/franka-description/default.nix
diff --git a/kinetic/franka-example-controllers/default.nix b/distros/kinetic/franka-example-controllers/default.nix
similarity index 100%
rename from kinetic/franka-example-controllers/default.nix
rename to distros/kinetic/franka-example-controllers/default.nix
diff --git a/kinetic/franka-gripper/default.nix b/distros/kinetic/franka-gripper/default.nix
similarity index 100%
rename from kinetic/franka-gripper/default.nix
rename to distros/kinetic/franka-gripper/default.nix
diff --git a/kinetic/franka-hw/default.nix b/distros/kinetic/franka-hw/default.nix
similarity index 100%
rename from kinetic/franka-hw/default.nix
rename to distros/kinetic/franka-hw/default.nix
diff --git a/kinetic/franka-msgs/default.nix b/distros/kinetic/franka-msgs/default.nix
similarity index 100%
rename from kinetic/franka-msgs/default.nix
rename to distros/kinetic/franka-msgs/default.nix
diff --git a/kinetic/franka-ros/default.nix b/distros/kinetic/franka-ros/default.nix
similarity index 100%
rename from kinetic/franka-ros/default.nix
rename to distros/kinetic/franka-ros/default.nix
diff --git a/kinetic/franka-visualization/default.nix b/distros/kinetic/franka-visualization/default.nix
similarity index 100%
rename from kinetic/franka-visualization/default.nix
rename to distros/kinetic/franka-visualization/default.nix
diff --git a/kinetic/freenect-camera/default.nix b/distros/kinetic/freenect-camera/default.nix
similarity index 100%
rename from kinetic/freenect-camera/default.nix
rename to distros/kinetic/freenect-camera/default.nix
diff --git a/kinetic/freenect-launch/default.nix b/distros/kinetic/freenect-launch/default.nix
similarity index 100%
rename from kinetic/freenect-launch/default.nix
rename to distros/kinetic/freenect-launch/default.nix
diff --git a/kinetic/freenect-stack/default.nix b/distros/kinetic/freenect-stack/default.nix
similarity index 100%
rename from kinetic/freenect-stack/default.nix
rename to distros/kinetic/freenect-stack/default.nix
diff --git a/kinetic/frontier-exploration/default.nix b/distros/kinetic/frontier-exploration/default.nix
similarity index 100%
rename from kinetic/frontier-exploration/default.nix
rename to distros/kinetic/frontier-exploration/default.nix
diff --git a/kinetic/fsrobo-r-bringup/default.nix b/distros/kinetic/fsrobo-r-bringup/default.nix
similarity index 100%
rename from kinetic/fsrobo-r-bringup/default.nix
rename to distros/kinetic/fsrobo-r-bringup/default.nix
diff --git a/kinetic/fsrobo-r-description/default.nix b/distros/kinetic/fsrobo-r-description/default.nix
similarity index 100%
rename from kinetic/fsrobo-r-description/default.nix
rename to distros/kinetic/fsrobo-r-description/default.nix
diff --git a/kinetic/fsrobo-r-driver/default.nix b/distros/kinetic/fsrobo-r-driver/default.nix
similarity index 100%
rename from kinetic/fsrobo-r-driver/default.nix
rename to distros/kinetic/fsrobo-r-driver/default.nix
diff --git a/kinetic/fsrobo-r-moveit-config/default.nix b/distros/kinetic/fsrobo-r-moveit-config/default.nix
similarity index 100%
rename from kinetic/fsrobo-r-moveit-config/default.nix
rename to distros/kinetic/fsrobo-r-moveit-config/default.nix
diff --git a/kinetic/fsrobo-r-msgs/default.nix b/distros/kinetic/fsrobo-r-msgs/default.nix
similarity index 100%
rename from kinetic/fsrobo-r-msgs/default.nix
rename to distros/kinetic/fsrobo-r-msgs/default.nix
diff --git a/kinetic/fsrobo-r-trajectory-filters/default.nix b/distros/kinetic/fsrobo-r-trajectory-filters/default.nix
similarity index 100%
rename from kinetic/fsrobo-r-trajectory-filters/default.nix
rename to distros/kinetic/fsrobo-r-trajectory-filters/default.nix
diff --git a/kinetic/fsrobo-r/default.nix b/distros/kinetic/fsrobo-r/default.nix
similarity index 100%
rename from kinetic/fsrobo-r/default.nix
rename to distros/kinetic/fsrobo-r/default.nix
diff --git a/kinetic/ftm-msgs/default.nix b/distros/kinetic/ftm-msgs/default.nix
similarity index 100%
rename from kinetic/ftm-msgs/default.nix
rename to distros/kinetic/ftm-msgs/default.nix
diff --git a/kinetic/futaba-serial-servo/default.nix b/distros/kinetic/futaba-serial-servo/default.nix
similarity index 100%
rename from kinetic/futaba-serial-servo/default.nix
rename to distros/kinetic/futaba-serial-servo/default.nix
diff --git a/kinetic/fzi-icl-can/default.nix b/distros/kinetic/fzi-icl-can/default.nix
similarity index 100%
rename from kinetic/fzi-icl-can/default.nix
rename to distros/kinetic/fzi-icl-can/default.nix
diff --git a/kinetic/fzi-icl-comm/default.nix b/distros/kinetic/fzi-icl-comm/default.nix
similarity index 100%
rename from kinetic/fzi-icl-comm/default.nix
rename to distros/kinetic/fzi-icl-comm/default.nix
diff --git a/kinetic/fzi-icl-core/default.nix b/distros/kinetic/fzi-icl-core/default.nix
similarity index 100%
rename from kinetic/fzi-icl-core/default.nix
rename to distros/kinetic/fzi-icl-core/default.nix
diff --git a/kinetic/gateway-msgs/default.nix b/distros/kinetic/gateway-msgs/default.nix
similarity index 100%
rename from kinetic/gateway-msgs/default.nix
rename to distros/kinetic/gateway-msgs/default.nix
diff --git a/kinetic/gazebo-dev/default.nix b/distros/kinetic/gazebo-dev/default.nix
similarity index 100%
rename from kinetic/gazebo-dev/default.nix
rename to distros/kinetic/gazebo-dev/default.nix
diff --git a/kinetic/gazebo-msgs/default.nix b/distros/kinetic/gazebo-msgs/default.nix
similarity index 100%
rename from kinetic/gazebo-msgs/default.nix
rename to distros/kinetic/gazebo-msgs/default.nix
diff --git a/kinetic/gazebo-plugins/default.nix b/distros/kinetic/gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/gazebo-plugins/default.nix
rename to distros/kinetic/gazebo-plugins/default.nix
diff --git a/kinetic/gazebo-ros-control/default.nix b/distros/kinetic/gazebo-ros-control/default.nix
similarity index 100%
rename from kinetic/gazebo-ros-control/default.nix
rename to distros/kinetic/gazebo-ros-control/default.nix
diff --git a/kinetic/gazebo-ros-pkgs/default.nix b/distros/kinetic/gazebo-ros-pkgs/default.nix
similarity index 100%
rename from kinetic/gazebo-ros-pkgs/default.nix
rename to distros/kinetic/gazebo-ros-pkgs/default.nix
diff --git a/kinetic/gazebo-ros/default.nix b/distros/kinetic/gazebo-ros/default.nix
similarity index 100%
rename from kinetic/gazebo-ros/default.nix
rename to distros/kinetic/gazebo-ros/default.nix
diff --git a/kinetic/gcloud-speech-msgs/default.nix b/distros/kinetic/gcloud-speech-msgs/default.nix
similarity index 100%
rename from kinetic/gcloud-speech-msgs/default.nix
rename to distros/kinetic/gcloud-speech-msgs/default.nix
diff --git a/kinetic/gcloud-speech-utils/default.nix b/distros/kinetic/gcloud-speech-utils/default.nix
similarity index 100%
rename from kinetic/gcloud-speech-utils/default.nix
rename to distros/kinetic/gcloud-speech-utils/default.nix
diff --git a/kinetic/gcloud-speech/default.nix b/distros/kinetic/gcloud-speech/default.nix
similarity index 100%
rename from kinetic/gcloud-speech/default.nix
rename to distros/kinetic/gcloud-speech/default.nix
diff --git a/kinetic/gencpp/default.nix b/distros/kinetic/gencpp/default.nix
similarity index 100%
rename from kinetic/gencpp/default.nix
rename to distros/kinetic/gencpp/default.nix
diff --git a/kinetic/generated.nix b/distros/kinetic/generated.nix
similarity index 100%
rename from kinetic/generated.nix
rename to distros/kinetic/generated.nix
diff --git a/kinetic/generic-throttle/default.nix b/distros/kinetic/generic-throttle/default.nix
similarity index 100%
rename from kinetic/generic-throttle/default.nix
rename to distros/kinetic/generic-throttle/default.nix
diff --git a/kinetic/geneus/default.nix b/distros/kinetic/geneus/default.nix
similarity index 100%
rename from kinetic/geneus/default.nix
rename to distros/kinetic/geneus/default.nix
diff --git a/kinetic/genjava/default.nix b/distros/kinetic/genjava/default.nix
similarity index 100%
rename from kinetic/genjava/default.nix
rename to distros/kinetic/genjava/default.nix
diff --git a/kinetic/genlisp/default.nix b/distros/kinetic/genlisp/default.nix
similarity index 100%
rename from kinetic/genlisp/default.nix
rename to distros/kinetic/genlisp/default.nix
diff --git a/kinetic/genmsg/default.nix b/distros/kinetic/genmsg/default.nix
similarity index 100%
rename from kinetic/genmsg/default.nix
rename to distros/kinetic/genmsg/default.nix
diff --git a/kinetic/gennodejs/default.nix b/distros/kinetic/gennodejs/default.nix
similarity index 100%
rename from kinetic/gennodejs/default.nix
rename to distros/kinetic/gennodejs/default.nix
diff --git a/kinetic/genpy/default.nix b/distros/kinetic/genpy/default.nix
similarity index 100%
rename from kinetic/genpy/default.nix
rename to distros/kinetic/genpy/default.nix
diff --git a/kinetic/genrs/default.nix b/distros/kinetic/genrs/default.nix
similarity index 100%
rename from kinetic/genrs/default.nix
rename to distros/kinetic/genrs/default.nix
diff --git a/kinetic/geodesy/default.nix b/distros/kinetic/geodesy/default.nix
similarity index 100%
rename from kinetic/geodesy/default.nix
rename to distros/kinetic/geodesy/default.nix
diff --git a/kinetic/geographic-info/default.nix b/distros/kinetic/geographic-info/default.nix
similarity index 100%
rename from kinetic/geographic-info/default.nix
rename to distros/kinetic/geographic-info/default.nix
diff --git a/kinetic/geographic-msgs/default.nix b/distros/kinetic/geographic-msgs/default.nix
similarity index 100%
rename from kinetic/geographic-msgs/default.nix
rename to distros/kinetic/geographic-msgs/default.nix
diff --git a/kinetic/geometric-shapes/default.nix b/distros/kinetic/geometric-shapes/default.nix
similarity index 100%
rename from kinetic/geometric-shapes/default.nix
rename to distros/kinetic/geometric-shapes/default.nix
diff --git a/kinetic/geometry-msgs/default.nix b/distros/kinetic/geometry-msgs/default.nix
similarity index 100%
rename from kinetic/geometry-msgs/default.nix
rename to distros/kinetic/geometry-msgs/default.nix
diff --git a/kinetic/geometry-tutorials/default.nix b/distros/kinetic/geometry-tutorials/default.nix
similarity index 100%
rename from kinetic/geometry-tutorials/default.nix
rename to distros/kinetic/geometry-tutorials/default.nix
diff --git a/kinetic/geometry/default.nix b/distros/kinetic/geometry/default.nix
similarity index 100%
rename from kinetic/geometry/default.nix
rename to distros/kinetic/geometry/default.nix
diff --git a/kinetic/geometry2/default.nix b/distros/kinetic/geometry2/default.nix
similarity index 100%
rename from kinetic/geometry2/default.nix
rename to distros/kinetic/geometry2/default.nix
diff --git a/kinetic/gl-dependency/default.nix b/distros/kinetic/gl-dependency/default.nix
similarity index 100%
rename from kinetic/gl-dependency/default.nix
rename to distros/kinetic/gl-dependency/default.nix
diff --git a/kinetic/glkh-solver/default.nix b/distros/kinetic/glkh-solver/default.nix
similarity index 100%
rename from kinetic/glkh-solver/default.nix
rename to distros/kinetic/glkh-solver/default.nix
diff --git a/kinetic/global-planner-tests/default.nix b/distros/kinetic/global-planner-tests/default.nix
similarity index 100%
rename from kinetic/global-planner-tests/default.nix
rename to distros/kinetic/global-planner-tests/default.nix
diff --git a/kinetic/global-planner/default.nix b/distros/kinetic/global-planner/default.nix
similarity index 100%
rename from kinetic/global-planner/default.nix
rename to distros/kinetic/global-planner/default.nix
diff --git a/kinetic/gmapping/default.nix b/distros/kinetic/gmapping/default.nix
similarity index 100%
rename from kinetic/gmapping/default.nix
rename to distros/kinetic/gmapping/default.nix
diff --git a/kinetic/gmplot-msgs/default.nix b/distros/kinetic/gmplot-msgs/default.nix
similarity index 100%
rename from kinetic/gmplot-msgs/default.nix
rename to distros/kinetic/gmplot-msgs/default.nix
diff --git a/kinetic/gmplot-ros/default.nix b/distros/kinetic/gmplot-ros/default.nix
similarity index 100%
rename from kinetic/gmplot-ros/default.nix
rename to distros/kinetic/gmplot-ros/default.nix
diff --git a/kinetic/gmplot/default.nix b/distros/kinetic/gmplot/default.nix
similarity index 100%
rename from kinetic/gmplot/default.nix
rename to distros/kinetic/gmplot/default.nix
diff --git a/kinetic/goal-passer/default.nix b/distros/kinetic/goal-passer/default.nix
similarity index 100%
rename from kinetic/goal-passer/default.nix
rename to distros/kinetic/goal-passer/default.nix
diff --git a/kinetic/gps-common/default.nix b/distros/kinetic/gps-common/default.nix
similarity index 100%
rename from kinetic/gps-common/default.nix
rename to distros/kinetic/gps-common/default.nix
diff --git a/kinetic/gps-umd/default.nix b/distros/kinetic/gps-umd/default.nix
similarity index 100%
rename from kinetic/gps-umd/default.nix
rename to distros/kinetic/gps-umd/default.nix
diff --git a/kinetic/gpsd-client/default.nix b/distros/kinetic/gpsd-client/default.nix
similarity index 100%
rename from kinetic/gpsd-client/default.nix
rename to distros/kinetic/gpsd-client/default.nix
diff --git a/kinetic/graph-msgs/default.nix b/distros/kinetic/graph-msgs/default.nix
similarity index 100%
rename from kinetic/graph-msgs/default.nix
rename to distros/kinetic/graph-msgs/default.nix
diff --git a/kinetic/grasping-msgs/default.nix b/distros/kinetic/grasping-msgs/default.nix
similarity index 100%
rename from kinetic/grasping-msgs/default.nix
rename to distros/kinetic/grasping-msgs/default.nix
diff --git a/kinetic/grid-map-core/default.nix b/distros/kinetic/grid-map-core/default.nix
similarity index 100%
rename from kinetic/grid-map-core/default.nix
rename to distros/kinetic/grid-map-core/default.nix
diff --git a/kinetic/grid-map-costmap-2d/default.nix b/distros/kinetic/grid-map-costmap-2d/default.nix
similarity index 100%
rename from kinetic/grid-map-costmap-2d/default.nix
rename to distros/kinetic/grid-map-costmap-2d/default.nix
diff --git a/kinetic/grid-map-cv/default.nix b/distros/kinetic/grid-map-cv/default.nix
similarity index 100%
rename from kinetic/grid-map-cv/default.nix
rename to distros/kinetic/grid-map-cv/default.nix
diff --git a/kinetic/grid-map-demos/default.nix b/distros/kinetic/grid-map-demos/default.nix
similarity index 100%
rename from kinetic/grid-map-demos/default.nix
rename to distros/kinetic/grid-map-demos/default.nix
diff --git a/kinetic/grid-map-filters/default.nix b/distros/kinetic/grid-map-filters/default.nix
similarity index 100%
rename from kinetic/grid-map-filters/default.nix
rename to distros/kinetic/grid-map-filters/default.nix
diff --git a/kinetic/grid-map-loader/default.nix b/distros/kinetic/grid-map-loader/default.nix
similarity index 100%
rename from kinetic/grid-map-loader/default.nix
rename to distros/kinetic/grid-map-loader/default.nix
diff --git a/kinetic/grid-map-msgs/default.nix b/distros/kinetic/grid-map-msgs/default.nix
similarity index 100%
rename from kinetic/grid-map-msgs/default.nix
rename to distros/kinetic/grid-map-msgs/default.nix
diff --git a/kinetic/grid-map-octomap/default.nix b/distros/kinetic/grid-map-octomap/default.nix
similarity index 100%
rename from kinetic/grid-map-octomap/default.nix
rename to distros/kinetic/grid-map-octomap/default.nix
diff --git a/kinetic/grid-map-pcl/default.nix b/distros/kinetic/grid-map-pcl/default.nix
similarity index 100%
rename from kinetic/grid-map-pcl/default.nix
rename to distros/kinetic/grid-map-pcl/default.nix
diff --git a/kinetic/grid-map-ros/default.nix b/distros/kinetic/grid-map-ros/default.nix
similarity index 100%
rename from kinetic/grid-map-ros/default.nix
rename to distros/kinetic/grid-map-ros/default.nix
diff --git a/kinetic/grid-map-rviz-plugin/default.nix b/distros/kinetic/grid-map-rviz-plugin/default.nix
similarity index 100%
rename from kinetic/grid-map-rviz-plugin/default.nix
rename to distros/kinetic/grid-map-rviz-plugin/default.nix
diff --git a/kinetic/grid-map-sdf/default.nix b/distros/kinetic/grid-map-sdf/default.nix
similarity index 100%
rename from kinetic/grid-map-sdf/default.nix
rename to distros/kinetic/grid-map-sdf/default.nix
diff --git a/kinetic/grid-map-visualization/default.nix b/distros/kinetic/grid-map-visualization/default.nix
similarity index 100%
rename from kinetic/grid-map-visualization/default.nix
rename to distros/kinetic/grid-map-visualization/default.nix
diff --git a/kinetic/grid-map/default.nix b/distros/kinetic/grid-map/default.nix
similarity index 100%
rename from kinetic/grid-map/default.nix
rename to distros/kinetic/grid-map/default.nix
diff --git a/kinetic/gridmap-2d/default.nix b/distros/kinetic/gridmap-2d/default.nix
similarity index 100%
rename from kinetic/gridmap-2d/default.nix
rename to distros/kinetic/gridmap-2d/default.nix
diff --git a/kinetic/gripper-action-controller/default.nix b/distros/kinetic/gripper-action-controller/default.nix
similarity index 100%
rename from kinetic/gripper-action-controller/default.nix
rename to distros/kinetic/gripper-action-controller/default.nix
diff --git a/kinetic/grizzly-control/default.nix b/distros/kinetic/grizzly-control/default.nix
similarity index 100%
rename from kinetic/grizzly-control/default.nix
rename to distros/kinetic/grizzly-control/default.nix
diff --git a/kinetic/grizzly-description/default.nix b/distros/kinetic/grizzly-description/default.nix
similarity index 100%
rename from kinetic/grizzly-description/default.nix
rename to distros/kinetic/grizzly-description/default.nix
diff --git a/kinetic/grizzly-desktop/default.nix b/distros/kinetic/grizzly-desktop/default.nix
similarity index 100%
rename from kinetic/grizzly-desktop/default.nix
rename to distros/kinetic/grizzly-desktop/default.nix
diff --git a/kinetic/grizzly-gazebo/default.nix b/distros/kinetic/grizzly-gazebo/default.nix
similarity index 100%
rename from kinetic/grizzly-gazebo/default.nix
rename to distros/kinetic/grizzly-gazebo/default.nix
diff --git a/kinetic/grizzly-msgs/default.nix b/distros/kinetic/grizzly-msgs/default.nix
similarity index 100%
rename from kinetic/grizzly-msgs/default.nix
rename to distros/kinetic/grizzly-msgs/default.nix
diff --git a/kinetic/grizzly-navigation/default.nix b/distros/kinetic/grizzly-navigation/default.nix
similarity index 100%
rename from kinetic/grizzly-navigation/default.nix
rename to distros/kinetic/grizzly-navigation/default.nix
diff --git a/kinetic/grizzly-simulator/default.nix b/distros/kinetic/grizzly-simulator/default.nix
similarity index 100%
rename from kinetic/grizzly-simulator/default.nix
rename to distros/kinetic/grizzly-simulator/default.nix
diff --git a/kinetic/grizzly-viz/default.nix b/distros/kinetic/grizzly-viz/default.nix
similarity index 100%
rename from kinetic/grizzly-viz/default.nix
rename to distros/kinetic/grizzly-viz/default.nix
diff --git a/kinetic/grpc/default.nix b/distros/kinetic/grpc/default.nix
similarity index 100%
rename from kinetic/grpc/default.nix
rename to distros/kinetic/grpc/default.nix
diff --git a/kinetic/gscam/default.nix b/distros/kinetic/gscam/default.nix
similarity index 100%
rename from kinetic/gscam/default.nix
rename to distros/kinetic/gscam/default.nix
diff --git a/kinetic/gx-sound-msgs/default.nix b/distros/kinetic/gx-sound-msgs/default.nix
similarity index 100%
rename from kinetic/gx-sound-msgs/default.nix
rename to distros/kinetic/gx-sound-msgs/default.nix
diff --git a/kinetic/gx-sound-player/default.nix b/distros/kinetic/gx-sound-player/default.nix
similarity index 100%
rename from kinetic/gx-sound-player/default.nix
rename to distros/kinetic/gx-sound-player/default.nix
diff --git a/kinetic/gx-sound/default.nix b/distros/kinetic/gx-sound/default.nix
similarity index 100%
rename from kinetic/gx-sound/default.nix
rename to distros/kinetic/gx-sound/default.nix
diff --git a/kinetic/h264-encoder-core/default.nix b/distros/kinetic/h264-encoder-core/default.nix
similarity index 100%
rename from kinetic/h264-encoder-core/default.nix
rename to distros/kinetic/h264-encoder-core/default.nix
diff --git a/kinetic/h264-video-encoder/default.nix b/distros/kinetic/h264-video-encoder/default.nix
similarity index 100%
rename from kinetic/h264-video-encoder/default.nix
rename to distros/kinetic/h264-video-encoder/default.nix
diff --git a/kinetic/handeye/default.nix b/distros/kinetic/handeye/default.nix
similarity index 100%
rename from kinetic/handeye/default.nix
rename to distros/kinetic/handeye/default.nix
diff --git a/kinetic/handle-detector/default.nix b/distros/kinetic/handle-detector/default.nix
similarity index 100%
rename from kinetic/handle-detector/default.nix
rename to distros/kinetic/handle-detector/default.nix
diff --git a/kinetic/hardware-interface/default.nix b/distros/kinetic/hardware-interface/default.nix
similarity index 100%
rename from kinetic/hardware-interface/default.nix
rename to distros/kinetic/hardware-interface/default.nix
diff --git a/kinetic/haros-catkin/default.nix b/distros/kinetic/haros-catkin/default.nix
similarity index 100%
rename from kinetic/haros-catkin/default.nix
rename to distros/kinetic/haros-catkin/default.nix
diff --git a/kinetic/health-metric-collector/default.nix b/distros/kinetic/health-metric-collector/default.nix
similarity index 100%
rename from kinetic/health-metric-collector/default.nix
rename to distros/kinetic/health-metric-collector/default.nix
diff --git a/kinetic/hebi-cpp-api/default.nix b/distros/kinetic/hebi-cpp-api/default.nix
similarity index 100%
rename from kinetic/hebi-cpp-api/default.nix
rename to distros/kinetic/hebi-cpp-api/default.nix
diff --git a/kinetic/hebi-description/default.nix b/distros/kinetic/hebi-description/default.nix
similarity index 100%
rename from kinetic/hebi-description/default.nix
rename to distros/kinetic/hebi-description/default.nix
diff --git a/kinetic/hebiros-description/default.nix b/distros/kinetic/hebiros-description/default.nix
similarity index 100%
rename from kinetic/hebiros-description/default.nix
rename to distros/kinetic/hebiros-description/default.nix
diff --git a/kinetic/hector-components-description/default.nix b/distros/kinetic/hector-components-description/default.nix
similarity index 100%
rename from kinetic/hector-components-description/default.nix
rename to distros/kinetic/hector-components-description/default.nix
diff --git a/kinetic/hector-compressed-map-transport/default.nix b/distros/kinetic/hector-compressed-map-transport/default.nix
similarity index 100%
rename from kinetic/hector-compressed-map-transport/default.nix
rename to distros/kinetic/hector-compressed-map-transport/default.nix
diff --git a/kinetic/hector-gazebo-plugins/default.nix b/distros/kinetic/hector-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/hector-gazebo-plugins/default.nix
rename to distros/kinetic/hector-gazebo-plugins/default.nix
diff --git a/kinetic/hector-gazebo-thermal-camera/default.nix b/distros/kinetic/hector-gazebo-thermal-camera/default.nix
similarity index 100%
rename from kinetic/hector-gazebo-thermal-camera/default.nix
rename to distros/kinetic/hector-gazebo-thermal-camera/default.nix
diff --git a/kinetic/hector-gazebo-worlds/default.nix b/distros/kinetic/hector-gazebo-worlds/default.nix
similarity index 100%
rename from kinetic/hector-gazebo-worlds/default.nix
rename to distros/kinetic/hector-gazebo-worlds/default.nix
diff --git a/kinetic/hector-gazebo/default.nix b/distros/kinetic/hector-gazebo/default.nix
similarity index 100%
rename from kinetic/hector-gazebo/default.nix
rename to distros/kinetic/hector-gazebo/default.nix
diff --git a/kinetic/hector-geotiff-plugins/default.nix b/distros/kinetic/hector-geotiff-plugins/default.nix
similarity index 100%
rename from kinetic/hector-geotiff-plugins/default.nix
rename to distros/kinetic/hector-geotiff-plugins/default.nix
diff --git a/kinetic/hector-geotiff/default.nix b/distros/kinetic/hector-geotiff/default.nix
similarity index 100%
rename from kinetic/hector-geotiff/default.nix
rename to distros/kinetic/hector-geotiff/default.nix
diff --git a/kinetic/hector-imu-attitude-to-tf/default.nix b/distros/kinetic/hector-imu-attitude-to-tf/default.nix
similarity index 100%
rename from kinetic/hector-imu-attitude-to-tf/default.nix
rename to distros/kinetic/hector-imu-attitude-to-tf/default.nix
diff --git a/kinetic/hector-imu-tools/default.nix b/distros/kinetic/hector-imu-tools/default.nix
similarity index 100%
rename from kinetic/hector-imu-tools/default.nix
rename to distros/kinetic/hector-imu-tools/default.nix
diff --git a/kinetic/hector-localization/default.nix b/distros/kinetic/hector-localization/default.nix
similarity index 100%
rename from kinetic/hector-localization/default.nix
rename to distros/kinetic/hector-localization/default.nix
diff --git a/kinetic/hector-map-server/default.nix b/distros/kinetic/hector-map-server/default.nix
similarity index 100%
rename from kinetic/hector-map-server/default.nix
rename to distros/kinetic/hector-map-server/default.nix
diff --git a/kinetic/hector-map-tools/default.nix b/distros/kinetic/hector-map-tools/default.nix
similarity index 100%
rename from kinetic/hector-map-tools/default.nix
rename to distros/kinetic/hector-map-tools/default.nix
diff --git a/kinetic/hector-mapping/default.nix b/distros/kinetic/hector-mapping/default.nix
similarity index 100%
rename from kinetic/hector-mapping/default.nix
rename to distros/kinetic/hector-mapping/default.nix
diff --git a/kinetic/hector-marker-drawing/default.nix b/distros/kinetic/hector-marker-drawing/default.nix
similarity index 100%
rename from kinetic/hector-marker-drawing/default.nix
rename to distros/kinetic/hector-marker-drawing/default.nix
diff --git a/kinetic/hector-models/default.nix b/distros/kinetic/hector-models/default.nix
similarity index 100%
rename from kinetic/hector-models/default.nix
rename to distros/kinetic/hector-models/default.nix
diff --git a/kinetic/hector-nav-msgs/default.nix b/distros/kinetic/hector-nav-msgs/default.nix
similarity index 100%
rename from kinetic/hector-nav-msgs/default.nix
rename to distros/kinetic/hector-nav-msgs/default.nix
diff --git a/kinetic/hector-object-tracker/default.nix b/distros/kinetic/hector-object-tracker/default.nix
similarity index 100%
rename from kinetic/hector-object-tracker/default.nix
rename to distros/kinetic/hector-object-tracker/default.nix
diff --git a/kinetic/hector-pose-estimation-core/default.nix b/distros/kinetic/hector-pose-estimation-core/default.nix
similarity index 100%
rename from kinetic/hector-pose-estimation-core/default.nix
rename to distros/kinetic/hector-pose-estimation-core/default.nix
diff --git a/kinetic/hector-pose-estimation/default.nix b/distros/kinetic/hector-pose-estimation/default.nix
similarity index 100%
rename from kinetic/hector-pose-estimation/default.nix
rename to distros/kinetic/hector-pose-estimation/default.nix
diff --git a/kinetic/hector-sensors-description/default.nix b/distros/kinetic/hector-sensors-description/default.nix
similarity index 100%
rename from kinetic/hector-sensors-description/default.nix
rename to distros/kinetic/hector-sensors-description/default.nix
diff --git a/kinetic/hector-sensors-gazebo/default.nix b/distros/kinetic/hector-sensors-gazebo/default.nix
similarity index 100%
rename from kinetic/hector-sensors-gazebo/default.nix
rename to distros/kinetic/hector-sensors-gazebo/default.nix
diff --git a/kinetic/hector-slam-launch/default.nix b/distros/kinetic/hector-slam-launch/default.nix
similarity index 100%
rename from kinetic/hector-slam-launch/default.nix
rename to distros/kinetic/hector-slam-launch/default.nix
diff --git a/kinetic/hector-slam/default.nix b/distros/kinetic/hector-slam/default.nix
similarity index 100%
rename from kinetic/hector-slam/default.nix
rename to distros/kinetic/hector-slam/default.nix
diff --git a/kinetic/hector-trajectory-server/default.nix b/distros/kinetic/hector-trajectory-server/default.nix
similarity index 100%
rename from kinetic/hector-trajectory-server/default.nix
rename to distros/kinetic/hector-trajectory-server/default.nix
diff --git a/kinetic/hector-worldmodel-geotiff-plugins/default.nix b/distros/kinetic/hector-worldmodel-geotiff-plugins/default.nix
similarity index 100%
rename from kinetic/hector-worldmodel-geotiff-plugins/default.nix
rename to distros/kinetic/hector-worldmodel-geotiff-plugins/default.nix
diff --git a/kinetic/hector-worldmodel-msgs/default.nix b/distros/kinetic/hector-worldmodel-msgs/default.nix
similarity index 100%
rename from kinetic/hector-worldmodel-msgs/default.nix
rename to distros/kinetic/hector-worldmodel-msgs/default.nix
diff --git a/kinetic/hector-worldmodel/default.nix b/distros/kinetic/hector-worldmodel/default.nix
similarity index 100%
rename from kinetic/hector-worldmodel/default.nix
rename to distros/kinetic/hector-worldmodel/default.nix
diff --git a/kinetic/hector-xacro-tools/default.nix b/distros/kinetic/hector-xacro-tools/default.nix
similarity index 100%
rename from kinetic/hector-xacro-tools/default.nix
rename to distros/kinetic/hector-xacro-tools/default.nix
diff --git a/kinetic/heron-control/default.nix b/distros/kinetic/heron-control/default.nix
similarity index 100%
rename from kinetic/heron-control/default.nix
rename to distros/kinetic/heron-control/default.nix
diff --git a/kinetic/heron-description/default.nix b/distros/kinetic/heron-description/default.nix
similarity index 100%
rename from kinetic/heron-description/default.nix
rename to distros/kinetic/heron-description/default.nix
diff --git a/kinetic/heron-desktop/default.nix b/distros/kinetic/heron-desktop/default.nix
similarity index 100%
rename from kinetic/heron-desktop/default.nix
rename to distros/kinetic/heron-desktop/default.nix
diff --git a/kinetic/heron-msgs/default.nix b/distros/kinetic/heron-msgs/default.nix
similarity index 100%
rename from kinetic/heron-msgs/default.nix
rename to distros/kinetic/heron-msgs/default.nix
diff --git a/kinetic/heron-viz/default.nix b/distros/kinetic/heron-viz/default.nix
similarity index 100%
rename from kinetic/heron-viz/default.nix
rename to distros/kinetic/heron-viz/default.nix
diff --git a/kinetic/hironx-calibration/default.nix b/distros/kinetic/hironx-calibration/default.nix
similarity index 100%
rename from kinetic/hironx-calibration/default.nix
rename to distros/kinetic/hironx-calibration/default.nix
diff --git a/kinetic/hironx-moveit-config/default.nix b/distros/kinetic/hironx-moveit-config/default.nix
similarity index 100%
rename from kinetic/hironx-moveit-config/default.nix
rename to distros/kinetic/hironx-moveit-config/default.nix
diff --git a/kinetic/hironx-ros-bridge/default.nix b/distros/kinetic/hironx-ros-bridge/default.nix
similarity index 100%
rename from kinetic/hironx-ros-bridge/default.nix
rename to distros/kinetic/hironx-ros-bridge/default.nix
diff --git a/kinetic/hls-lfcd-lds-driver/default.nix b/distros/kinetic/hls-lfcd-lds-driver/default.nix
similarity index 100%
rename from kinetic/hls-lfcd-lds-driver/default.nix
rename to distros/kinetic/hls-lfcd-lds-driver/default.nix
diff --git a/kinetic/hokuyo3d/default.nix b/distros/kinetic/hokuyo3d/default.nix
similarity index 100%
rename from kinetic/hokuyo3d/default.nix
rename to distros/kinetic/hokuyo3d/default.nix
diff --git a/kinetic/homer-map-manager/default.nix b/distros/kinetic/homer-map-manager/default.nix
similarity index 100%
rename from kinetic/homer-map-manager/default.nix
rename to distros/kinetic/homer-map-manager/default.nix
diff --git a/kinetic/homer-mapnav-msgs/default.nix b/distros/kinetic/homer-mapnav-msgs/default.nix
similarity index 100%
rename from kinetic/homer-mapnav-msgs/default.nix
rename to distros/kinetic/homer-mapnav-msgs/default.nix
diff --git a/kinetic/homer-mapping/default.nix b/distros/kinetic/homer-mapping/default.nix
similarity index 100%
rename from kinetic/homer-mapping/default.nix
rename to distros/kinetic/homer-mapping/default.nix
diff --git a/kinetic/homer-mary-tts/default.nix b/distros/kinetic/homer-mary-tts/default.nix
similarity index 100%
rename from kinetic/homer-mary-tts/default.nix
rename to distros/kinetic/homer-mary-tts/default.nix
diff --git a/kinetic/homer-msgs/default.nix b/distros/kinetic/homer-msgs/default.nix
similarity index 100%
rename from kinetic/homer-msgs/default.nix
rename to distros/kinetic/homer-msgs/default.nix
diff --git a/kinetic/homer-nav-libs/default.nix b/distros/kinetic/homer-nav-libs/default.nix
similarity index 100%
rename from kinetic/homer-nav-libs/default.nix
rename to distros/kinetic/homer-nav-libs/default.nix
diff --git a/kinetic/homer-navigation/default.nix b/distros/kinetic/homer-navigation/default.nix
similarity index 100%
rename from kinetic/homer-navigation/default.nix
rename to distros/kinetic/homer-navigation/default.nix
diff --git a/kinetic/homer-ptu-msgs/default.nix b/distros/kinetic/homer-ptu-msgs/default.nix
similarity index 100%
rename from kinetic/homer-ptu-msgs/default.nix
rename to distros/kinetic/homer-ptu-msgs/default.nix
diff --git a/kinetic/homer-robbie-architecture/default.nix b/distros/kinetic/homer-robbie-architecture/default.nix
similarity index 100%
rename from kinetic/homer-robbie-architecture/default.nix
rename to distros/kinetic/homer-robbie-architecture/default.nix
diff --git a/kinetic/homer-tts/default.nix b/distros/kinetic/homer-tts/default.nix
similarity index 100%
rename from kinetic/homer-tts/default.nix
rename to distros/kinetic/homer-tts/default.nix
diff --git a/kinetic/hostapd-access-point/default.nix b/distros/kinetic/hostapd-access-point/default.nix
similarity index 100%
rename from kinetic/hostapd-access-point/default.nix
rename to distros/kinetic/hostapd-access-point/default.nix
diff --git a/kinetic/household-objects-database-msgs/default.nix b/distros/kinetic/household-objects-database-msgs/default.nix
similarity index 100%
rename from kinetic/household-objects-database-msgs/default.nix
rename to distros/kinetic/household-objects-database-msgs/default.nix
diff --git a/kinetic/hpp-fcl/default.nix b/distros/kinetic/hpp-fcl/default.nix
similarity index 100%
rename from kinetic/hpp-fcl/default.nix
rename to distros/kinetic/hpp-fcl/default.nix
diff --git a/kinetic/hrpsys-ros-bridge/default.nix b/distros/kinetic/hrpsys-ros-bridge/default.nix
similarity index 100%
rename from kinetic/hrpsys-ros-bridge/default.nix
rename to distros/kinetic/hrpsys-ros-bridge/default.nix
diff --git a/kinetic/hrpsys-tools/default.nix b/distros/kinetic/hrpsys-tools/default.nix
similarity index 100%
rename from kinetic/hrpsys-tools/default.nix
rename to distros/kinetic/hrpsys-tools/default.nix
diff --git a/kinetic/hrpsys/default.nix b/distros/kinetic/hrpsys/default.nix
similarity index 100%
rename from kinetic/hrpsys/default.nix
rename to distros/kinetic/hrpsys/default.nix
diff --git a/kinetic/hsr-description/default.nix b/distros/kinetic/hsr-description/default.nix
similarity index 100%
rename from kinetic/hsr-description/default.nix
rename to distros/kinetic/hsr-description/default.nix
diff --git a/kinetic/hsr-meshes/default.nix b/distros/kinetic/hsr-meshes/default.nix
similarity index 100%
rename from kinetic/hsr-meshes/default.nix
rename to distros/kinetic/hsr-meshes/default.nix
diff --git a/kinetic/hugin-panorama/default.nix b/distros/kinetic/hugin-panorama/default.nix
similarity index 100%
rename from kinetic/hugin-panorama/default.nix
rename to distros/kinetic/hugin-panorama/default.nix
diff --git a/kinetic/humanoid-localization/default.nix b/distros/kinetic/humanoid-localization/default.nix
similarity index 100%
rename from kinetic/humanoid-localization/default.nix
rename to distros/kinetic/humanoid-localization/default.nix
diff --git a/kinetic/humanoid-msgs/default.nix b/distros/kinetic/humanoid-msgs/default.nix
similarity index 100%
rename from kinetic/humanoid-msgs/default.nix
rename to distros/kinetic/humanoid-msgs/default.nix
diff --git a/kinetic/humanoid-nav-msgs/default.nix b/distros/kinetic/humanoid-nav-msgs/default.nix
similarity index 100%
rename from kinetic/humanoid-nav-msgs/default.nix
rename to distros/kinetic/humanoid-nav-msgs/default.nix
diff --git a/kinetic/humanoid-navigation/default.nix b/distros/kinetic/humanoid-navigation/default.nix
similarity index 100%
rename from kinetic/humanoid-navigation/default.nix
rename to distros/kinetic/humanoid-navigation/default.nix
diff --git a/kinetic/humanoid-planner-2d/default.nix b/distros/kinetic/humanoid-planner-2d/default.nix
similarity index 100%
rename from kinetic/humanoid-planner-2d/default.nix
rename to distros/kinetic/humanoid-planner-2d/default.nix
diff --git a/kinetic/husky-base/default.nix b/distros/kinetic/husky-base/default.nix
similarity index 100%
rename from kinetic/husky-base/default.nix
rename to distros/kinetic/husky-base/default.nix
diff --git a/kinetic/husky-bringup/default.nix b/distros/kinetic/husky-bringup/default.nix
similarity index 100%
rename from kinetic/husky-bringup/default.nix
rename to distros/kinetic/husky-bringup/default.nix
diff --git a/kinetic/husky-control/default.nix b/distros/kinetic/husky-control/default.nix
similarity index 100%
rename from kinetic/husky-control/default.nix
rename to distros/kinetic/husky-control/default.nix
diff --git a/kinetic/husky-description/default.nix b/distros/kinetic/husky-description/default.nix
similarity index 100%
rename from kinetic/husky-description/default.nix
rename to distros/kinetic/husky-description/default.nix
diff --git a/kinetic/husky-desktop/default.nix b/distros/kinetic/husky-desktop/default.nix
similarity index 100%
rename from kinetic/husky-desktop/default.nix
rename to distros/kinetic/husky-desktop/default.nix
diff --git a/kinetic/husky-gazebo/default.nix b/distros/kinetic/husky-gazebo/default.nix
similarity index 100%
rename from kinetic/husky-gazebo/default.nix
rename to distros/kinetic/husky-gazebo/default.nix
diff --git a/kinetic/husky-msgs/default.nix b/distros/kinetic/husky-msgs/default.nix
similarity index 100%
rename from kinetic/husky-msgs/default.nix
rename to distros/kinetic/husky-msgs/default.nix
diff --git a/kinetic/husky-navigation/default.nix b/distros/kinetic/husky-navigation/default.nix
similarity index 100%
rename from kinetic/husky-navigation/default.nix
rename to distros/kinetic/husky-navigation/default.nix
diff --git a/kinetic/husky-robot/default.nix b/distros/kinetic/husky-robot/default.nix
similarity index 100%
rename from kinetic/husky-robot/default.nix
rename to distros/kinetic/husky-robot/default.nix
diff --git a/kinetic/husky-simulator/default.nix b/distros/kinetic/husky-simulator/default.nix
similarity index 100%
rename from kinetic/husky-simulator/default.nix
rename to distros/kinetic/husky-simulator/default.nix
diff --git a/kinetic/husky-viz/default.nix b/distros/kinetic/husky-viz/default.nix
similarity index 100%
rename from kinetic/husky-viz/default.nix
rename to distros/kinetic/husky-viz/default.nix
diff --git a/kinetic/ibeo-core/default.nix b/distros/kinetic/ibeo-core/default.nix
similarity index 100%
rename from kinetic/ibeo-core/default.nix
rename to distros/kinetic/ibeo-core/default.nix
diff --git a/kinetic/ibeo-lux/default.nix b/distros/kinetic/ibeo-lux/default.nix
similarity index 100%
rename from kinetic/ibeo-lux/default.nix
rename to distros/kinetic/ibeo-lux/default.nix
diff --git a/kinetic/ibeo-msgs/default.nix b/distros/kinetic/ibeo-msgs/default.nix
similarity index 100%
rename from kinetic/ibeo-msgs/default.nix
rename to distros/kinetic/ibeo-msgs/default.nix
diff --git a/kinetic/ieee80211-channels/default.nix b/distros/kinetic/ieee80211-channels/default.nix
similarity index 100%
rename from kinetic/ieee80211-channels/default.nix
rename to distros/kinetic/ieee80211-channels/default.nix
diff --git a/kinetic/ifm-o3mxxx/default.nix b/distros/kinetic/ifm-o3mxxx/default.nix
similarity index 100%
rename from kinetic/ifm-o3mxxx/default.nix
rename to distros/kinetic/ifm-o3mxxx/default.nix
diff --git a/kinetic/igvc-self-drive-description/default.nix b/distros/kinetic/igvc-self-drive-description/default.nix
similarity index 100%
rename from kinetic/igvc-self-drive-description/default.nix
rename to distros/kinetic/igvc-self-drive-description/default.nix
diff --git a/kinetic/igvc-self-drive-gazebo-plugins/default.nix b/distros/kinetic/igvc-self-drive-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/igvc-self-drive-gazebo-plugins/default.nix
rename to distros/kinetic/igvc-self-drive-gazebo-plugins/default.nix
diff --git a/kinetic/igvc-self-drive-gazebo/default.nix b/distros/kinetic/igvc-self-drive-gazebo/default.nix
similarity index 100%
rename from kinetic/igvc-self-drive-gazebo/default.nix
rename to distros/kinetic/igvc-self-drive-gazebo/default.nix
diff --git a/kinetic/igvc-self-drive-sim/default.nix b/distros/kinetic/igvc-self-drive-sim/default.nix
similarity index 100%
rename from kinetic/igvc-self-drive-sim/default.nix
rename to distros/kinetic/igvc-self-drive-sim/default.nix
diff --git a/kinetic/iirob-filters/default.nix b/distros/kinetic/iirob-filters/default.nix
similarity index 100%
rename from kinetic/iirob-filters/default.nix
rename to distros/kinetic/iirob-filters/default.nix
diff --git a/kinetic/iiwa-control/default.nix b/distros/kinetic/iiwa-control/default.nix
similarity index 100%
rename from kinetic/iiwa-control/default.nix
rename to distros/kinetic/iiwa-control/default.nix
diff --git a/kinetic/iiwa-description/default.nix b/distros/kinetic/iiwa-description/default.nix
similarity index 100%
rename from kinetic/iiwa-description/default.nix
rename to distros/kinetic/iiwa-description/default.nix
diff --git a/kinetic/iiwa-gazebo/default.nix b/distros/kinetic/iiwa-gazebo/default.nix
similarity index 100%
rename from kinetic/iiwa-gazebo/default.nix
rename to distros/kinetic/iiwa-gazebo/default.nix
diff --git a/kinetic/iiwa-hw/default.nix b/distros/kinetic/iiwa-hw/default.nix
similarity index 100%
rename from kinetic/iiwa-hw/default.nix
rename to distros/kinetic/iiwa-hw/default.nix
diff --git a/kinetic/iiwa-moveit/default.nix b/distros/kinetic/iiwa-moveit/default.nix
similarity index 100%
rename from kinetic/iiwa-moveit/default.nix
rename to distros/kinetic/iiwa-moveit/default.nix
diff --git a/kinetic/iiwa-msgs/default.nix b/distros/kinetic/iiwa-msgs/default.nix
similarity index 100%
rename from kinetic/iiwa-msgs/default.nix
rename to distros/kinetic/iiwa-msgs/default.nix
diff --git a/kinetic/iiwa-ros/default.nix b/distros/kinetic/iiwa-ros/default.nix
similarity index 100%
rename from kinetic/iiwa-ros/default.nix
rename to distros/kinetic/iiwa-ros/default.nix
diff --git a/kinetic/image-cb-detector/default.nix b/distros/kinetic/image-cb-detector/default.nix
similarity index 100%
rename from kinetic/image-cb-detector/default.nix
rename to distros/kinetic/image-cb-detector/default.nix
diff --git a/kinetic/image-common/default.nix b/distros/kinetic/image-common/default.nix
similarity index 100%
rename from kinetic/image-common/default.nix
rename to distros/kinetic/image-common/default.nix
diff --git a/kinetic/image-exposure-msgs/default.nix b/distros/kinetic/image-exposure-msgs/default.nix
similarity index 100%
rename from kinetic/image-exposure-msgs/default.nix
rename to distros/kinetic/image-exposure-msgs/default.nix
diff --git a/kinetic/image-geometry/default.nix b/distros/kinetic/image-geometry/default.nix
similarity index 100%
rename from kinetic/image-geometry/default.nix
rename to distros/kinetic/image-geometry/default.nix
diff --git a/kinetic/image-overlay-scale-and-compass/default.nix b/distros/kinetic/image-overlay-scale-and-compass/default.nix
similarity index 100%
rename from kinetic/image-overlay-scale-and-compass/default.nix
rename to distros/kinetic/image-overlay-scale-and-compass/default.nix
diff --git a/kinetic/image-pipeline/default.nix b/distros/kinetic/image-pipeline/default.nix
similarity index 100%
rename from kinetic/image-pipeline/default.nix
rename to distros/kinetic/image-pipeline/default.nix
diff --git a/kinetic/image-proc/default.nix b/distros/kinetic/image-proc/default.nix
similarity index 100%
rename from kinetic/image-proc/default.nix
rename to distros/kinetic/image-proc/default.nix
diff --git a/kinetic/image-publisher/default.nix b/distros/kinetic/image-publisher/default.nix
similarity index 100%
rename from kinetic/image-publisher/default.nix
rename to distros/kinetic/image-publisher/default.nix
diff --git a/kinetic/image-recognition-msgs/default.nix b/distros/kinetic/image-recognition-msgs/default.nix
similarity index 100%
rename from kinetic/image-recognition-msgs/default.nix
rename to distros/kinetic/image-recognition-msgs/default.nix
diff --git a/kinetic/image-recognition-rqt/default.nix b/distros/kinetic/image-recognition-rqt/default.nix
similarity index 100%
rename from kinetic/image-recognition-rqt/default.nix
rename to distros/kinetic/image-recognition-rqt/default.nix
diff --git a/kinetic/image-recognition-util/default.nix b/distros/kinetic/image-recognition-util/default.nix
similarity index 100%
rename from kinetic/image-recognition-util/default.nix
rename to distros/kinetic/image-recognition-util/default.nix
diff --git a/kinetic/image-recognition/default.nix b/distros/kinetic/image-recognition/default.nix
similarity index 100%
rename from kinetic/image-recognition/default.nix
rename to distros/kinetic/image-recognition/default.nix
diff --git a/kinetic/image-rotate/default.nix b/distros/kinetic/image-rotate/default.nix
similarity index 100%
rename from kinetic/image-rotate/default.nix
rename to distros/kinetic/image-rotate/default.nix
diff --git a/kinetic/image-stream/default.nix b/distros/kinetic/image-stream/default.nix
similarity index 100%
rename from kinetic/image-stream/default.nix
rename to distros/kinetic/image-stream/default.nix
diff --git a/kinetic/image-transport-plugins/default.nix b/distros/kinetic/image-transport-plugins/default.nix
similarity index 100%
rename from kinetic/image-transport-plugins/default.nix
rename to distros/kinetic/image-transport-plugins/default.nix
diff --git a/kinetic/image-transport/default.nix b/distros/kinetic/image-transport/default.nix
similarity index 100%
rename from kinetic/image-transport/default.nix
rename to distros/kinetic/image-transport/default.nix
diff --git a/kinetic/image-view/default.nix b/distros/kinetic/image-view/default.nix
similarity index 100%
rename from kinetic/image-view/default.nix
rename to distros/kinetic/image-view/default.nix
diff --git a/kinetic/image-view2/default.nix b/distros/kinetic/image-view2/default.nix
similarity index 100%
rename from kinetic/image-view2/default.nix
rename to distros/kinetic/image-view2/default.nix
diff --git a/kinetic/imagesift/default.nix b/distros/kinetic/imagesift/default.nix
similarity index 100%
rename from kinetic/imagesift/default.nix
rename to distros/kinetic/imagesift/default.nix
diff --git a/kinetic/imagezero-image-transport/default.nix b/distros/kinetic/imagezero-image-transport/default.nix
similarity index 100%
rename from kinetic/imagezero-image-transport/default.nix
rename to distros/kinetic/imagezero-image-transport/default.nix
diff --git a/kinetic/imagezero-ros/default.nix b/distros/kinetic/imagezero-ros/default.nix
similarity index 100%
rename from kinetic/imagezero-ros/default.nix
rename to distros/kinetic/imagezero-ros/default.nix
diff --git a/kinetic/imagezero/default.nix b/distros/kinetic/imagezero/default.nix
similarity index 100%
rename from kinetic/imagezero/default.nix
rename to distros/kinetic/imagezero/default.nix
diff --git a/kinetic/imu-compass/default.nix b/distros/kinetic/imu-compass/default.nix
similarity index 100%
rename from kinetic/imu-compass/default.nix
rename to distros/kinetic/imu-compass/default.nix
diff --git a/kinetic/imu-complementary-filter/default.nix b/distros/kinetic/imu-complementary-filter/default.nix
similarity index 100%
rename from kinetic/imu-complementary-filter/default.nix
rename to distros/kinetic/imu-complementary-filter/default.nix
diff --git a/kinetic/imu-filter-madgwick/default.nix b/distros/kinetic/imu-filter-madgwick/default.nix
similarity index 100%
rename from kinetic/imu-filter-madgwick/default.nix
rename to distros/kinetic/imu-filter-madgwick/default.nix
diff --git a/kinetic/imu-monitor/default.nix b/distros/kinetic/imu-monitor/default.nix
similarity index 100%
rename from kinetic/imu-monitor/default.nix
rename to distros/kinetic/imu-monitor/default.nix
diff --git a/kinetic/imu-pipeline/default.nix b/distros/kinetic/imu-pipeline/default.nix
similarity index 100%
rename from kinetic/imu-pipeline/default.nix
rename to distros/kinetic/imu-pipeline/default.nix
diff --git a/kinetic/imu-processors/default.nix b/distros/kinetic/imu-processors/default.nix
similarity index 100%
rename from kinetic/imu-processors/default.nix
rename to distros/kinetic/imu-processors/default.nix
diff --git a/kinetic/imu-sensor-controller/default.nix b/distros/kinetic/imu-sensor-controller/default.nix
similarity index 100%
rename from kinetic/imu-sensor-controller/default.nix
rename to distros/kinetic/imu-sensor-controller/default.nix
diff --git a/kinetic/imu-tools/default.nix b/distros/kinetic/imu-tools/default.nix
similarity index 100%
rename from kinetic/imu-tools/default.nix
rename to distros/kinetic/imu-tools/default.nix
diff --git a/kinetic/imu-transformer/default.nix b/distros/kinetic/imu-transformer/default.nix
similarity index 100%
rename from kinetic/imu-transformer/default.nix
rename to distros/kinetic/imu-transformer/default.nix
diff --git a/kinetic/indoor-localization/default.nix b/distros/kinetic/indoor-localization/default.nix
similarity index 100%
rename from kinetic/indoor-localization/default.nix
rename to distros/kinetic/indoor-localization/default.nix
diff --git a/kinetic/indoor-positioning/default.nix b/distros/kinetic/indoor-positioning/default.nix
similarity index 100%
rename from kinetic/indoor-positioning/default.nix
rename to distros/kinetic/indoor-positioning/default.nix
diff --git a/kinetic/industrial-core/default.nix b/distros/kinetic/industrial-core/default.nix
similarity index 100%
rename from kinetic/industrial-core/default.nix
rename to distros/kinetic/industrial-core/default.nix
diff --git a/kinetic/industrial-deprecated/default.nix b/distros/kinetic/industrial-deprecated/default.nix
similarity index 100%
rename from kinetic/industrial-deprecated/default.nix
rename to distros/kinetic/industrial-deprecated/default.nix
diff --git a/kinetic/industrial-msgs/default.nix b/distros/kinetic/industrial-msgs/default.nix
similarity index 100%
rename from kinetic/industrial-msgs/default.nix
rename to distros/kinetic/industrial-msgs/default.nix
diff --git a/kinetic/industrial-robot-client/default.nix b/distros/kinetic/industrial-robot-client/default.nix
similarity index 100%
rename from kinetic/industrial-robot-client/default.nix
rename to distros/kinetic/industrial-robot-client/default.nix
diff --git a/kinetic/industrial-robot-simulator/default.nix b/distros/kinetic/industrial-robot-simulator/default.nix
similarity index 100%
rename from kinetic/industrial-robot-simulator/default.nix
rename to distros/kinetic/industrial-robot-simulator/default.nix
diff --git a/kinetic/industrial-robot-status-controller/default.nix b/distros/kinetic/industrial-robot-status-controller/default.nix
similarity index 100%
rename from kinetic/industrial-robot-status-controller/default.nix
rename to distros/kinetic/industrial-robot-status-controller/default.nix
diff --git a/kinetic/industrial-robot-status-interface/default.nix b/distros/kinetic/industrial-robot-status-interface/default.nix
similarity index 100%
rename from kinetic/industrial-robot-status-interface/default.nix
rename to distros/kinetic/industrial-robot-status-interface/default.nix
diff --git a/kinetic/industrial-trajectory-filters/default.nix b/distros/kinetic/industrial-trajectory-filters/default.nix
similarity index 100%
rename from kinetic/industrial-trajectory-filters/default.nix
rename to distros/kinetic/industrial-trajectory-filters/default.nix
diff --git a/kinetic/industrial-utils/default.nix b/distros/kinetic/industrial-utils/default.nix
similarity index 100%
rename from kinetic/industrial-utils/default.nix
rename to distros/kinetic/industrial-utils/default.nix
diff --git a/kinetic/innok-heros-driver/default.nix b/distros/kinetic/innok-heros-driver/default.nix
similarity index 100%
rename from kinetic/innok-heros-driver/default.nix
rename to distros/kinetic/innok-heros-driver/default.nix
diff --git a/kinetic/interactive-marker-proxy/default.nix b/distros/kinetic/interactive-marker-proxy/default.nix
similarity index 100%
rename from kinetic/interactive-marker-proxy/default.nix
rename to distros/kinetic/interactive-marker-proxy/default.nix
diff --git a/kinetic/interactive-marker-tutorials/default.nix b/distros/kinetic/interactive-marker-tutorials/default.nix
similarity index 100%
rename from kinetic/interactive-marker-tutorials/default.nix
rename to distros/kinetic/interactive-marker-tutorials/default.nix
diff --git a/kinetic/interactive-marker-twist-server/default.nix b/distros/kinetic/interactive-marker-twist-server/default.nix
similarity index 100%
rename from kinetic/interactive-marker-twist-server/default.nix
rename to distros/kinetic/interactive-marker-twist-server/default.nix
diff --git a/kinetic/interactive-markers/default.nix b/distros/kinetic/interactive-markers/default.nix
similarity index 100%
rename from kinetic/interactive-markers/default.nix
rename to distros/kinetic/interactive-markers/default.nix
diff --git a/kinetic/interval-intersection/default.nix b/distros/kinetic/interval-intersection/default.nix
similarity index 100%
rename from kinetic/interval-intersection/default.nix
rename to distros/kinetic/interval-intersection/default.nix
diff --git a/kinetic/iot-bridge/default.nix b/distros/kinetic/iot-bridge/default.nix
similarity index 100%
rename from kinetic/iot-bridge/default.nix
rename to distros/kinetic/iot-bridge/default.nix
diff --git a/kinetic/ipa-3d-fov-visualization/default.nix b/distros/kinetic/ipa-3d-fov-visualization/default.nix
similarity index 100%
rename from kinetic/ipa-3d-fov-visualization/default.nix
rename to distros/kinetic/ipa-3d-fov-visualization/default.nix
diff --git a/kinetic/ipcamera-driver/default.nix b/distros/kinetic/ipcamera-driver/default.nix
similarity index 100%
rename from kinetic/ipcamera-driver/default.nix
rename to distros/kinetic/ipcamera-driver/default.nix
diff --git a/kinetic/ipr-extern/default.nix b/distros/kinetic/ipr-extern/default.nix
similarity index 100%
rename from kinetic/ipr-extern/default.nix
rename to distros/kinetic/ipr-extern/default.nix
diff --git a/kinetic/ira-laser-tools/default.nix b/distros/kinetic/ira-laser-tools/default.nix
similarity index 100%
rename from kinetic/ira-laser-tools/default.nix
rename to distros/kinetic/ira-laser-tools/default.nix
diff --git a/kinetic/ivcon/default.nix b/distros/kinetic/ivcon/default.nix
similarity index 100%
rename from kinetic/ivcon/default.nix
rename to distros/kinetic/ivcon/default.nix
diff --git a/kinetic/jackal-control/default.nix b/distros/kinetic/jackal-control/default.nix
similarity index 100%
rename from kinetic/jackal-control/default.nix
rename to distros/kinetic/jackal-control/default.nix
diff --git a/kinetic/jackal-description/default.nix b/distros/kinetic/jackal-description/default.nix
similarity index 100%
rename from kinetic/jackal-description/default.nix
rename to distros/kinetic/jackal-description/default.nix
diff --git a/kinetic/jackal-desktop/default.nix b/distros/kinetic/jackal-desktop/default.nix
similarity index 100%
rename from kinetic/jackal-desktop/default.nix
rename to distros/kinetic/jackal-desktop/default.nix
diff --git a/kinetic/jackal-gazebo/default.nix b/distros/kinetic/jackal-gazebo/default.nix
similarity index 100%
rename from kinetic/jackal-gazebo/default.nix
rename to distros/kinetic/jackal-gazebo/default.nix
diff --git a/kinetic/jackal-msgs/default.nix b/distros/kinetic/jackal-msgs/default.nix
similarity index 100%
rename from kinetic/jackal-msgs/default.nix
rename to distros/kinetic/jackal-msgs/default.nix
diff --git a/kinetic/jackal-navigation/default.nix b/distros/kinetic/jackal-navigation/default.nix
similarity index 100%
rename from kinetic/jackal-navigation/default.nix
rename to distros/kinetic/jackal-navigation/default.nix
diff --git a/kinetic/jackal-simulator/default.nix b/distros/kinetic/jackal-simulator/default.nix
similarity index 100%
rename from kinetic/jackal-simulator/default.nix
rename to distros/kinetic/jackal-simulator/default.nix
diff --git a/kinetic/jackal-tutorials/default.nix b/distros/kinetic/jackal-tutorials/default.nix
similarity index 100%
rename from kinetic/jackal-tutorials/default.nix
rename to distros/kinetic/jackal-tutorials/default.nix
diff --git a/kinetic/jackal-viz/default.nix b/distros/kinetic/jackal-viz/default.nix
similarity index 100%
rename from kinetic/jackal-viz/default.nix
rename to distros/kinetic/jackal-viz/default.nix
diff --git a/kinetic/jaguar-control/default.nix b/distros/kinetic/jaguar-control/default.nix
similarity index 100%
rename from kinetic/jaguar-control/default.nix
rename to distros/kinetic/jaguar-control/default.nix
diff --git a/kinetic/jaguar-description/default.nix b/distros/kinetic/jaguar-description/default.nix
similarity index 100%
rename from kinetic/jaguar-description/default.nix
rename to distros/kinetic/jaguar-description/default.nix
diff --git a/kinetic/jaguar-msgs/default.nix b/distros/kinetic/jaguar-msgs/default.nix
similarity index 100%
rename from kinetic/jaguar-msgs/default.nix
rename to distros/kinetic/jaguar-msgs/default.nix
diff --git a/kinetic/jaguar-navigation/default.nix b/distros/kinetic/jaguar-navigation/default.nix
similarity index 100%
rename from kinetic/jaguar-navigation/default.nix
rename to distros/kinetic/jaguar-navigation/default.nix
diff --git a/kinetic/jderobot-assets/default.nix b/distros/kinetic/jderobot-assets/default.nix
similarity index 100%
rename from kinetic/jderobot-assets/default.nix
rename to distros/kinetic/jderobot-assets/default.nix
diff --git a/kinetic/jog-arm/default.nix b/distros/kinetic/jog-arm/default.nix
similarity index 100%
rename from kinetic/jog-arm/default.nix
rename to distros/kinetic/jog-arm/default.nix
diff --git a/kinetic/jog-control/default.nix b/distros/kinetic/jog-control/default.nix
similarity index 100%
rename from kinetic/jog-control/default.nix
rename to distros/kinetic/jog-control/default.nix
diff --git a/kinetic/jog-controller/default.nix b/distros/kinetic/jog-controller/default.nix
similarity index 100%
rename from kinetic/jog-controller/default.nix
rename to distros/kinetic/jog-controller/default.nix
diff --git a/kinetic/jog-launch/default.nix b/distros/kinetic/jog-launch/default.nix
similarity index 100%
rename from kinetic/jog-launch/default.nix
rename to distros/kinetic/jog-launch/default.nix
diff --git a/kinetic/jog-msgs/default.nix b/distros/kinetic/jog-msgs/default.nix
similarity index 100%
rename from kinetic/jog-msgs/default.nix
rename to distros/kinetic/jog-msgs/default.nix
diff --git a/kinetic/joint-limits-interface/default.nix b/distros/kinetic/joint-limits-interface/default.nix
similarity index 100%
rename from kinetic/joint-limits-interface/default.nix
rename to distros/kinetic/joint-limits-interface/default.nix
diff --git a/kinetic/joint-qualification-controllers/default.nix b/distros/kinetic/joint-qualification-controllers/default.nix
similarity index 100%
rename from kinetic/joint-qualification-controllers/default.nix
rename to distros/kinetic/joint-qualification-controllers/default.nix
diff --git a/kinetic/joint-state-controller/default.nix b/distros/kinetic/joint-state-controller/default.nix
similarity index 100%
rename from kinetic/joint-state-controller/default.nix
rename to distros/kinetic/joint-state-controller/default.nix
diff --git a/kinetic/joint-state-publisher/default.nix b/distros/kinetic/joint-state-publisher/default.nix
similarity index 100%
rename from kinetic/joint-state-publisher/default.nix
rename to distros/kinetic/joint-state-publisher/default.nix
diff --git a/kinetic/joint-states-settler/default.nix b/distros/kinetic/joint-states-settler/default.nix
similarity index 100%
rename from kinetic/joint-states-settler/default.nix
rename to distros/kinetic/joint-states-settler/default.nix
diff --git a/kinetic/joint-trajectory-action-tools/default.nix b/distros/kinetic/joint-trajectory-action-tools/default.nix
similarity index 100%
rename from kinetic/joint-trajectory-action-tools/default.nix
rename to distros/kinetic/joint-trajectory-action-tools/default.nix
diff --git a/kinetic/joint-trajectory-action/default.nix b/distros/kinetic/joint-trajectory-action/default.nix
similarity index 100%
rename from kinetic/joint-trajectory-action/default.nix
rename to distros/kinetic/joint-trajectory-action/default.nix
diff --git a/kinetic/joint-trajectory-controller/default.nix b/distros/kinetic/joint-trajectory-controller/default.nix
similarity index 100%
rename from kinetic/joint-trajectory-controller/default.nix
rename to distros/kinetic/joint-trajectory-controller/default.nix
diff --git a/kinetic/joint-trajectory-generator/default.nix b/distros/kinetic/joint-trajectory-generator/default.nix
similarity index 100%
rename from kinetic/joint-trajectory-generator/default.nix
rename to distros/kinetic/joint-trajectory-generator/default.nix
diff --git a/kinetic/jointstick/default.nix b/distros/kinetic/jointstick/default.nix
similarity index 100%
rename from kinetic/jointstick/default.nix
rename to distros/kinetic/jointstick/default.nix
diff --git a/kinetic/joy-listener/default.nix b/distros/kinetic/joy-listener/default.nix
similarity index 100%
rename from kinetic/joy-listener/default.nix
rename to distros/kinetic/joy-listener/default.nix
diff --git a/kinetic/joy-mouse/default.nix b/distros/kinetic/joy-mouse/default.nix
similarity index 100%
rename from kinetic/joy-mouse/default.nix
rename to distros/kinetic/joy-mouse/default.nix
diff --git a/kinetic/joy-teleop/default.nix b/distros/kinetic/joy-teleop/default.nix
similarity index 100%
rename from kinetic/joy-teleop/default.nix
rename to distros/kinetic/joy-teleop/default.nix
diff --git a/kinetic/joy/default.nix b/distros/kinetic/joy/default.nix
similarity index 100%
rename from kinetic/joy/default.nix
rename to distros/kinetic/joy/default.nix
diff --git a/kinetic/joystick-drivers/default.nix b/distros/kinetic/joystick-drivers/default.nix
similarity index 100%
rename from kinetic/joystick-drivers/default.nix
rename to distros/kinetic/joystick-drivers/default.nix
diff --git a/kinetic/joystick-interrupt/default.nix b/distros/kinetic/joystick-interrupt/default.nix
similarity index 100%
rename from kinetic/joystick-interrupt/default.nix
rename to distros/kinetic/joystick-interrupt/default.nix
diff --git a/kinetic/jpeg-streamer/default.nix b/distros/kinetic/jpeg-streamer/default.nix
similarity index 100%
rename from kinetic/jpeg-streamer/default.nix
rename to distros/kinetic/jpeg-streamer/default.nix
diff --git a/kinetic/jsk-3rdparty/default.nix b/distros/kinetic/jsk-3rdparty/default.nix
similarity index 100%
rename from kinetic/jsk-3rdparty/default.nix
rename to distros/kinetic/jsk-3rdparty/default.nix
diff --git a/kinetic/jsk-calibration/default.nix b/distros/kinetic/jsk-calibration/default.nix
similarity index 100%
rename from kinetic/jsk-calibration/default.nix
rename to distros/kinetic/jsk-calibration/default.nix
diff --git a/kinetic/jsk-common-msgs/default.nix b/distros/kinetic/jsk-common-msgs/default.nix
similarity index 100%
rename from kinetic/jsk-common-msgs/default.nix
rename to distros/kinetic/jsk-common-msgs/default.nix
diff --git a/kinetic/jsk-common/default.nix b/distros/kinetic/jsk-common/default.nix
similarity index 100%
rename from kinetic/jsk-common/default.nix
rename to distros/kinetic/jsk-common/default.nix
diff --git a/kinetic/jsk-control/default.nix b/distros/kinetic/jsk-control/default.nix
similarity index 100%
rename from kinetic/jsk-control/default.nix
rename to distros/kinetic/jsk-control/default.nix
diff --git a/kinetic/jsk-footstep-controller/default.nix b/distros/kinetic/jsk-footstep-controller/default.nix
similarity index 100%
rename from kinetic/jsk-footstep-controller/default.nix
rename to distros/kinetic/jsk-footstep-controller/default.nix
diff --git a/kinetic/jsk-footstep-msgs/default.nix b/distros/kinetic/jsk-footstep-msgs/default.nix
similarity index 100%
rename from kinetic/jsk-footstep-msgs/default.nix
rename to distros/kinetic/jsk-footstep-msgs/default.nix
diff --git a/kinetic/jsk-footstep-planner/default.nix b/distros/kinetic/jsk-footstep-planner/default.nix
similarity index 100%
rename from kinetic/jsk-footstep-planner/default.nix
rename to distros/kinetic/jsk-footstep-planner/default.nix
diff --git a/kinetic/jsk-gui-msgs/default.nix b/distros/kinetic/jsk-gui-msgs/default.nix
similarity index 100%
rename from kinetic/jsk-gui-msgs/default.nix
rename to distros/kinetic/jsk-gui-msgs/default.nix
diff --git a/kinetic/jsk-hark-msgs/default.nix b/distros/kinetic/jsk-hark-msgs/default.nix
similarity index 100%
rename from kinetic/jsk-hark-msgs/default.nix
rename to distros/kinetic/jsk-hark-msgs/default.nix
diff --git a/kinetic/jsk-ik-server/default.nix b/distros/kinetic/jsk-ik-server/default.nix
similarity index 100%
rename from kinetic/jsk-ik-server/default.nix
rename to distros/kinetic/jsk-ik-server/default.nix
diff --git a/kinetic/jsk-interactive-marker/default.nix b/distros/kinetic/jsk-interactive-marker/default.nix
similarity index 100%
rename from kinetic/jsk-interactive-marker/default.nix
rename to distros/kinetic/jsk-interactive-marker/default.nix
diff --git a/kinetic/jsk-interactive-test/default.nix b/distros/kinetic/jsk-interactive-test/default.nix
similarity index 100%
rename from kinetic/jsk-interactive-test/default.nix
rename to distros/kinetic/jsk-interactive-test/default.nix
diff --git a/kinetic/jsk-interactive/default.nix b/distros/kinetic/jsk-interactive/default.nix
similarity index 100%
rename from kinetic/jsk-interactive/default.nix
rename to distros/kinetic/jsk-interactive/default.nix
diff --git a/kinetic/jsk-model-tools/default.nix b/distros/kinetic/jsk-model-tools/default.nix
similarity index 100%
rename from kinetic/jsk-model-tools/default.nix
rename to distros/kinetic/jsk-model-tools/default.nix
diff --git a/kinetic/jsk-network-tools/default.nix b/distros/kinetic/jsk-network-tools/default.nix
similarity index 100%
rename from kinetic/jsk-network-tools/default.nix
rename to distros/kinetic/jsk-network-tools/default.nix
diff --git a/kinetic/jsk-pcl-ros-utils/default.nix b/distros/kinetic/jsk-pcl-ros-utils/default.nix
similarity index 100%
rename from kinetic/jsk-pcl-ros-utils/default.nix
rename to distros/kinetic/jsk-pcl-ros-utils/default.nix
diff --git a/kinetic/jsk-pcl-ros/default.nix b/distros/kinetic/jsk-pcl-ros/default.nix
similarity index 100%
rename from kinetic/jsk-pcl-ros/default.nix
rename to distros/kinetic/jsk-pcl-ros/default.nix
diff --git a/kinetic/jsk-planning/default.nix b/distros/kinetic/jsk-planning/default.nix
similarity index 100%
rename from kinetic/jsk-planning/default.nix
rename to distros/kinetic/jsk-planning/default.nix
diff --git a/kinetic/jsk-pr2eus/default.nix b/distros/kinetic/jsk-pr2eus/default.nix
similarity index 100%
rename from kinetic/jsk-pr2eus/default.nix
rename to distros/kinetic/jsk-pr2eus/default.nix
diff --git a/kinetic/jsk-recognition-msgs/default.nix b/distros/kinetic/jsk-recognition-msgs/default.nix
similarity index 100%
rename from kinetic/jsk-recognition-msgs/default.nix
rename to distros/kinetic/jsk-recognition-msgs/default.nix
diff --git a/kinetic/jsk-recognition-utils/default.nix b/distros/kinetic/jsk-recognition-utils/default.nix
similarity index 100%
rename from kinetic/jsk-recognition-utils/default.nix
rename to distros/kinetic/jsk-recognition-utils/default.nix
diff --git a/kinetic/jsk-recognition/default.nix b/distros/kinetic/jsk-recognition/default.nix
similarity index 100%
rename from kinetic/jsk-recognition/default.nix
rename to distros/kinetic/jsk-recognition/default.nix
diff --git a/kinetic/jsk-roseus/default.nix b/distros/kinetic/jsk-roseus/default.nix
similarity index 100%
rename from kinetic/jsk-roseus/default.nix
rename to distros/kinetic/jsk-roseus/default.nix
diff --git a/kinetic/jsk-rqt-plugins/default.nix b/distros/kinetic/jsk-rqt-plugins/default.nix
similarity index 100%
rename from kinetic/jsk-rqt-plugins/default.nix
rename to distros/kinetic/jsk-rqt-plugins/default.nix
diff --git a/kinetic/jsk-rviz-plugins/default.nix b/distros/kinetic/jsk-rviz-plugins/default.nix
similarity index 100%
rename from kinetic/jsk-rviz-plugins/default.nix
rename to distros/kinetic/jsk-rviz-plugins/default.nix
diff --git a/kinetic/jsk-teleop-joy/default.nix b/distros/kinetic/jsk-teleop-joy/default.nix
similarity index 100%
rename from kinetic/jsk-teleop-joy/default.nix
rename to distros/kinetic/jsk-teleop-joy/default.nix
diff --git a/kinetic/jsk-tilt-laser/default.nix b/distros/kinetic/jsk-tilt-laser/default.nix
similarity index 100%
rename from kinetic/jsk-tilt-laser/default.nix
rename to distros/kinetic/jsk-tilt-laser/default.nix
diff --git a/kinetic/jsk-topic-tools/default.nix b/distros/kinetic/jsk-topic-tools/default.nix
similarity index 100%
rename from kinetic/jsk-topic-tools/default.nix
rename to distros/kinetic/jsk-topic-tools/default.nix
diff --git a/kinetic/jsk-visualization/default.nix b/distros/kinetic/jsk-visualization/default.nix
similarity index 100%
rename from kinetic/jsk-visualization/default.nix
rename to distros/kinetic/jsk-visualization/default.nix
diff --git a/kinetic/jskeus/default.nix b/distros/kinetic/jskeus/default.nix
similarity index 100%
rename from kinetic/jskeus/default.nix
rename to distros/kinetic/jskeus/default.nix
diff --git a/kinetic/json-msgs/default.nix b/distros/kinetic/json-msgs/default.nix
similarity index 100%
rename from kinetic/json-msgs/default.nix
rename to distros/kinetic/json-msgs/default.nix
diff --git a/kinetic/json-transport/default.nix b/distros/kinetic/json-transport/default.nix
similarity index 100%
rename from kinetic/json-transport/default.nix
rename to distros/kinetic/json-transport/default.nix
diff --git a/kinetic/julius/default.nix b/distros/kinetic/julius/default.nix
similarity index 100%
rename from kinetic/julius/default.nix
rename to distros/kinetic/julius/default.nix
diff --git a/kinetic/kalman-filter/default.nix b/distros/kinetic/kalman-filter/default.nix
similarity index 100%
rename from kinetic/kalman-filter/default.nix
rename to distros/kinetic/kalman-filter/default.nix
diff --git a/kinetic/kartech-linear-actuator-msgs/default.nix b/distros/kinetic/kartech-linear-actuator-msgs/default.nix
similarity index 100%
rename from kinetic/kartech-linear-actuator-msgs/default.nix
rename to distros/kinetic/kartech-linear-actuator-msgs/default.nix
diff --git a/kinetic/katana-arm-gazebo/default.nix b/distros/kinetic/katana-arm-gazebo/default.nix
similarity index 100%
rename from kinetic/katana-arm-gazebo/default.nix
rename to distros/kinetic/katana-arm-gazebo/default.nix
diff --git a/kinetic/katana-description/default.nix b/distros/kinetic/katana-description/default.nix
similarity index 100%
rename from kinetic/katana-description/default.nix
rename to distros/kinetic/katana-description/default.nix
diff --git a/kinetic/katana-driver/default.nix b/distros/kinetic/katana-driver/default.nix
similarity index 100%
rename from kinetic/katana-driver/default.nix
rename to distros/kinetic/katana-driver/default.nix
diff --git a/kinetic/katana-gazebo-plugins/default.nix b/distros/kinetic/katana-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/katana-gazebo-plugins/default.nix
rename to distros/kinetic/katana-gazebo-plugins/default.nix
diff --git a/kinetic/katana-moveit-ikfast-plugin/default.nix b/distros/kinetic/katana-moveit-ikfast-plugin/default.nix
similarity index 100%
rename from kinetic/katana-moveit-ikfast-plugin/default.nix
rename to distros/kinetic/katana-moveit-ikfast-plugin/default.nix
diff --git a/kinetic/katana-msgs/default.nix b/distros/kinetic/katana-msgs/default.nix
similarity index 100%
rename from kinetic/katana-msgs/default.nix
rename to distros/kinetic/katana-msgs/default.nix
diff --git a/kinetic/katana-teleop/default.nix b/distros/kinetic/katana-teleop/default.nix
similarity index 100%
rename from kinetic/katana-teleop/default.nix
rename to distros/kinetic/katana-teleop/default.nix
diff --git a/kinetic/katana-tutorials/default.nix b/distros/kinetic/katana-tutorials/default.nix
similarity index 100%
rename from kinetic/katana-tutorials/default.nix
rename to distros/kinetic/katana-tutorials/default.nix
diff --git a/kinetic/katana/default.nix b/distros/kinetic/katana/default.nix
similarity index 100%
rename from kinetic/katana/default.nix
rename to distros/kinetic/katana/default.nix
diff --git a/kinetic/kdl-conversions/default.nix b/distros/kinetic/kdl-conversions/default.nix
similarity index 100%
rename from kinetic/kdl-conversions/default.nix
rename to distros/kinetic/kdl-conversions/default.nix
diff --git a/kinetic/kdl-parser-py/default.nix b/distros/kinetic/kdl-parser-py/default.nix
similarity index 100%
rename from kinetic/kdl-parser-py/default.nix
rename to distros/kinetic/kdl-parser-py/default.nix
diff --git a/kinetic/kdl-parser/default.nix b/distros/kinetic/kdl-parser/default.nix
similarity index 100%
rename from kinetic/kdl-parser/default.nix
rename to distros/kinetic/kdl-parser/default.nix
diff --git a/kinetic/kdl-typekit/default.nix b/distros/kinetic/kdl-typekit/default.nix
similarity index 100%
rename from kinetic/kdl-typekit/default.nix
rename to distros/kinetic/kdl-typekit/default.nix
diff --git a/kinetic/key-teleop/default.nix b/distros/kinetic/key-teleop/default.nix
similarity index 100%
rename from kinetic/key-teleop/default.nix
rename to distros/kinetic/key-teleop/default.nix
diff --git a/kinetic/khi-duaro-description/default.nix b/distros/kinetic/khi-duaro-description/default.nix
similarity index 100%
rename from kinetic/khi-duaro-description/default.nix
rename to distros/kinetic/khi-duaro-description/default.nix
diff --git a/kinetic/khi-duaro-gazebo/default.nix b/distros/kinetic/khi-duaro-gazebo/default.nix
similarity index 100%
rename from kinetic/khi-duaro-gazebo/default.nix
rename to distros/kinetic/khi-duaro-gazebo/default.nix
diff --git a/kinetic/khi-duaro-ikfast-plugin/default.nix b/distros/kinetic/khi-duaro-ikfast-plugin/default.nix
similarity index 100%
rename from kinetic/khi-duaro-ikfast-plugin/default.nix
rename to distros/kinetic/khi-duaro-ikfast-plugin/default.nix
diff --git a/kinetic/khi-duaro-moveit-config/default.nix b/distros/kinetic/khi-duaro-moveit-config/default.nix
similarity index 100%
rename from kinetic/khi-duaro-moveit-config/default.nix
rename to distros/kinetic/khi-duaro-moveit-config/default.nix
diff --git a/kinetic/khi-robot-bringup/default.nix b/distros/kinetic/khi-robot-bringup/default.nix
similarity index 100%
rename from kinetic/khi-robot-bringup/default.nix
rename to distros/kinetic/khi-robot-bringup/default.nix
diff --git a/kinetic/khi-robot-control/default.nix b/distros/kinetic/khi-robot-control/default.nix
similarity index 100%
rename from kinetic/khi-robot-control/default.nix
rename to distros/kinetic/khi-robot-control/default.nix
diff --git a/kinetic/khi-robot-msgs/default.nix b/distros/kinetic/khi-robot-msgs/default.nix
similarity index 100%
rename from kinetic/khi-robot-msgs/default.nix
rename to distros/kinetic/khi-robot-msgs/default.nix
diff --git a/kinetic/khi-robot/default.nix b/distros/kinetic/khi-robot/default.nix
similarity index 100%
rename from kinetic/khi-robot/default.nix
rename to distros/kinetic/khi-robot/default.nix
diff --git a/kinetic/khi-rs-description/default.nix b/distros/kinetic/khi-rs-description/default.nix
similarity index 100%
rename from kinetic/khi-rs-description/default.nix
rename to distros/kinetic/khi-rs-description/default.nix
diff --git a/kinetic/khi-rs-gazebo/default.nix b/distros/kinetic/khi-rs-gazebo/default.nix
similarity index 100%
rename from kinetic/khi-rs-gazebo/default.nix
rename to distros/kinetic/khi-rs-gazebo/default.nix
diff --git a/kinetic/khi-rs-ikfast-plugin/default.nix b/distros/kinetic/khi-rs-ikfast-plugin/default.nix
similarity index 100%
rename from kinetic/khi-rs-ikfast-plugin/default.nix
rename to distros/kinetic/khi-rs-ikfast-plugin/default.nix
diff --git a/kinetic/khi-rs007l-moveit-config/default.nix b/distros/kinetic/khi-rs007l-moveit-config/default.nix
similarity index 100%
rename from kinetic/khi-rs007l-moveit-config/default.nix
rename to distros/kinetic/khi-rs007l-moveit-config/default.nix
diff --git a/kinetic/khi-rs007n-moveit-config/default.nix b/distros/kinetic/khi-rs007n-moveit-config/default.nix
similarity index 100%
rename from kinetic/khi-rs007n-moveit-config/default.nix
rename to distros/kinetic/khi-rs007n-moveit-config/default.nix
diff --git a/kinetic/khi-rs080n-moveit-config/default.nix b/distros/kinetic/khi-rs080n-moveit-config/default.nix
similarity index 100%
rename from kinetic/khi-rs080n-moveit-config/default.nix
rename to distros/kinetic/khi-rs080n-moveit-config/default.nix
diff --git a/kinetic/kinematics-exchanger/default.nix b/distros/kinetic/kinematics-exchanger/default.nix
similarity index 100%
rename from kinetic/kinematics-exchanger/default.nix
rename to distros/kinetic/kinematics-exchanger/default.nix
diff --git a/kinetic/kinesis-manager/default.nix b/distros/kinetic/kinesis-manager/default.nix
similarity index 100%
rename from kinetic/kinesis-manager/default.nix
rename to distros/kinetic/kinesis-manager/default.nix
diff --git a/kinetic/kinesis-video-msgs/default.nix b/distros/kinetic/kinesis-video-msgs/default.nix
similarity index 100%
rename from kinetic/kinesis-video-msgs/default.nix
rename to distros/kinetic/kinesis-video-msgs/default.nix
diff --git a/kinetic/kinesis-video-streamer/default.nix b/distros/kinetic/kinesis-video-streamer/default.nix
similarity index 100%
rename from kinetic/kinesis-video-streamer/default.nix
rename to distros/kinetic/kinesis-video-streamer/default.nix
diff --git a/kinetic/kni/default.nix b/distros/kinetic/kni/default.nix
similarity index 100%
rename from kinetic/kni/default.nix
rename to distros/kinetic/kni/default.nix
diff --git a/kinetic/kobuki-auto-docking/default.nix b/distros/kinetic/kobuki-auto-docking/default.nix
similarity index 100%
rename from kinetic/kobuki-auto-docking/default.nix
rename to distros/kinetic/kobuki-auto-docking/default.nix
diff --git a/kinetic/kobuki-bumper2pc/default.nix b/distros/kinetic/kobuki-bumper2pc/default.nix
similarity index 100%
rename from kinetic/kobuki-bumper2pc/default.nix
rename to distros/kinetic/kobuki-bumper2pc/default.nix
diff --git a/kinetic/kobuki-capabilities/default.nix b/distros/kinetic/kobuki-capabilities/default.nix
similarity index 100%
rename from kinetic/kobuki-capabilities/default.nix
rename to distros/kinetic/kobuki-capabilities/default.nix
diff --git a/kinetic/kobuki-controller-tutorial/default.nix b/distros/kinetic/kobuki-controller-tutorial/default.nix
similarity index 100%
rename from kinetic/kobuki-controller-tutorial/default.nix
rename to distros/kinetic/kobuki-controller-tutorial/default.nix
diff --git a/kinetic/kobuki-core/default.nix b/distros/kinetic/kobuki-core/default.nix
similarity index 100%
rename from kinetic/kobuki-core/default.nix
rename to distros/kinetic/kobuki-core/default.nix
diff --git a/kinetic/kobuki-dashboard/default.nix b/distros/kinetic/kobuki-dashboard/default.nix
similarity index 100%
rename from kinetic/kobuki-dashboard/default.nix
rename to distros/kinetic/kobuki-dashboard/default.nix
diff --git a/kinetic/kobuki-description/default.nix b/distros/kinetic/kobuki-description/default.nix
similarity index 100%
rename from kinetic/kobuki-description/default.nix
rename to distros/kinetic/kobuki-description/default.nix
diff --git a/kinetic/kobuki-desktop/default.nix b/distros/kinetic/kobuki-desktop/default.nix
similarity index 100%
rename from kinetic/kobuki-desktop/default.nix
rename to distros/kinetic/kobuki-desktop/default.nix
diff --git a/kinetic/kobuki-dock-drive/default.nix b/distros/kinetic/kobuki-dock-drive/default.nix
similarity index 100%
rename from kinetic/kobuki-dock-drive/default.nix
rename to distros/kinetic/kobuki-dock-drive/default.nix
diff --git a/kinetic/kobuki-driver/default.nix b/distros/kinetic/kobuki-driver/default.nix
similarity index 100%
rename from kinetic/kobuki-driver/default.nix
rename to distros/kinetic/kobuki-driver/default.nix
diff --git a/kinetic/kobuki-ftdi/default.nix b/distros/kinetic/kobuki-ftdi/default.nix
similarity index 100%
rename from kinetic/kobuki-ftdi/default.nix
rename to distros/kinetic/kobuki-ftdi/default.nix
diff --git a/kinetic/kobuki-gazebo-plugins/default.nix b/distros/kinetic/kobuki-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/kobuki-gazebo-plugins/default.nix
rename to distros/kinetic/kobuki-gazebo-plugins/default.nix
diff --git a/kinetic/kobuki-gazebo/default.nix b/distros/kinetic/kobuki-gazebo/default.nix
similarity index 100%
rename from kinetic/kobuki-gazebo/default.nix
rename to distros/kinetic/kobuki-gazebo/default.nix
diff --git a/kinetic/kobuki-keyop/default.nix b/distros/kinetic/kobuki-keyop/default.nix
similarity index 100%
rename from kinetic/kobuki-keyop/default.nix
rename to distros/kinetic/kobuki-keyop/default.nix
diff --git a/kinetic/kobuki-msgs/default.nix b/distros/kinetic/kobuki-msgs/default.nix
similarity index 100%
rename from kinetic/kobuki-msgs/default.nix
rename to distros/kinetic/kobuki-msgs/default.nix
diff --git a/kinetic/kobuki-node/default.nix b/distros/kinetic/kobuki-node/default.nix
similarity index 100%
rename from kinetic/kobuki-node/default.nix
rename to distros/kinetic/kobuki-node/default.nix
diff --git a/kinetic/kobuki-random-walker/default.nix b/distros/kinetic/kobuki-random-walker/default.nix
similarity index 100%
rename from kinetic/kobuki-random-walker/default.nix
rename to distros/kinetic/kobuki-random-walker/default.nix
diff --git a/kinetic/kobuki-rapps/default.nix b/distros/kinetic/kobuki-rapps/default.nix
similarity index 100%
rename from kinetic/kobuki-rapps/default.nix
rename to distros/kinetic/kobuki-rapps/default.nix
diff --git a/kinetic/kobuki-rviz-launchers/default.nix b/distros/kinetic/kobuki-rviz-launchers/default.nix
similarity index 100%
rename from kinetic/kobuki-rviz-launchers/default.nix
rename to distros/kinetic/kobuki-rviz-launchers/default.nix
diff --git a/kinetic/kobuki-safety-controller/default.nix b/distros/kinetic/kobuki-safety-controller/default.nix
similarity index 100%
rename from kinetic/kobuki-safety-controller/default.nix
rename to distros/kinetic/kobuki-safety-controller/default.nix
diff --git a/kinetic/kobuki-soft/default.nix b/distros/kinetic/kobuki-soft/default.nix
similarity index 100%
rename from kinetic/kobuki-soft/default.nix
rename to distros/kinetic/kobuki-soft/default.nix
diff --git a/kinetic/kobuki-softapps/default.nix b/distros/kinetic/kobuki-softapps/default.nix
similarity index 100%
rename from kinetic/kobuki-softapps/default.nix
rename to distros/kinetic/kobuki-softapps/default.nix
diff --git a/kinetic/kobuki-softnode/default.nix b/distros/kinetic/kobuki-softnode/default.nix
similarity index 100%
rename from kinetic/kobuki-softnode/default.nix
rename to distros/kinetic/kobuki-softnode/default.nix
diff --git a/kinetic/kobuki-testsuite/default.nix b/distros/kinetic/kobuki-testsuite/default.nix
similarity index 100%
rename from kinetic/kobuki-testsuite/default.nix
rename to distros/kinetic/kobuki-testsuite/default.nix
diff --git a/kinetic/kobuki/default.nix b/distros/kinetic/kobuki/default.nix
similarity index 100%
rename from kinetic/kobuki/default.nix
rename to distros/kinetic/kobuki/default.nix
diff --git a/kinetic/korg-nanokontrol/default.nix b/distros/kinetic/korg-nanokontrol/default.nix
similarity index 100%
rename from kinetic/korg-nanokontrol/default.nix
rename to distros/kinetic/korg-nanokontrol/default.nix
diff --git a/kinetic/ksql-airport/default.nix b/distros/kinetic/ksql-airport/default.nix
similarity index 100%
rename from kinetic/ksql-airport/default.nix
rename to distros/kinetic/ksql-airport/default.nix
diff --git a/kinetic/kvh/default.nix b/distros/kinetic/kvh/default.nix
similarity index 100%
rename from kinetic/kvh/default.nix
rename to distros/kinetic/kvh/default.nix
diff --git a/kinetic/laptop-battery-monitor/default.nix b/distros/kinetic/laptop-battery-monitor/default.nix
similarity index 100%
rename from kinetic/laptop-battery-monitor/default.nix
rename to distros/kinetic/laptop-battery-monitor/default.nix
diff --git a/kinetic/laser-assembler/default.nix b/distros/kinetic/laser-assembler/default.nix
similarity index 100%
rename from kinetic/laser-assembler/default.nix
rename to distros/kinetic/laser-assembler/default.nix
diff --git a/kinetic/laser-cb-detector/default.nix b/distros/kinetic/laser-cb-detector/default.nix
similarity index 100%
rename from kinetic/laser-cb-detector/default.nix
rename to distros/kinetic/laser-cb-detector/default.nix
diff --git a/kinetic/laser-filtering/default.nix b/distros/kinetic/laser-filtering/default.nix
similarity index 100%
rename from kinetic/laser-filtering/default.nix
rename to distros/kinetic/laser-filtering/default.nix
diff --git a/kinetic/laser-filters-jsk-patch/default.nix b/distros/kinetic/laser-filters-jsk-patch/default.nix
similarity index 100%
rename from kinetic/laser-filters-jsk-patch/default.nix
rename to distros/kinetic/laser-filters-jsk-patch/default.nix
diff --git a/kinetic/laser-filters/default.nix b/distros/kinetic/laser-filters/default.nix
similarity index 100%
rename from kinetic/laser-filters/default.nix
rename to distros/kinetic/laser-filters/default.nix
diff --git a/kinetic/laser-geometry/default.nix b/distros/kinetic/laser-geometry/default.nix
similarity index 100%
rename from kinetic/laser-geometry/default.nix
rename to distros/kinetic/laser-geometry/default.nix
diff --git a/kinetic/laser-joint-processor/default.nix b/distros/kinetic/laser-joint-processor/default.nix
similarity index 100%
rename from kinetic/laser-joint-processor/default.nix
rename to distros/kinetic/laser-joint-processor/default.nix
diff --git a/kinetic/laser-joint-projector/default.nix b/distros/kinetic/laser-joint-projector/default.nix
similarity index 100%
rename from kinetic/laser-joint-projector/default.nix
rename to distros/kinetic/laser-joint-projector/default.nix
diff --git a/kinetic/laser-ortho-projector/default.nix b/distros/kinetic/laser-ortho-projector/default.nix
similarity index 100%
rename from kinetic/laser-ortho-projector/default.nix
rename to distros/kinetic/laser-ortho-projector/default.nix
diff --git a/kinetic/laser-pipeline/default.nix b/distros/kinetic/laser-pipeline/default.nix
similarity index 100%
rename from kinetic/laser-pipeline/default.nix
rename to distros/kinetic/laser-pipeline/default.nix
diff --git a/kinetic/laser-proc/default.nix b/distros/kinetic/laser-proc/default.nix
similarity index 100%
rename from kinetic/laser-proc/default.nix
rename to distros/kinetic/laser-proc/default.nix
diff --git a/kinetic/laser-scan-densifier/default.nix b/distros/kinetic/laser-scan-densifier/default.nix
similarity index 100%
rename from kinetic/laser-scan-densifier/default.nix
rename to distros/kinetic/laser-scan-densifier/default.nix
diff --git a/kinetic/laser-scan-matcher/default.nix b/distros/kinetic/laser-scan-matcher/default.nix
similarity index 100%
rename from kinetic/laser-scan-matcher/default.nix
rename to distros/kinetic/laser-scan-matcher/default.nix
diff --git a/kinetic/laser-scan-publisher-tutorial/default.nix b/distros/kinetic/laser-scan-publisher-tutorial/default.nix
similarity index 100%
rename from kinetic/laser-scan-publisher-tutorial/default.nix
rename to distros/kinetic/laser-scan-publisher-tutorial/default.nix
diff --git a/kinetic/laser-scan-sparsifier/default.nix b/distros/kinetic/laser-scan-sparsifier/default.nix
similarity index 100%
rename from kinetic/laser-scan-sparsifier/default.nix
rename to distros/kinetic/laser-scan-sparsifier/default.nix
diff --git a/kinetic/laser-scan-splitter/default.nix b/distros/kinetic/laser-scan-splitter/default.nix
similarity index 100%
rename from kinetic/laser-scan-splitter/default.nix
rename to distros/kinetic/laser-scan-splitter/default.nix
diff --git a/kinetic/laser-tilt-controller-filter/default.nix b/distros/kinetic/laser-tilt-controller-filter/default.nix
similarity index 100%
rename from kinetic/laser-tilt-controller-filter/default.nix
rename to distros/kinetic/laser-tilt-controller-filter/default.nix
diff --git a/kinetic/launchman/default.nix b/distros/kinetic/launchman/default.nix
similarity index 100%
rename from kinetic/launchman/default.nix
rename to distros/kinetic/launchman/default.nix
diff --git a/kinetic/lauv-control/default.nix b/distros/kinetic/lauv-control/default.nix
similarity index 100%
rename from kinetic/lauv-control/default.nix
rename to distros/kinetic/lauv-control/default.nix
diff --git a/kinetic/lauv-description/default.nix b/distros/kinetic/lauv-description/default.nix
similarity index 100%
rename from kinetic/lauv-description/default.nix
rename to distros/kinetic/lauv-description/default.nix
diff --git a/kinetic/lauv-gazebo/default.nix b/distros/kinetic/lauv-gazebo/default.nix
similarity index 100%
rename from kinetic/lauv-gazebo/default.nix
rename to distros/kinetic/lauv-gazebo/default.nix
diff --git a/kinetic/leap-motion/default.nix b/distros/kinetic/leap-motion/default.nix
similarity index 100%
rename from kinetic/leap-motion/default.nix
rename to distros/kinetic/leap-motion/default.nix
diff --git a/kinetic/leg-detector/default.nix b/distros/kinetic/leg-detector/default.nix
similarity index 100%
rename from kinetic/leg-detector/default.nix
rename to distros/kinetic/leg-detector/default.nix
diff --git a/kinetic/leuze-bringup/default.nix b/distros/kinetic/leuze-bringup/default.nix
similarity index 100%
rename from kinetic/leuze-bringup/default.nix
rename to distros/kinetic/leuze-bringup/default.nix
diff --git a/kinetic/leuze-description/default.nix b/distros/kinetic/leuze-description/default.nix
similarity index 100%
rename from kinetic/leuze-description/default.nix
rename to distros/kinetic/leuze-description/default.nix
diff --git a/kinetic/leuze-msgs/default.nix b/distros/kinetic/leuze-msgs/default.nix
similarity index 100%
rename from kinetic/leuze-msgs/default.nix
rename to distros/kinetic/leuze-msgs/default.nix
diff --git a/kinetic/leuze-phidget-driver/default.nix b/distros/kinetic/leuze-phidget-driver/default.nix
similarity index 100%
rename from kinetic/leuze-phidget-driver/default.nix
rename to distros/kinetic/leuze-phidget-driver/default.nix
diff --git a/kinetic/leuze-ros-drivers/default.nix b/distros/kinetic/leuze-ros-drivers/default.nix
similarity index 100%
rename from kinetic/leuze-ros-drivers/default.nix
rename to distros/kinetic/leuze-ros-drivers/default.nix
diff --git a/kinetic/leuze-rsl-driver/default.nix b/distros/kinetic/leuze-rsl-driver/default.nix
similarity index 100%
rename from kinetic/leuze-rsl-driver/default.nix
rename to distros/kinetic/leuze-rsl-driver/default.nix
diff --git a/kinetic/lex-common-msgs/default.nix b/distros/kinetic/lex-common-msgs/default.nix
similarity index 100%
rename from kinetic/lex-common-msgs/default.nix
rename to distros/kinetic/lex-common-msgs/default.nix
diff --git a/kinetic/lex-common/default.nix b/distros/kinetic/lex-common/default.nix
similarity index 100%
rename from kinetic/lex-common/default.nix
rename to distros/kinetic/lex-common/default.nix
diff --git a/kinetic/lex-node/default.nix b/distros/kinetic/lex-node/default.nix
similarity index 100%
rename from kinetic/lex-node/default.nix
rename to distros/kinetic/lex-node/default.nix
diff --git a/kinetic/lgsvl-msgs/default.nix b/distros/kinetic/lgsvl-msgs/default.nix
similarity index 100%
rename from kinetic/lgsvl-msgs/default.nix
rename to distros/kinetic/lgsvl-msgs/default.nix
diff --git a/kinetic/libcmt/default.nix b/distros/kinetic/libcmt/default.nix
similarity index 100%
rename from kinetic/libcmt/default.nix
rename to distros/kinetic/libcmt/default.nix
diff --git a/kinetic/libconcorde-tsp-solver/default.nix b/distros/kinetic/libconcorde-tsp-solver/default.nix
similarity index 100%
rename from kinetic/libconcorde-tsp-solver/default.nix
rename to distros/kinetic/libconcorde-tsp-solver/default.nix
diff --git a/kinetic/libcreate/default.nix b/distros/kinetic/libcreate/default.nix
similarity index 100%
rename from kinetic/libcreate/default.nix
rename to distros/kinetic/libcreate/default.nix
diff --git a/kinetic/libdlib/default.nix b/distros/kinetic/libdlib/default.nix
similarity index 100%
rename from kinetic/libdlib/default.nix
rename to distros/kinetic/libdlib/default.nix
diff --git a/kinetic/libfranka/default.nix b/distros/kinetic/libfranka/default.nix
similarity index 100%
rename from kinetic/libfranka/default.nix
rename to distros/kinetic/libfranka/default.nix
diff --git a/kinetic/libfreenect/default.nix b/distros/kinetic/libfreenect/default.nix
similarity index 100%
rename from kinetic/libfreenect/default.nix
rename to distros/kinetic/libfreenect/default.nix
diff --git a/kinetic/libg2o/default.nix b/distros/kinetic/libg2o/default.nix
similarity index 100%
rename from kinetic/libg2o/default.nix
rename to distros/kinetic/libg2o/default.nix
diff --git a/kinetic/libmavconn/default.nix b/distros/kinetic/libmavconn/default.nix
similarity index 100%
rename from kinetic/libmavconn/default.nix
rename to distros/kinetic/libmavconn/default.nix
diff --git a/kinetic/libmodbus/default.nix b/distros/kinetic/libmodbus/default.nix
similarity index 100%
rename from kinetic/libmodbus/default.nix
rename to distros/kinetic/libmodbus/default.nix
diff --git a/kinetic/libmongocxx-ros/default.nix b/distros/kinetic/libmongocxx-ros/default.nix
similarity index 100%
rename from kinetic/libmongocxx-ros/default.nix
rename to distros/kinetic/libmongocxx-ros/default.nix
diff --git a/kinetic/libntcan/default.nix b/distros/kinetic/libntcan/default.nix
similarity index 100%
rename from kinetic/libntcan/default.nix
rename to distros/kinetic/libntcan/default.nix
diff --git a/kinetic/libpcan/default.nix b/distros/kinetic/libpcan/default.nix
similarity index 100%
rename from kinetic/libpcan/default.nix
rename to distros/kinetic/libpcan/default.nix
diff --git a/kinetic/libphidget21/default.nix b/distros/kinetic/libphidget21/default.nix
similarity index 100%
rename from kinetic/libphidget21/default.nix
rename to distros/kinetic/libphidget21/default.nix
diff --git a/kinetic/libphidgets/default.nix b/distros/kinetic/libphidgets/default.nix
similarity index 100%
rename from kinetic/libphidgets/default.nix
rename to distros/kinetic/libphidgets/default.nix
diff --git a/kinetic/libqsopt/default.nix b/distros/kinetic/libqsopt/default.nix
similarity index 100%
rename from kinetic/libqsopt/default.nix
rename to distros/kinetic/libqsopt/default.nix
diff --git a/kinetic/libqt-concurrent/default.nix b/distros/kinetic/libqt-concurrent/default.nix
similarity index 100%
rename from kinetic/libqt-concurrent/default.nix
rename to distros/kinetic/libqt-concurrent/default.nix
diff --git a/kinetic/libqt-core/default.nix b/distros/kinetic/libqt-core/default.nix
similarity index 100%
rename from kinetic/libqt-core/default.nix
rename to distros/kinetic/libqt-core/default.nix
diff --git a/kinetic/libqt-dev/default.nix b/distros/kinetic/libqt-dev/default.nix
similarity index 100%
rename from kinetic/libqt-dev/default.nix
rename to distros/kinetic/libqt-dev/default.nix
diff --git a/kinetic/libqt-gui/default.nix b/distros/kinetic/libqt-gui/default.nix
similarity index 100%
rename from kinetic/libqt-gui/default.nix
rename to distros/kinetic/libqt-gui/default.nix
diff --git a/kinetic/libqt-network/default.nix b/distros/kinetic/libqt-network/default.nix
similarity index 100%
rename from kinetic/libqt-network/default.nix
rename to distros/kinetic/libqt-network/default.nix
diff --git a/kinetic/libqt-opengl-dev/default.nix b/distros/kinetic/libqt-opengl-dev/default.nix
similarity index 100%
rename from kinetic/libqt-opengl-dev/default.nix
rename to distros/kinetic/libqt-opengl-dev/default.nix
diff --git a/kinetic/libqt-opengl/default.nix b/distros/kinetic/libqt-opengl/default.nix
similarity index 100%
rename from kinetic/libqt-opengl/default.nix
rename to distros/kinetic/libqt-opengl/default.nix
diff --git a/kinetic/libqt-svg-dev/default.nix b/distros/kinetic/libqt-svg-dev/default.nix
similarity index 100%
rename from kinetic/libqt-svg-dev/default.nix
rename to distros/kinetic/libqt-svg-dev/default.nix
diff --git a/kinetic/libqt-widgets/default.nix b/distros/kinetic/libqt-widgets/default.nix
similarity index 100%
rename from kinetic/libqt-widgets/default.nix
rename to distros/kinetic/libqt-widgets/default.nix
diff --git a/kinetic/librealsense/default.nix b/distros/kinetic/librealsense/default.nix
similarity index 100%
rename from kinetic/librealsense/default.nix
rename to distros/kinetic/librealsense/default.nix
diff --git a/kinetic/librealsense/gcc7.patch b/distros/kinetic/librealsense/gcc7.patch
similarity index 100%
rename from kinetic/librealsense/gcc7.patch
rename to distros/kinetic/librealsense/gcc7.patch
diff --git a/kinetic/librealsense2/default.nix b/distros/kinetic/librealsense2/default.nix
similarity index 100%
rename from kinetic/librealsense2/default.nix
rename to distros/kinetic/librealsense2/default.nix
diff --git a/kinetic/libreflexxestype2/default.nix b/distros/kinetic/libreflexxestype2/default.nix
similarity index 100%
rename from kinetic/libreflexxestype2/default.nix
rename to distros/kinetic/libreflexxestype2/default.nix
diff --git a/kinetic/librviz-tutorial/default.nix b/distros/kinetic/librviz-tutorial/default.nix
similarity index 100%
rename from kinetic/librviz-tutorial/default.nix
rename to distros/kinetic/librviz-tutorial/default.nix
diff --git a/kinetic/libsensors-monitor/default.nix b/distros/kinetic/libsensors-monitor/default.nix
similarity index 100%
rename from kinetic/libsensors-monitor/default.nix
rename to distros/kinetic/libsensors-monitor/default.nix
diff --git a/kinetic/libsiftfast/default.nix b/distros/kinetic/libsiftfast/default.nix
similarity index 100%
rename from kinetic/libsiftfast/default.nix
rename to distros/kinetic/libsiftfast/default.nix
diff --git a/kinetic/libuvc-camera/default.nix b/distros/kinetic/libuvc-camera/default.nix
similarity index 100%
rename from kinetic/libuvc-camera/default.nix
rename to distros/kinetic/libuvc-camera/default.nix
diff --git a/kinetic/libuvc-ros/default.nix b/distros/kinetic/libuvc-ros/default.nix
similarity index 100%
rename from kinetic/libuvc-ros/default.nix
rename to distros/kinetic/libuvc-ros/default.nix
diff --git a/kinetic/libuvc/default.nix b/distros/kinetic/libuvc/default.nix
similarity index 100%
rename from kinetic/libuvc/default.nix
rename to distros/kinetic/libuvc/default.nix
diff --git a/kinetic/linksys-access-point/default.nix b/distros/kinetic/linksys-access-point/default.nix
similarity index 100%
rename from kinetic/linksys-access-point/default.nix
rename to distros/kinetic/linksys-access-point/default.nix
diff --git a/kinetic/linux-networking/default.nix b/distros/kinetic/linux-networking/default.nix
similarity index 100%
rename from kinetic/linux-networking/default.nix
rename to distros/kinetic/linux-networking/default.nix
diff --git a/kinetic/linux-peripheral-interfaces/default.nix b/distros/kinetic/linux-peripheral-interfaces/default.nix
similarity index 100%
rename from kinetic/linux-peripheral-interfaces/default.nix
rename to distros/kinetic/linux-peripheral-interfaces/default.nix
diff --git a/kinetic/lkh-solver/default.nix b/distros/kinetic/lkh-solver/default.nix
similarity index 100%
rename from kinetic/lkh-solver/default.nix
rename to distros/kinetic/lkh-solver/default.nix
diff --git a/kinetic/lkh/default.nix b/distros/kinetic/lkh/default.nix
similarity index 100%
rename from kinetic/lkh/default.nix
rename to distros/kinetic/lkh/default.nix
diff --git a/kinetic/lms1xx/default.nix b/distros/kinetic/lms1xx/default.nix
similarity index 100%
rename from kinetic/lms1xx/default.nix
rename to distros/kinetic/lms1xx/default.nix
diff --git a/kinetic/lockfree/default.nix b/distros/kinetic/lockfree/default.nix
similarity index 100%
rename from kinetic/lockfree/default.nix
rename to distros/kinetic/lockfree/default.nix
diff --git a/kinetic/locomotor-msgs/default.nix b/distros/kinetic/locomotor-msgs/default.nix
similarity index 100%
rename from kinetic/locomotor-msgs/default.nix
rename to distros/kinetic/locomotor-msgs/default.nix
diff --git a/kinetic/locomotor/default.nix b/distros/kinetic/locomotor/default.nix
similarity index 100%
rename from kinetic/locomotor/default.nix
rename to distros/kinetic/locomotor/default.nix
diff --git a/kinetic/locomove-base/default.nix b/distros/kinetic/locomove-base/default.nix
similarity index 100%
rename from kinetic/locomove-base/default.nix
rename to distros/kinetic/locomove-base/default.nix
diff --git a/kinetic/log4cpp/default.nix b/distros/kinetic/log4cpp/default.nix
similarity index 100%
rename from kinetic/log4cpp/default.nix
rename to distros/kinetic/log4cpp/default.nix
diff --git a/kinetic/loki-base-node/default.nix b/distros/kinetic/loki-base-node/default.nix
similarity index 100%
rename from kinetic/loki-base-node/default.nix
rename to distros/kinetic/loki-base-node/default.nix
diff --git a/kinetic/loki-bringup/default.nix b/distros/kinetic/loki-bringup/default.nix
similarity index 100%
rename from kinetic/loki-bringup/default.nix
rename to distros/kinetic/loki-bringup/default.nix
diff --git a/kinetic/loki-demos/default.nix b/distros/kinetic/loki-demos/default.nix
similarity index 100%
rename from kinetic/loki-demos/default.nix
rename to distros/kinetic/loki-demos/default.nix
diff --git a/kinetic/loki-description/default.nix b/distros/kinetic/loki-description/default.nix
similarity index 100%
rename from kinetic/loki-description/default.nix
rename to distros/kinetic/loki-description/default.nix
diff --git a/kinetic/loki-nav/default.nix b/distros/kinetic/loki-nav/default.nix
similarity index 100%
rename from kinetic/loki-nav/default.nix
rename to distros/kinetic/loki-nav/default.nix
diff --git a/kinetic/loki-robot/default.nix b/distros/kinetic/loki-robot/default.nix
similarity index 100%
rename from kinetic/loki-robot/default.nix
rename to distros/kinetic/loki-robot/default.nix
diff --git a/kinetic/loki-teleop/default.nix b/distros/kinetic/loki-teleop/default.nix
similarity index 100%
rename from kinetic/loki-teleop/default.nix
rename to distros/kinetic/loki-teleop/default.nix
diff --git a/kinetic/look-at-pose/default.nix b/distros/kinetic/look-at-pose/default.nix
similarity index 100%
rename from kinetic/look-at-pose/default.nix
rename to distros/kinetic/look-at-pose/default.nix
diff --git a/kinetic/lost-comms-recovery/default.nix b/distros/kinetic/lost-comms-recovery/default.nix
similarity index 100%
rename from kinetic/lost-comms-recovery/default.nix
rename to distros/kinetic/lost-comms-recovery/default.nix
diff --git a/kinetic/lpg-planner/default.nix b/distros/kinetic/lpg-planner/default.nix
similarity index 100%
rename from kinetic/lpg-planner/default.nix
rename to distros/kinetic/lpg-planner/default.nix
diff --git a/kinetic/lusb/default.nix b/distros/kinetic/lusb/default.nix
similarity index 100%
rename from kinetic/lusb/default.nix
rename to distros/kinetic/lusb/default.nix
diff --git a/kinetic/lyap-control/default.nix b/distros/kinetic/lyap-control/default.nix
similarity index 100%
rename from kinetic/lyap-control/default.nix
rename to distros/kinetic/lyap-control/default.nix
diff --git a/kinetic/magni-bringup/default.nix b/distros/kinetic/magni-bringup/default.nix
similarity index 100%
rename from kinetic/magni-bringup/default.nix
rename to distros/kinetic/magni-bringup/default.nix
diff --git a/kinetic/magni-demos/default.nix b/distros/kinetic/magni-demos/default.nix
similarity index 100%
rename from kinetic/magni-demos/default.nix
rename to distros/kinetic/magni-demos/default.nix
diff --git a/kinetic/magni-description/default.nix b/distros/kinetic/magni-description/default.nix
similarity index 100%
rename from kinetic/magni-description/default.nix
rename to distros/kinetic/magni-description/default.nix
diff --git a/kinetic/magni-nav/default.nix b/distros/kinetic/magni-nav/default.nix
similarity index 100%
rename from kinetic/magni-nav/default.nix
rename to distros/kinetic/magni-nav/default.nix
diff --git a/kinetic/magni-robot/default.nix b/distros/kinetic/magni-robot/default.nix
similarity index 100%
rename from kinetic/magni-robot/default.nix
rename to distros/kinetic/magni-robot/default.nix
diff --git a/kinetic/magni-teleop/default.nix b/distros/kinetic/magni-teleop/default.nix
similarity index 100%
rename from kinetic/magni-teleop/default.nix
rename to distros/kinetic/magni-teleop/default.nix
diff --git a/kinetic/magni-viz/default.nix b/distros/kinetic/magni-viz/default.nix
similarity index 100%
rename from kinetic/magni-viz/default.nix
rename to distros/kinetic/magni-viz/default.nix
diff --git a/kinetic/manipulation-msgs/default.nix b/distros/kinetic/manipulation-msgs/default.nix
similarity index 100%
rename from kinetic/manipulation-msgs/default.nix
rename to distros/kinetic/manipulation-msgs/default.nix
diff --git a/kinetic/manipulator-h-base-module-msgs/default.nix b/distros/kinetic/manipulator-h-base-module-msgs/default.nix
similarity index 100%
rename from kinetic/manipulator-h-base-module-msgs/default.nix
rename to distros/kinetic/manipulator-h-base-module-msgs/default.nix
diff --git a/kinetic/manipulator-h-base-module/default.nix b/distros/kinetic/manipulator-h-base-module/default.nix
similarity index 100%
rename from kinetic/manipulator-h-base-module/default.nix
rename to distros/kinetic/manipulator-h-base-module/default.nix
diff --git a/kinetic/manipulator-h-bringup/default.nix b/distros/kinetic/manipulator-h-bringup/default.nix
similarity index 100%
rename from kinetic/manipulator-h-bringup/default.nix
rename to distros/kinetic/manipulator-h-bringup/default.nix
diff --git a/kinetic/manipulator-h-description/default.nix b/distros/kinetic/manipulator-h-description/default.nix
similarity index 100%
rename from kinetic/manipulator-h-description/default.nix
rename to distros/kinetic/manipulator-h-description/default.nix
diff --git a/kinetic/manipulator-h-gazebo/default.nix b/distros/kinetic/manipulator-h-gazebo/default.nix
similarity index 100%
rename from kinetic/manipulator-h-gazebo/default.nix
rename to distros/kinetic/manipulator-h-gazebo/default.nix
diff --git a/kinetic/manipulator-h-gui/default.nix b/distros/kinetic/manipulator-h-gui/default.nix
similarity index 100%
rename from kinetic/manipulator-h-gui/default.nix
rename to distros/kinetic/manipulator-h-gui/default.nix
diff --git a/kinetic/manipulator-h-kinematics-dynamics/default.nix b/distros/kinetic/manipulator-h-kinematics-dynamics/default.nix
similarity index 100%
rename from kinetic/manipulator-h-kinematics-dynamics/default.nix
rename to distros/kinetic/manipulator-h-kinematics-dynamics/default.nix
diff --git a/kinetic/manipulator-h-manager/default.nix b/distros/kinetic/manipulator-h-manager/default.nix
similarity index 100%
rename from kinetic/manipulator-h-manager/default.nix
rename to distros/kinetic/manipulator-h-manager/default.nix
diff --git a/kinetic/manipulator-h/default.nix b/distros/kinetic/manipulator-h/default.nix
similarity index 100%
rename from kinetic/manipulator-h/default.nix
rename to distros/kinetic/manipulator-h/default.nix
diff --git a/kinetic/map-laser/default.nix b/distros/kinetic/map-laser/default.nix
similarity index 100%
rename from kinetic/map-laser/default.nix
rename to distros/kinetic/map-laser/default.nix
diff --git a/kinetic/map-msgs/default.nix b/distros/kinetic/map-msgs/default.nix
similarity index 100%
rename from kinetic/map-msgs/default.nix
rename to distros/kinetic/map-msgs/default.nix
diff --git a/kinetic/map-organizer-msgs/default.nix b/distros/kinetic/map-organizer-msgs/default.nix
similarity index 100%
rename from kinetic/map-organizer-msgs/default.nix
rename to distros/kinetic/map-organizer-msgs/default.nix
diff --git a/kinetic/map-organizer/default.nix b/distros/kinetic/map-organizer/default.nix
similarity index 100%
rename from kinetic/map-organizer/default.nix
rename to distros/kinetic/map-organizer/default.nix
diff --git a/kinetic/map-server/default.nix b/distros/kinetic/map-server/default.nix
similarity index 100%
rename from kinetic/map-server/default.nix
rename to distros/kinetic/map-server/default.nix
diff --git a/kinetic/mapviz-plugins/default.nix b/distros/kinetic/mapviz-plugins/default.nix
similarity index 100%
rename from kinetic/mapviz-plugins/default.nix
rename to distros/kinetic/mapviz-plugins/default.nix
diff --git a/kinetic/mapviz/default.nix b/distros/kinetic/mapviz/default.nix
similarity index 100%
rename from kinetic/mapviz/default.nix
rename to distros/kinetic/mapviz/default.nix
diff --git a/kinetic/marker-msgs/default.nix b/distros/kinetic/marker-msgs/default.nix
similarity index 100%
rename from kinetic/marker-msgs/default.nix
rename to distros/kinetic/marker-msgs/default.nix
diff --git a/kinetic/marker-rviz-plugin/default.nix b/distros/kinetic/marker-rviz-plugin/default.nix
similarity index 100%
rename from kinetic/marker-rviz-plugin/default.nix
rename to distros/kinetic/marker-rviz-plugin/default.nix
diff --git a/kinetic/marshmallow/default.nix b/distros/kinetic/marshmallow/default.nix
similarity index 100%
rename from kinetic/marshmallow/default.nix
rename to distros/kinetic/marshmallow/default.nix
diff --git a/kinetic/marti-can-msgs/default.nix b/distros/kinetic/marti-can-msgs/default.nix
similarity index 100%
rename from kinetic/marti-can-msgs/default.nix
rename to distros/kinetic/marti-can-msgs/default.nix
diff --git a/kinetic/marti-common-msgs/default.nix b/distros/kinetic/marti-common-msgs/default.nix
similarity index 100%
rename from kinetic/marti-common-msgs/default.nix
rename to distros/kinetic/marti-common-msgs/default.nix
diff --git a/kinetic/marti-data-structures/default.nix b/distros/kinetic/marti-data-structures/default.nix
similarity index 100%
rename from kinetic/marti-data-structures/default.nix
rename to distros/kinetic/marti-data-structures/default.nix
diff --git a/kinetic/marti-nav-msgs/default.nix b/distros/kinetic/marti-nav-msgs/default.nix
similarity index 100%
rename from kinetic/marti-nav-msgs/default.nix
rename to distros/kinetic/marti-nav-msgs/default.nix
diff --git a/kinetic/marti-perception-msgs/default.nix b/distros/kinetic/marti-perception-msgs/default.nix
similarity index 100%
rename from kinetic/marti-perception-msgs/default.nix
rename to distros/kinetic/marti-perception-msgs/default.nix
diff --git a/kinetic/marti-sensor-msgs/default.nix b/distros/kinetic/marti-sensor-msgs/default.nix
similarity index 100%
rename from kinetic/marti-sensor-msgs/default.nix
rename to distros/kinetic/marti-sensor-msgs/default.nix
diff --git a/kinetic/marti-status-msgs/default.nix b/distros/kinetic/marti-status-msgs/default.nix
similarity index 100%
rename from kinetic/marti-status-msgs/default.nix
rename to distros/kinetic/marti-status-msgs/default.nix
diff --git a/kinetic/marti-visualization-msgs/default.nix b/distros/kinetic/marti-visualization-msgs/default.nix
similarity index 100%
rename from kinetic/marti-visualization-msgs/default.nix
rename to distros/kinetic/marti-visualization-msgs/default.nix
diff --git a/kinetic/marvelmind-nav/default.nix b/distros/kinetic/marvelmind-nav/default.nix
similarity index 100%
rename from kinetic/marvelmind-nav/default.nix
rename to distros/kinetic/marvelmind-nav/default.nix
diff --git a/kinetic/master-discovery-fkie/default.nix b/distros/kinetic/master-discovery-fkie/default.nix
similarity index 100%
rename from kinetic/master-discovery-fkie/default.nix
rename to distros/kinetic/master-discovery-fkie/default.nix
diff --git a/kinetic/master-sync-fkie/default.nix b/distros/kinetic/master-sync-fkie/default.nix
similarity index 100%
rename from kinetic/master-sync-fkie/default.nix
rename to distros/kinetic/master-sync-fkie/default.nix
diff --git a/kinetic/mav-comm/default.nix b/distros/kinetic/mav-comm/default.nix
similarity index 100%
rename from kinetic/mav-comm/default.nix
rename to distros/kinetic/mav-comm/default.nix
diff --git a/kinetic/mav-msgs/default.nix b/distros/kinetic/mav-msgs/default.nix
similarity index 100%
rename from kinetic/mav-msgs/default.nix
rename to distros/kinetic/mav-msgs/default.nix
diff --git a/kinetic/mav-planning-msgs/default.nix b/distros/kinetic/mav-planning-msgs/default.nix
similarity index 100%
rename from kinetic/mav-planning-msgs/default.nix
rename to distros/kinetic/mav-planning-msgs/default.nix
diff --git a/kinetic/mavlink/default.nix b/distros/kinetic/mavlink/default.nix
similarity index 100%
rename from kinetic/mavlink/default.nix
rename to distros/kinetic/mavlink/default.nix
diff --git a/kinetic/mavros-extras/default.nix b/distros/kinetic/mavros-extras/default.nix
similarity index 100%
rename from kinetic/mavros-extras/default.nix
rename to distros/kinetic/mavros-extras/default.nix
diff --git a/kinetic/mavros-msgs/default.nix b/distros/kinetic/mavros-msgs/default.nix
similarity index 100%
rename from kinetic/mavros-msgs/default.nix
rename to distros/kinetic/mavros-msgs/default.nix
diff --git a/kinetic/mbf-abstract-core/default.nix b/distros/kinetic/mbf-abstract-core/default.nix
similarity index 100%
rename from kinetic/mbf-abstract-core/default.nix
rename to distros/kinetic/mbf-abstract-core/default.nix
diff --git a/kinetic/mbf-abstract-nav/default.nix b/distros/kinetic/mbf-abstract-nav/default.nix
similarity index 100%
rename from kinetic/mbf-abstract-nav/default.nix
rename to distros/kinetic/mbf-abstract-nav/default.nix
diff --git a/kinetic/mbf-costmap-core/default.nix b/distros/kinetic/mbf-costmap-core/default.nix
similarity index 100%
rename from kinetic/mbf-costmap-core/default.nix
rename to distros/kinetic/mbf-costmap-core/default.nix
diff --git a/kinetic/mbf-costmap-nav/default.nix b/distros/kinetic/mbf-costmap-nav/default.nix
similarity index 100%
rename from kinetic/mbf-costmap-nav/default.nix
rename to distros/kinetic/mbf-costmap-nav/default.nix
diff --git a/kinetic/mbf-msgs/default.nix b/distros/kinetic/mbf-msgs/default.nix
similarity index 100%
rename from kinetic/mbf-msgs/default.nix
rename to distros/kinetic/mbf-msgs/default.nix
diff --git a/kinetic/mbf-simple-nav/default.nix b/distros/kinetic/mbf-simple-nav/default.nix
similarity index 100%
rename from kinetic/mbf-simple-nav/default.nix
rename to distros/kinetic/mbf-simple-nav/default.nix
diff --git a/kinetic/mbf-utility/default.nix b/distros/kinetic/mbf-utility/default.nix
similarity index 100%
rename from kinetic/mbf-utility/default.nix
rename to distros/kinetic/mbf-utility/default.nix
diff --git a/kinetic/mcl-3dl-msgs/default.nix b/distros/kinetic/mcl-3dl-msgs/default.nix
similarity index 100%
rename from kinetic/mcl-3dl-msgs/default.nix
rename to distros/kinetic/mcl-3dl-msgs/default.nix
diff --git a/kinetic/mcl-3dl/default.nix b/distros/kinetic/mcl-3dl/default.nix
similarity index 100%
rename from kinetic/mcl-3dl/default.nix
rename to distros/kinetic/mcl-3dl/default.nix
diff --git a/kinetic/mcmillan-airfield/default.nix b/distros/kinetic/mcmillan-airfield/default.nix
similarity index 100%
rename from kinetic/mcmillan-airfield/default.nix
rename to distros/kinetic/mcmillan-airfield/default.nix
diff --git a/kinetic/md49-base-controller/default.nix b/distros/kinetic/md49-base-controller/default.nix
similarity index 100%
rename from kinetic/md49-base-controller/default.nix
rename to distros/kinetic/md49-base-controller/default.nix
diff --git a/kinetic/md49-messages/default.nix b/distros/kinetic/md49-messages/default.nix
similarity index 100%
rename from kinetic/md49-messages/default.nix
rename to distros/kinetic/md49-messages/default.nix
diff --git a/kinetic/md49-serialport/default.nix b/distros/kinetic/md49-serialport/default.nix
similarity index 100%
rename from kinetic/md49-serialport/default.nix
rename to distros/kinetic/md49-serialport/default.nix
diff --git a/kinetic/mecanum-gazebo-plugin/default.nix b/distros/kinetic/mecanum-gazebo-plugin/default.nix
similarity index 100%
rename from kinetic/mecanum-gazebo-plugin/default.nix
rename to distros/kinetic/mecanum-gazebo-plugin/default.nix
diff --git a/kinetic/media-export/default.nix b/distros/kinetic/media-export/default.nix
similarity index 100%
rename from kinetic/media-export/default.nix
rename to distros/kinetic/media-export/default.nix
diff --git a/kinetic/melfa-description/default.nix b/distros/kinetic/melfa-description/default.nix
similarity index 100%
rename from kinetic/melfa-description/default.nix
rename to distros/kinetic/melfa-description/default.nix
diff --git a/kinetic/melfa-driver/default.nix b/distros/kinetic/melfa-driver/default.nix
similarity index 100%
rename from kinetic/melfa-driver/default.nix
rename to distros/kinetic/melfa-driver/default.nix
diff --git a/kinetic/melfa-robot/default.nix b/distros/kinetic/melfa-robot/default.nix
similarity index 100%
rename from kinetic/melfa-robot/default.nix
rename to distros/kinetic/melfa-robot/default.nix
diff --git a/kinetic/message-filters/default.nix b/distros/kinetic/message-filters/default.nix
similarity index 100%
rename from kinetic/message-filters/default.nix
rename to distros/kinetic/message-filters/default.nix
diff --git a/kinetic/message-generation/default.nix b/distros/kinetic/message-generation/default.nix
similarity index 100%
rename from kinetic/message-generation/default.nix
rename to distros/kinetic/message-generation/default.nix
diff --git a/kinetic/message-multiplexing/default.nix b/distros/kinetic/message-multiplexing/default.nix
similarity index 100%
rename from kinetic/message-multiplexing/default.nix
rename to distros/kinetic/message-multiplexing/default.nix
diff --git a/kinetic/message-relay/default.nix b/distros/kinetic/message-relay/default.nix
similarity index 100%
rename from kinetic/message-relay/default.nix
rename to distros/kinetic/message-relay/default.nix
diff --git a/kinetic/message-runtime/default.nix b/distros/kinetic/message-runtime/default.nix
similarity index 100%
rename from kinetic/message-runtime/default.nix
rename to distros/kinetic/message-runtime/default.nix
diff --git a/kinetic/message-to-tf/default.nix b/distros/kinetic/message-to-tf/default.nix
similarity index 100%
rename from kinetic/message-to-tf/default.nix
rename to distros/kinetic/message-to-tf/default.nix
diff --git a/kinetic/microstrain-3dmgx2-imu/default.nix b/distros/kinetic/microstrain-3dmgx2-imu/default.nix
similarity index 100%
rename from kinetic/microstrain-3dmgx2-imu/default.nix
rename to distros/kinetic/microstrain-3dmgx2-imu/default.nix
diff --git a/kinetic/microstrain-mips/default.nix b/distros/kinetic/microstrain-mips/default.nix
similarity index 100%
rename from kinetic/microstrain-mips/default.nix
rename to distros/kinetic/microstrain-mips/default.nix
diff --git a/kinetic/minas-control/default.nix b/distros/kinetic/minas-control/default.nix
similarity index 100%
rename from kinetic/minas-control/default.nix
rename to distros/kinetic/minas-control/default.nix
diff --git a/kinetic/minas/default.nix b/distros/kinetic/minas/default.nix
similarity index 100%
rename from kinetic/minas/default.nix
rename to distros/kinetic/minas/default.nix
diff --git a/kinetic/mini-maxwell/default.nix b/distros/kinetic/mini-maxwell/default.nix
similarity index 100%
rename from kinetic/mini-maxwell/default.nix
rename to distros/kinetic/mini-maxwell/default.nix
diff --git a/kinetic/mir-actions/default.nix b/distros/kinetic/mir-actions/default.nix
similarity index 100%
rename from kinetic/mir-actions/default.nix
rename to distros/kinetic/mir-actions/default.nix
diff --git a/kinetic/mir-description/default.nix b/distros/kinetic/mir-description/default.nix
similarity index 100%
rename from kinetic/mir-description/default.nix
rename to distros/kinetic/mir-description/default.nix
diff --git a/kinetic/mir-driver/default.nix b/distros/kinetic/mir-driver/default.nix
similarity index 100%
rename from kinetic/mir-driver/default.nix
rename to distros/kinetic/mir-driver/default.nix
diff --git a/kinetic/mir-dwb-critics/default.nix b/distros/kinetic/mir-dwb-critics/default.nix
similarity index 100%
rename from kinetic/mir-dwb-critics/default.nix
rename to distros/kinetic/mir-dwb-critics/default.nix
diff --git a/kinetic/mir-gazebo/default.nix b/distros/kinetic/mir-gazebo/default.nix
similarity index 100%
rename from kinetic/mir-gazebo/default.nix
rename to distros/kinetic/mir-gazebo/default.nix
diff --git a/kinetic/mir-msgs/default.nix b/distros/kinetic/mir-msgs/default.nix
similarity index 100%
rename from kinetic/mir-msgs/default.nix
rename to distros/kinetic/mir-msgs/default.nix
diff --git a/kinetic/mir-navigation/default.nix b/distros/kinetic/mir-navigation/default.nix
similarity index 100%
rename from kinetic/mir-navigation/default.nix
rename to distros/kinetic/mir-navigation/default.nix
diff --git a/kinetic/mir-robot/default.nix b/distros/kinetic/mir-robot/default.nix
similarity index 100%
rename from kinetic/mir-robot/default.nix
rename to distros/kinetic/mir-robot/default.nix
diff --git a/kinetic/mk/default.nix b/distros/kinetic/mk/default.nix
similarity index 100%
rename from kinetic/mk/default.nix
rename to distros/kinetic/mk/default.nix
diff --git a/kinetic/ml-classifiers/default.nix b/distros/kinetic/ml-classifiers/default.nix
similarity index 100%
rename from kinetic/ml-classifiers/default.nix
rename to distros/kinetic/ml-classifiers/default.nix
diff --git a/kinetic/mm-core-msgs/default.nix b/distros/kinetic/mm-core-msgs/default.nix
similarity index 100%
rename from kinetic/mm-core-msgs/default.nix
rename to distros/kinetic/mm-core-msgs/default.nix
diff --git a/kinetic/mm-eigen-msgs/default.nix b/distros/kinetic/mm-eigen-msgs/default.nix
similarity index 100%
rename from kinetic/mm-eigen-msgs/default.nix
rename to distros/kinetic/mm-eigen-msgs/default.nix
diff --git a/kinetic/mm-messages/default.nix b/distros/kinetic/mm-messages/default.nix
similarity index 100%
rename from kinetic/mm-messages/default.nix
rename to distros/kinetic/mm-messages/default.nix
diff --git a/kinetic/mm-mux-demux/default.nix b/distros/kinetic/mm-mux-demux/default.nix
similarity index 100%
rename from kinetic/mm-mux-demux/default.nix
rename to distros/kinetic/mm-mux-demux/default.nix
diff --git a/kinetic/mm-radio/default.nix b/distros/kinetic/mm-radio/default.nix
similarity index 100%
rename from kinetic/mm-radio/default.nix
rename to distros/kinetic/mm-radio/default.nix
diff --git a/kinetic/mobileye-560-660-msgs/default.nix b/distros/kinetic/mobileye-560-660-msgs/default.nix
similarity index 100%
rename from kinetic/mobileye-560-660-msgs/default.nix
rename to distros/kinetic/mobileye-560-660-msgs/default.nix
diff --git a/kinetic/modelica-bridge/default.nix b/distros/kinetic/modelica-bridge/default.nix
similarity index 100%
rename from kinetic/modelica-bridge/default.nix
rename to distros/kinetic/modelica-bridge/default.nix
diff --git a/kinetic/mongodb-log/default.nix b/distros/kinetic/mongodb-log/default.nix
similarity index 100%
rename from kinetic/mongodb-log/default.nix
rename to distros/kinetic/mongodb-log/default.nix
diff --git a/kinetic/mongodb-store-msgs/default.nix b/distros/kinetic/mongodb-store-msgs/default.nix
similarity index 100%
rename from kinetic/mongodb-store-msgs/default.nix
rename to distros/kinetic/mongodb-store-msgs/default.nix
diff --git a/kinetic/mongodb-store/default.nix b/distros/kinetic/mongodb-store/default.nix
similarity index 100%
rename from kinetic/mongodb-store/default.nix
rename to distros/kinetic/mongodb-store/default.nix
diff --git a/kinetic/monocam-settler/default.nix b/distros/kinetic/monocam-settler/default.nix
similarity index 100%
rename from kinetic/monocam-settler/default.nix
rename to distros/kinetic/monocam-settler/default.nix
diff --git a/kinetic/moose-control/default.nix b/distros/kinetic/moose-control/default.nix
similarity index 100%
rename from kinetic/moose-control/default.nix
rename to distros/kinetic/moose-control/default.nix
diff --git a/kinetic/moose-description/default.nix b/distros/kinetic/moose-description/default.nix
similarity index 100%
rename from kinetic/moose-description/default.nix
rename to distros/kinetic/moose-description/default.nix
diff --git a/kinetic/moose-desktop/default.nix b/distros/kinetic/moose-desktop/default.nix
similarity index 100%
rename from kinetic/moose-desktop/default.nix
rename to distros/kinetic/moose-desktop/default.nix
diff --git a/kinetic/moose-gazebo/default.nix b/distros/kinetic/moose-gazebo/default.nix
similarity index 100%
rename from kinetic/moose-gazebo/default.nix
rename to distros/kinetic/moose-gazebo/default.nix
diff --git a/kinetic/moose-msgs/default.nix b/distros/kinetic/moose-msgs/default.nix
similarity index 100%
rename from kinetic/moose-msgs/default.nix
rename to distros/kinetic/moose-msgs/default.nix
diff --git a/kinetic/moose-simulator/default.nix b/distros/kinetic/moose-simulator/default.nix
similarity index 100%
rename from kinetic/moose-simulator/default.nix
rename to distros/kinetic/moose-simulator/default.nix
diff --git a/kinetic/moose-viz/default.nix b/distros/kinetic/moose-viz/default.nix
similarity index 100%
rename from kinetic/moose-viz/default.nix
rename to distros/kinetic/moose-viz/default.nix
diff --git a/kinetic/motion-module-tutorial/default.nix b/distros/kinetic/motion-module-tutorial/default.nix
similarity index 100%
rename from kinetic/motion-module-tutorial/default.nix
rename to distros/kinetic/motion-module-tutorial/default.nix
diff --git a/kinetic/mouse-teleop/default.nix b/distros/kinetic/mouse-teleop/default.nix
similarity index 100%
rename from kinetic/mouse-teleop/default.nix
rename to distros/kinetic/mouse-teleop/default.nix
diff --git a/kinetic/move-base-flex/default.nix b/distros/kinetic/move-base-flex/default.nix
similarity index 100%
rename from kinetic/move-base-flex/default.nix
rename to distros/kinetic/move-base-flex/default.nix
diff --git a/kinetic/move-base-msgs/default.nix b/distros/kinetic/move-base-msgs/default.nix
similarity index 100%
rename from kinetic/move-base-msgs/default.nix
rename to distros/kinetic/move-base-msgs/default.nix
diff --git a/kinetic/move-base-to-manip/default.nix b/distros/kinetic/move-base-to-manip/default.nix
similarity index 100%
rename from kinetic/move-base-to-manip/default.nix
rename to distros/kinetic/move-base-to-manip/default.nix
diff --git a/kinetic/move-base/default.nix b/distros/kinetic/move-base/default.nix
similarity index 100%
rename from kinetic/move-base/default.nix
rename to distros/kinetic/move-base/default.nix
diff --git a/kinetic/move-basic/default.nix b/distros/kinetic/move-basic/default.nix
similarity index 100%
rename from kinetic/move-basic/default.nix
rename to distros/kinetic/move-basic/default.nix
diff --git a/kinetic/move-slow-and-clear/default.nix b/distros/kinetic/move-slow-and-clear/default.nix
similarity index 100%
rename from kinetic/move-slow-and-clear/default.nix
rename to distros/kinetic/move-slow-and-clear/default.nix
diff --git a/kinetic/moveit-chomp-optimizer-adapter/default.nix b/distros/kinetic/moveit-chomp-optimizer-adapter/default.nix
similarity index 100%
rename from kinetic/moveit-chomp-optimizer-adapter/default.nix
rename to distros/kinetic/moveit-chomp-optimizer-adapter/default.nix
diff --git a/kinetic/moveit-config-m0609/default.nix b/distros/kinetic/moveit-config-m0609/default.nix
similarity index 100%
rename from kinetic/moveit-config-m0609/default.nix
rename to distros/kinetic/moveit-config-m0609/default.nix
diff --git a/kinetic/moveit-config-m0617/default.nix b/distros/kinetic/moveit-config-m0617/default.nix
similarity index 100%
rename from kinetic/moveit-config-m0617/default.nix
rename to distros/kinetic/moveit-config-m0617/default.nix
diff --git a/kinetic/moveit-config-m1013/default.nix b/distros/kinetic/moveit-config-m1013/default.nix
similarity index 100%
rename from kinetic/moveit-config-m1013/default.nix
rename to distros/kinetic/moveit-config-m1013/default.nix
diff --git a/kinetic/moveit-config-m1509/default.nix b/distros/kinetic/moveit-config-m1509/default.nix
similarity index 100%
rename from kinetic/moveit-config-m1509/default.nix
rename to distros/kinetic/moveit-config-m1509/default.nix
diff --git a/kinetic/moveit-controller-manager-example/default.nix b/distros/kinetic/moveit-controller-manager-example/default.nix
similarity index 100%
rename from kinetic/moveit-controller-manager-example/default.nix
rename to distros/kinetic/moveit-controller-manager-example/default.nix
diff --git a/kinetic/moveit-experimental/default.nix b/distros/kinetic/moveit-experimental/default.nix
similarity index 100%
rename from kinetic/moveit-experimental/default.nix
rename to distros/kinetic/moveit-experimental/default.nix
diff --git a/kinetic/moveit-fake-controller-manager/default.nix b/distros/kinetic/moveit-fake-controller-manager/default.nix
similarity index 100%
rename from kinetic/moveit-fake-controller-manager/default.nix
rename to distros/kinetic/moveit-fake-controller-manager/default.nix
diff --git a/kinetic/moveit-kinematics/default.nix b/distros/kinetic/moveit-kinematics/default.nix
similarity index 100%
rename from kinetic/moveit-kinematics/default.nix
rename to distros/kinetic/moveit-kinematics/default.nix
diff --git a/kinetic/moveit-msgs/default.nix b/distros/kinetic/moveit-msgs/default.nix
similarity index 100%
rename from kinetic/moveit-msgs/default.nix
rename to distros/kinetic/moveit-msgs/default.nix
diff --git a/kinetic/moveit-planners-chomp/default.nix b/distros/kinetic/moveit-planners-chomp/default.nix
similarity index 100%
rename from kinetic/moveit-planners-chomp/default.nix
rename to distros/kinetic/moveit-planners-chomp/default.nix
diff --git a/kinetic/moveit-planners-ompl/default.nix b/distros/kinetic/moveit-planners-ompl/default.nix
similarity index 100%
rename from kinetic/moveit-planners-ompl/default.nix
rename to distros/kinetic/moveit-planners-ompl/default.nix
diff --git a/kinetic/moveit-planners/default.nix b/distros/kinetic/moveit-planners/default.nix
similarity index 100%
rename from kinetic/moveit-planners/default.nix
rename to distros/kinetic/moveit-planners/default.nix
diff --git a/kinetic/moveit-plugins/default.nix b/distros/kinetic/moveit-plugins/default.nix
similarity index 100%
rename from kinetic/moveit-plugins/default.nix
rename to distros/kinetic/moveit-plugins/default.nix
diff --git a/kinetic/moveit-pr2/default.nix b/distros/kinetic/moveit-pr2/default.nix
similarity index 100%
rename from kinetic/moveit-pr2/default.nix
rename to distros/kinetic/moveit-pr2/default.nix
diff --git a/kinetic/moveit-resources/default.nix b/distros/kinetic/moveit-resources/default.nix
similarity index 100%
rename from kinetic/moveit-resources/default.nix
rename to distros/kinetic/moveit-resources/default.nix
diff --git a/kinetic/moveit-ros-benchmarks/default.nix b/distros/kinetic/moveit-ros-benchmarks/default.nix
similarity index 100%
rename from kinetic/moveit-ros-benchmarks/default.nix
rename to distros/kinetic/moveit-ros-benchmarks/default.nix
diff --git a/kinetic/moveit-ros-control-interface/default.nix b/distros/kinetic/moveit-ros-control-interface/default.nix
similarity index 100%
rename from kinetic/moveit-ros-control-interface/default.nix
rename to distros/kinetic/moveit-ros-control-interface/default.nix
diff --git a/kinetic/moveit-ros-manipulation/default.nix b/distros/kinetic/moveit-ros-manipulation/default.nix
similarity index 100%
rename from kinetic/moveit-ros-manipulation/default.nix
rename to distros/kinetic/moveit-ros-manipulation/default.nix
diff --git a/kinetic/moveit-ros-move-group/default.nix b/distros/kinetic/moveit-ros-move-group/default.nix
similarity index 100%
rename from kinetic/moveit-ros-move-group/default.nix
rename to distros/kinetic/moveit-ros-move-group/default.nix
diff --git a/kinetic/moveit-ros-perception/default.nix b/distros/kinetic/moveit-ros-perception/default.nix
similarity index 100%
rename from kinetic/moveit-ros-perception/default.nix
rename to distros/kinetic/moveit-ros-perception/default.nix
diff --git a/kinetic/moveit-ros-planning-interface/default.nix b/distros/kinetic/moveit-ros-planning-interface/default.nix
similarity index 100%
rename from kinetic/moveit-ros-planning-interface/default.nix
rename to distros/kinetic/moveit-ros-planning-interface/default.nix
diff --git a/kinetic/moveit-ros-planning/default.nix b/distros/kinetic/moveit-ros-planning/default.nix
similarity index 100%
rename from kinetic/moveit-ros-planning/default.nix
rename to distros/kinetic/moveit-ros-planning/default.nix
diff --git a/kinetic/moveit-ros-robot-interaction/default.nix b/distros/kinetic/moveit-ros-robot-interaction/default.nix
similarity index 100%
rename from kinetic/moveit-ros-robot-interaction/default.nix
rename to distros/kinetic/moveit-ros-robot-interaction/default.nix
diff --git a/kinetic/moveit-ros-visualization/default.nix b/distros/kinetic/moveit-ros-visualization/default.nix
similarity index 100%
rename from kinetic/moveit-ros-visualization/default.nix
rename to distros/kinetic/moveit-ros-visualization/default.nix
diff --git a/kinetic/moveit-ros-warehouse/default.nix b/distros/kinetic/moveit-ros-warehouse/default.nix
similarity index 100%
rename from kinetic/moveit-ros-warehouse/default.nix
rename to distros/kinetic/moveit-ros-warehouse/default.nix
diff --git a/kinetic/moveit-ros/default.nix b/distros/kinetic/moveit-ros/default.nix
similarity index 100%
rename from kinetic/moveit-ros/default.nix
rename to distros/kinetic/moveit-ros/default.nix
diff --git a/kinetic/moveit-runtime/default.nix b/distros/kinetic/moveit-runtime/default.nix
similarity index 100%
rename from kinetic/moveit-runtime/default.nix
rename to distros/kinetic/moveit-runtime/default.nix
diff --git a/kinetic/moveit-setup-assistant/default.nix b/distros/kinetic/moveit-setup-assistant/default.nix
similarity index 100%
rename from kinetic/moveit-setup-assistant/default.nix
rename to distros/kinetic/moveit-setup-assistant/default.nix
diff --git a/kinetic/moveit-sim-controller/default.nix b/distros/kinetic/moveit-sim-controller/default.nix
similarity index 100%
rename from kinetic/moveit-sim-controller/default.nix
rename to distros/kinetic/moveit-sim-controller/default.nix
diff --git a/kinetic/moveit-simple-controller-manager/default.nix b/distros/kinetic/moveit-simple-controller-manager/default.nix
similarity index 100%
rename from kinetic/moveit-simple-controller-manager/default.nix
rename to distros/kinetic/moveit-simple-controller-manager/default.nix
diff --git a/kinetic/moveit-visual-tools/default.nix b/distros/kinetic/moveit-visual-tools/default.nix
similarity index 100%
rename from kinetic/moveit-visual-tools/default.nix
rename to distros/kinetic/moveit-visual-tools/default.nix
diff --git a/kinetic/moveit/default.nix b/distros/kinetic/moveit/default.nix
similarity index 100%
rename from kinetic/moveit/default.nix
rename to distros/kinetic/moveit/default.nix
diff --git a/kinetic/movie-publisher/default.nix b/distros/kinetic/movie-publisher/default.nix
similarity index 100%
rename from kinetic/movie-publisher/default.nix
rename to distros/kinetic/movie-publisher/default.nix
diff --git a/kinetic/mqtt-bridge/default.nix b/distros/kinetic/mqtt-bridge/default.nix
similarity index 100%
rename from kinetic/mqtt-bridge/default.nix
rename to distros/kinetic/mqtt-bridge/default.nix
diff --git a/kinetic/mrpt-bridge/default.nix b/distros/kinetic/mrpt-bridge/default.nix
similarity index 100%
rename from kinetic/mrpt-bridge/default.nix
rename to distros/kinetic/mrpt-bridge/default.nix
diff --git a/kinetic/mrpt-ekf-slam-2d/default.nix b/distros/kinetic/mrpt-ekf-slam-2d/default.nix
similarity index 100%
rename from kinetic/mrpt-ekf-slam-2d/default.nix
rename to distros/kinetic/mrpt-ekf-slam-2d/default.nix
diff --git a/kinetic/mrpt-ekf-slam-3d/default.nix b/distros/kinetic/mrpt-ekf-slam-3d/default.nix
similarity index 100%
rename from kinetic/mrpt-ekf-slam-3d/default.nix
rename to distros/kinetic/mrpt-ekf-slam-3d/default.nix
diff --git a/kinetic/mrpt-graphslam-2d/default.nix b/distros/kinetic/mrpt-graphslam-2d/default.nix
similarity index 100%
rename from kinetic/mrpt-graphslam-2d/default.nix
rename to distros/kinetic/mrpt-graphslam-2d/default.nix
diff --git a/kinetic/mrpt-icp-slam-2d/default.nix b/distros/kinetic/mrpt-icp-slam-2d/default.nix
similarity index 100%
rename from kinetic/mrpt-icp-slam-2d/default.nix
rename to distros/kinetic/mrpt-icp-slam-2d/default.nix
diff --git a/kinetic/mrpt-local-obstacles/default.nix b/distros/kinetic/mrpt-local-obstacles/default.nix
similarity index 100%
rename from kinetic/mrpt-local-obstacles/default.nix
rename to distros/kinetic/mrpt-local-obstacles/default.nix
diff --git a/kinetic/mrpt-localization/default.nix b/distros/kinetic/mrpt-localization/default.nix
similarity index 100%
rename from kinetic/mrpt-localization/default.nix
rename to distros/kinetic/mrpt-localization/default.nix
diff --git a/kinetic/mrpt-map/default.nix b/distros/kinetic/mrpt-map/default.nix
similarity index 100%
rename from kinetic/mrpt-map/default.nix
rename to distros/kinetic/mrpt-map/default.nix
diff --git a/kinetic/mrpt-msgs/default.nix b/distros/kinetic/mrpt-msgs/default.nix
similarity index 100%
rename from kinetic/mrpt-msgs/default.nix
rename to distros/kinetic/mrpt-msgs/default.nix
diff --git a/kinetic/mrpt-navigation/default.nix b/distros/kinetic/mrpt-navigation/default.nix
similarity index 100%
rename from kinetic/mrpt-navigation/default.nix
rename to distros/kinetic/mrpt-navigation/default.nix
diff --git a/kinetic/mrpt-rawlog/default.nix b/distros/kinetic/mrpt-rawlog/default.nix
similarity index 100%
rename from kinetic/mrpt-rawlog/default.nix
rename to distros/kinetic/mrpt-rawlog/default.nix
diff --git a/kinetic/mrpt-rbpf-slam/default.nix b/distros/kinetic/mrpt-rbpf-slam/default.nix
similarity index 100%
rename from kinetic/mrpt-rbpf-slam/default.nix
rename to distros/kinetic/mrpt-rbpf-slam/default.nix
diff --git a/kinetic/mrpt-reactivenav2d/default.nix b/distros/kinetic/mrpt-reactivenav2d/default.nix
similarity index 100%
rename from kinetic/mrpt-reactivenav2d/default.nix
rename to distros/kinetic/mrpt-reactivenav2d/default.nix
diff --git a/kinetic/mrpt-slam/default.nix b/distros/kinetic/mrpt-slam/default.nix
similarity index 100%
rename from kinetic/mrpt-slam/default.nix
rename to distros/kinetic/mrpt-slam/default.nix
diff --git a/kinetic/mrpt-tutorials/default.nix b/distros/kinetic/mrpt-tutorials/default.nix
similarity index 100%
rename from kinetic/mrpt-tutorials/default.nix
rename to distros/kinetic/mrpt-tutorials/default.nix
diff --git a/kinetic/mrpt1/default.nix b/distros/kinetic/mrpt1/default.nix
similarity index 100%
rename from kinetic/mrpt1/default.nix
rename to distros/kinetic/mrpt1/default.nix
diff --git a/kinetic/msp/default.nix b/distros/kinetic/msp/default.nix
similarity index 100%
rename from kinetic/msp/default.nix
rename to distros/kinetic/msp/default.nix
diff --git a/kinetic/multi-interface-roam/default.nix b/distros/kinetic/multi-interface-roam/default.nix
similarity index 100%
rename from kinetic/multi-interface-roam/default.nix
rename to distros/kinetic/multi-interface-roam/default.nix
diff --git a/kinetic/multi-jackal-base/default.nix b/distros/kinetic/multi-jackal-base/default.nix
similarity index 100%
rename from kinetic/multi-jackal-base/default.nix
rename to distros/kinetic/multi-jackal-base/default.nix
diff --git a/kinetic/multi-jackal-control/default.nix b/distros/kinetic/multi-jackal-control/default.nix
similarity index 100%
rename from kinetic/multi-jackal-control/default.nix
rename to distros/kinetic/multi-jackal-control/default.nix
diff --git a/kinetic/multi-jackal-description/default.nix b/distros/kinetic/multi-jackal-description/default.nix
similarity index 100%
rename from kinetic/multi-jackal-description/default.nix
rename to distros/kinetic/multi-jackal-description/default.nix
diff --git a/kinetic/multi-jackal-nav/default.nix b/distros/kinetic/multi-jackal-nav/default.nix
similarity index 100%
rename from kinetic/multi-jackal-nav/default.nix
rename to distros/kinetic/multi-jackal-nav/default.nix
diff --git a/kinetic/multi-jackal-tutorials/default.nix b/distros/kinetic/multi-jackal-tutorials/default.nix
similarity index 100%
rename from kinetic/multi-jackal-tutorials/default.nix
rename to distros/kinetic/multi-jackal-tutorials/default.nix
diff --git a/kinetic/multi-map-server/default.nix b/distros/kinetic/multi-map-server/default.nix
similarity index 100%
rename from kinetic/multi-map-server/default.nix
rename to distros/kinetic/multi-map-server/default.nix
diff --git a/kinetic/multi-object-tracking-lidar/default.nix b/distros/kinetic/multi-object-tracking-lidar/default.nix
similarity index 100%
rename from kinetic/multi-object-tracking-lidar/default.nix
rename to distros/kinetic/multi-object-tracking-lidar/default.nix
diff --git a/kinetic/multikey-teleop/default.nix b/distros/kinetic/multikey-teleop/default.nix
similarity index 100%
rename from kinetic/multikey-teleop/default.nix
rename to distros/kinetic/multikey-teleop/default.nix
diff --git a/kinetic/multimaster-fkie/default.nix b/distros/kinetic/multimaster-fkie/default.nix
similarity index 100%
rename from kinetic/multimaster-fkie/default.nix
rename to distros/kinetic/multimaster-fkie/default.nix
diff --git a/kinetic/multimaster-launch/default.nix b/distros/kinetic/multimaster-launch/default.nix
similarity index 100%
rename from kinetic/multimaster-launch/default.nix
rename to distros/kinetic/multimaster-launch/default.nix
diff --git a/kinetic/multimaster-msgs-fkie/default.nix b/distros/kinetic/multimaster-msgs-fkie/default.nix
similarity index 100%
rename from kinetic/multimaster-msgs-fkie/default.nix
rename to distros/kinetic/multimaster-msgs-fkie/default.nix
diff --git a/kinetic/multimaster-msgs/default.nix b/distros/kinetic/multimaster-msgs/default.nix
similarity index 100%
rename from kinetic/multimaster-msgs/default.nix
rename to distros/kinetic/multimaster-msgs/default.nix
diff --git a/kinetic/multires-image/default.nix b/distros/kinetic/multires-image/default.nix
similarity index 100%
rename from kinetic/multires-image/default.nix
rename to distros/kinetic/multires-image/default.nix
diff --git a/kinetic/multirobot-map-merge/default.nix b/distros/kinetic/multirobot-map-merge/default.nix
similarity index 100%
rename from kinetic/multirobot-map-merge/default.nix
rename to distros/kinetic/multirobot-map-merge/default.nix
diff --git a/kinetic/multisense-bringup/default.nix b/distros/kinetic/multisense-bringup/default.nix
similarity index 100%
rename from kinetic/multisense-bringup/default.nix
rename to distros/kinetic/multisense-bringup/default.nix
diff --git a/kinetic/multisense-cal-check/default.nix b/distros/kinetic/multisense-cal-check/default.nix
similarity index 100%
rename from kinetic/multisense-cal-check/default.nix
rename to distros/kinetic/multisense-cal-check/default.nix
diff --git a/kinetic/multisense-description/default.nix b/distros/kinetic/multisense-description/default.nix
similarity index 100%
rename from kinetic/multisense-description/default.nix
rename to distros/kinetic/multisense-description/default.nix
diff --git a/kinetic/multisense-lib/default.nix b/distros/kinetic/multisense-lib/default.nix
similarity index 100%
rename from kinetic/multisense-lib/default.nix
rename to distros/kinetic/multisense-lib/default.nix
diff --git a/kinetic/multisense-ros/default.nix b/distros/kinetic/multisense-ros/default.nix
similarity index 100%
rename from kinetic/multisense-ros/default.nix
rename to distros/kinetic/multisense-ros/default.nix
diff --git a/kinetic/multisense/default.nix b/distros/kinetic/multisense/default.nix
similarity index 100%
rename from kinetic/multisense/default.nix
rename to distros/kinetic/multisense/default.nix
diff --git a/kinetic/multiwii/default.nix b/distros/kinetic/multiwii/default.nix
similarity index 100%
rename from kinetic/multiwii/default.nix
rename to distros/kinetic/multiwii/default.nix
diff --git a/kinetic/mvsim/default.nix b/distros/kinetic/mvsim/default.nix
similarity index 100%
rename from kinetic/mvsim/default.nix
rename to distros/kinetic/mvsim/default.nix
diff --git a/kinetic/myahrs-driver/default.nix b/distros/kinetic/myahrs-driver/default.nix
similarity index 100%
rename from kinetic/myahrs-driver/default.nix
rename to distros/kinetic/myahrs-driver/default.nix
diff --git a/kinetic/mynt-eye-ros-wrapper/default.nix b/distros/kinetic/mynt-eye-ros-wrapper/default.nix
similarity index 100%
rename from kinetic/mynt-eye-ros-wrapper/default.nix
rename to distros/kinetic/mynt-eye-ros-wrapper/default.nix
diff --git a/kinetic/nanomsg/default.nix b/distros/kinetic/nanomsg/default.nix
similarity index 100%
rename from kinetic/nanomsg/default.nix
rename to distros/kinetic/nanomsg/default.nix
diff --git a/kinetic/nao-apps/default.nix b/distros/kinetic/nao-apps/default.nix
similarity index 100%
rename from kinetic/nao-apps/default.nix
rename to distros/kinetic/nao-apps/default.nix
diff --git a/kinetic/nao-audio/default.nix b/distros/kinetic/nao-audio/default.nix
similarity index 100%
rename from kinetic/nao-audio/default.nix
rename to distros/kinetic/nao-audio/default.nix
diff --git a/kinetic/nao-bringup/default.nix b/distros/kinetic/nao-bringup/default.nix
similarity index 100%
rename from kinetic/nao-bringup/default.nix
rename to distros/kinetic/nao-bringup/default.nix
diff --git a/kinetic/nao-control/default.nix b/distros/kinetic/nao-control/default.nix
similarity index 100%
rename from kinetic/nao-control/default.nix
rename to distros/kinetic/nao-control/default.nix
diff --git a/kinetic/nao-dcm-bringup/default.nix b/distros/kinetic/nao-dcm-bringup/default.nix
similarity index 100%
rename from kinetic/nao-dcm-bringup/default.nix
rename to distros/kinetic/nao-dcm-bringup/default.nix
diff --git a/kinetic/nao-description/default.nix b/distros/kinetic/nao-description/default.nix
similarity index 100%
rename from kinetic/nao-description/default.nix
rename to distros/kinetic/nao-description/default.nix
diff --git a/kinetic/nao-interaction-launchers/default.nix b/distros/kinetic/nao-interaction-launchers/default.nix
similarity index 100%
rename from kinetic/nao-interaction-launchers/default.nix
rename to distros/kinetic/nao-interaction-launchers/default.nix
diff --git a/kinetic/nao-interaction-msgs/default.nix b/distros/kinetic/nao-interaction-msgs/default.nix
similarity index 100%
rename from kinetic/nao-interaction-msgs/default.nix
rename to distros/kinetic/nao-interaction-msgs/default.nix
diff --git a/kinetic/nao-interaction/default.nix b/distros/kinetic/nao-interaction/default.nix
similarity index 100%
rename from kinetic/nao-interaction/default.nix
rename to distros/kinetic/nao-interaction/default.nix
diff --git a/kinetic/nao-meshes/default.nix b/distros/kinetic/nao-meshes/default.nix
similarity index 100%
rename from kinetic/nao-meshes/default.nix
rename to distros/kinetic/nao-meshes/default.nix
diff --git a/kinetic/nao-moveit-config/default.nix b/distros/kinetic/nao-moveit-config/default.nix
similarity index 100%
rename from kinetic/nao-moveit-config/default.nix
rename to distros/kinetic/nao-moveit-config/default.nix
diff --git a/kinetic/nao-robot/default.nix b/distros/kinetic/nao-robot/default.nix
similarity index 100%
rename from kinetic/nao-robot/default.nix
rename to distros/kinetic/nao-robot/default.nix
diff --git a/kinetic/nao-vision/default.nix b/distros/kinetic/nao-vision/default.nix
similarity index 100%
rename from kinetic/nao-vision/default.nix
rename to distros/kinetic/nao-vision/default.nix
diff --git a/kinetic/naoqi-apps/default.nix b/distros/kinetic/naoqi-apps/default.nix
similarity index 100%
rename from kinetic/naoqi-apps/default.nix
rename to distros/kinetic/naoqi-apps/default.nix
diff --git a/kinetic/naoqi-bridge-msgs/default.nix b/distros/kinetic/naoqi-bridge-msgs/default.nix
similarity index 100%
rename from kinetic/naoqi-bridge-msgs/default.nix
rename to distros/kinetic/naoqi-bridge-msgs/default.nix
diff --git a/kinetic/naoqi-bridge/default.nix b/distros/kinetic/naoqi-bridge/default.nix
similarity index 100%
rename from kinetic/naoqi-bridge/default.nix
rename to distros/kinetic/naoqi-bridge/default.nix
diff --git a/kinetic/naoqi-dcm-driver/default.nix b/distros/kinetic/naoqi-dcm-driver/default.nix
similarity index 100%
rename from kinetic/naoqi-dcm-driver/default.nix
rename to distros/kinetic/naoqi-dcm-driver/default.nix
diff --git a/kinetic/naoqi-driver-py/default.nix b/distros/kinetic/naoqi-driver-py/default.nix
similarity index 100%
rename from kinetic/naoqi-driver-py/default.nix
rename to distros/kinetic/naoqi-driver-py/default.nix
diff --git a/kinetic/naoqi-driver/default.nix b/distros/kinetic/naoqi-driver/default.nix
similarity index 100%
rename from kinetic/naoqi-driver/default.nix
rename to distros/kinetic/naoqi-driver/default.nix
diff --git a/kinetic/naoqi-libqi/default.nix b/distros/kinetic/naoqi-libqi/default.nix
similarity index 100%
rename from kinetic/naoqi-libqi/default.nix
rename to distros/kinetic/naoqi-libqi/default.nix
diff --git a/kinetic/naoqi-libqicore/default.nix b/distros/kinetic/naoqi-libqicore/default.nix
similarity index 100%
rename from kinetic/naoqi-libqicore/default.nix
rename to distros/kinetic/naoqi-libqicore/default.nix
diff --git a/kinetic/naoqi-pose/default.nix b/distros/kinetic/naoqi-pose/default.nix
similarity index 100%
rename from kinetic/naoqi-pose/default.nix
rename to distros/kinetic/naoqi-pose/default.nix
diff --git a/kinetic/naoqi-sensors-py/default.nix b/distros/kinetic/naoqi-sensors-py/default.nix
similarity index 100%
rename from kinetic/naoqi-sensors-py/default.nix
rename to distros/kinetic/naoqi-sensors-py/default.nix
diff --git a/kinetic/naoqi-tools/default.nix b/distros/kinetic/naoqi-tools/default.nix
similarity index 100%
rename from kinetic/naoqi-tools/default.nix
rename to distros/kinetic/naoqi-tools/default.nix
diff --git a/kinetic/nav-2d-msgs/default.nix b/distros/kinetic/nav-2d-msgs/default.nix
similarity index 100%
rename from kinetic/nav-2d-msgs/default.nix
rename to distros/kinetic/nav-2d-msgs/default.nix
diff --git a/kinetic/nav-2d-utils/default.nix b/distros/kinetic/nav-2d-utils/default.nix
similarity index 100%
rename from kinetic/nav-2d-utils/default.nix
rename to distros/kinetic/nav-2d-utils/default.nix
diff --git a/kinetic/nav-core-adapter/default.nix b/distros/kinetic/nav-core-adapter/default.nix
similarity index 100%
rename from kinetic/nav-core-adapter/default.nix
rename to distros/kinetic/nav-core-adapter/default.nix
diff --git a/kinetic/nav-core/default.nix b/distros/kinetic/nav-core/default.nix
similarity index 100%
rename from kinetic/nav-core/default.nix
rename to distros/kinetic/nav-core/default.nix
diff --git a/kinetic/nav-core2/default.nix b/distros/kinetic/nav-core2/default.nix
similarity index 100%
rename from kinetic/nav-core2/default.nix
rename to distros/kinetic/nav-core2/default.nix
diff --git a/kinetic/nav-grid-iterators/default.nix b/distros/kinetic/nav-grid-iterators/default.nix
similarity index 100%
rename from kinetic/nav-grid-iterators/default.nix
rename to distros/kinetic/nav-grid-iterators/default.nix
diff --git a/kinetic/nav-grid-pub-sub/default.nix b/distros/kinetic/nav-grid-pub-sub/default.nix
similarity index 100%
rename from kinetic/nav-grid-pub-sub/default.nix
rename to distros/kinetic/nav-grid-pub-sub/default.nix
diff --git a/kinetic/nav-grid/default.nix b/distros/kinetic/nav-grid/default.nix
similarity index 100%
rename from kinetic/nav-grid/default.nix
rename to distros/kinetic/nav-grid/default.nix
diff --git a/kinetic/nav-msgs/default.nix b/distros/kinetic/nav-msgs/default.nix
similarity index 100%
rename from kinetic/nav-msgs/default.nix
rename to distros/kinetic/nav-msgs/default.nix
diff --git a/kinetic/nav-pcontroller/default.nix b/distros/kinetic/nav-pcontroller/default.nix
similarity index 100%
rename from kinetic/nav-pcontroller/default.nix
rename to distros/kinetic/nav-pcontroller/default.nix
diff --git a/kinetic/nav2d-exploration/default.nix b/distros/kinetic/nav2d-exploration/default.nix
similarity index 100%
rename from kinetic/nav2d-exploration/default.nix
rename to distros/kinetic/nav2d-exploration/default.nix
diff --git a/kinetic/nav2d-karto/default.nix b/distros/kinetic/nav2d-karto/default.nix
similarity index 100%
rename from kinetic/nav2d-karto/default.nix
rename to distros/kinetic/nav2d-karto/default.nix
diff --git a/kinetic/nav2d-localizer/default.nix b/distros/kinetic/nav2d-localizer/default.nix
similarity index 100%
rename from kinetic/nav2d-localizer/default.nix
rename to distros/kinetic/nav2d-localizer/default.nix
diff --git a/kinetic/nav2d-msgs/default.nix b/distros/kinetic/nav2d-msgs/default.nix
similarity index 100%
rename from kinetic/nav2d-msgs/default.nix
rename to distros/kinetic/nav2d-msgs/default.nix
diff --git a/kinetic/nav2d-navigator/default.nix b/distros/kinetic/nav2d-navigator/default.nix
similarity index 100%
rename from kinetic/nav2d-navigator/default.nix
rename to distros/kinetic/nav2d-navigator/default.nix
diff --git a/kinetic/nav2d-operator/default.nix b/distros/kinetic/nav2d-operator/default.nix
similarity index 100%
rename from kinetic/nav2d-operator/default.nix
rename to distros/kinetic/nav2d-operator/default.nix
diff --git a/kinetic/nav2d-remote/default.nix b/distros/kinetic/nav2d-remote/default.nix
similarity index 100%
rename from kinetic/nav2d-remote/default.nix
rename to distros/kinetic/nav2d-remote/default.nix
diff --git a/kinetic/nav2d-tutorials/default.nix b/distros/kinetic/nav2d-tutorials/default.nix
similarity index 100%
rename from kinetic/nav2d-tutorials/default.nix
rename to distros/kinetic/nav2d-tutorials/default.nix
diff --git a/kinetic/nav2d/default.nix b/distros/kinetic/nav2d/default.nix
similarity index 100%
rename from kinetic/nav2d/default.nix
rename to distros/kinetic/nav2d/default.nix
diff --git a/kinetic/navfn/default.nix b/distros/kinetic/navfn/default.nix
similarity index 100%
rename from kinetic/navfn/default.nix
rename to distros/kinetic/navfn/default.nix
diff --git a/kinetic/navigation-experimental/default.nix b/distros/kinetic/navigation-experimental/default.nix
similarity index 100%
rename from kinetic/navigation-experimental/default.nix
rename to distros/kinetic/navigation-experimental/default.nix
diff --git a/kinetic/navigation-layers/default.nix b/distros/kinetic/navigation-layers/default.nix
similarity index 100%
rename from kinetic/navigation-layers/default.nix
rename to distros/kinetic/navigation-layers/default.nix
diff --git a/kinetic/navigation-stage/default.nix b/distros/kinetic/navigation-stage/default.nix
similarity index 100%
rename from kinetic/navigation-stage/default.nix
rename to distros/kinetic/navigation-stage/default.nix
diff --git a/kinetic/navigation-tutorials/default.nix b/distros/kinetic/navigation-tutorials/default.nix
similarity index 100%
rename from kinetic/navigation-tutorials/default.nix
rename to distros/kinetic/navigation-tutorials/default.nix
diff --git a/kinetic/navigation/default.nix b/distros/kinetic/navigation/default.nix
similarity index 100%
rename from kinetic/navigation/default.nix
rename to distros/kinetic/navigation/default.nix
diff --git a/kinetic/ncd-parser/default.nix b/distros/kinetic/ncd-parser/default.nix
similarity index 100%
rename from kinetic/ncd-parser/default.nix
rename to distros/kinetic/ncd-parser/default.nix
diff --git a/kinetic/neobotix-usboard-msgs/default.nix b/distros/kinetic/neobotix-usboard-msgs/default.nix
similarity index 100%
rename from kinetic/neobotix-usboard-msgs/default.nix
rename to distros/kinetic/neobotix-usboard-msgs/default.nix
diff --git a/kinetic/neonavigation-common/default.nix b/distros/kinetic/neonavigation-common/default.nix
similarity index 100%
rename from kinetic/neonavigation-common/default.nix
rename to distros/kinetic/neonavigation-common/default.nix
diff --git a/kinetic/neonavigation-launch/default.nix b/distros/kinetic/neonavigation-launch/default.nix
similarity index 100%
rename from kinetic/neonavigation-launch/default.nix
rename to distros/kinetic/neonavigation-launch/default.nix
diff --git a/kinetic/neonavigation-msgs/default.nix b/distros/kinetic/neonavigation-msgs/default.nix
similarity index 100%
rename from kinetic/neonavigation-msgs/default.nix
rename to distros/kinetic/neonavigation-msgs/default.nix
diff --git a/kinetic/neonavigation-rviz-plugins/default.nix b/distros/kinetic/neonavigation-rviz-plugins/default.nix
similarity index 100%
rename from kinetic/neonavigation-rviz-plugins/default.nix
rename to distros/kinetic/neonavigation-rviz-plugins/default.nix
diff --git a/kinetic/neonavigation/default.nix b/distros/kinetic/neonavigation/default.nix
similarity index 100%
rename from kinetic/neonavigation/default.nix
rename to distros/kinetic/neonavigation/default.nix
diff --git a/kinetic/nerian-sp1/default.nix b/distros/kinetic/nerian-sp1/default.nix
similarity index 100%
rename from kinetic/nerian-sp1/default.nix
rename to distros/kinetic/nerian-sp1/default.nix
diff --git a/kinetic/nerian-stereo/default.nix b/distros/kinetic/nerian-stereo/default.nix
similarity index 100%
rename from kinetic/nerian-stereo/default.nix
rename to distros/kinetic/nerian-stereo/default.nix
diff --git a/kinetic/network-autoconfig/default.nix b/distros/kinetic/network-autoconfig/default.nix
similarity index 100%
rename from kinetic/network-autoconfig/default.nix
rename to distros/kinetic/network-autoconfig/default.nix
diff --git a/kinetic/network-control-tests/default.nix b/distros/kinetic/network-control-tests/default.nix
similarity index 100%
rename from kinetic/network-control-tests/default.nix
rename to distros/kinetic/network-control-tests/default.nix
diff --git a/kinetic/network-detector/default.nix b/distros/kinetic/network-detector/default.nix
similarity index 100%
rename from kinetic/network-detector/default.nix
rename to distros/kinetic/network-detector/default.nix
diff --git a/kinetic/network-interface/default.nix b/distros/kinetic/network-interface/default.nix
similarity index 100%
rename from kinetic/network-interface/default.nix
rename to distros/kinetic/network-interface/default.nix
diff --git a/kinetic/network-monitor-udp/default.nix b/distros/kinetic/network-monitor-udp/default.nix
similarity index 100%
rename from kinetic/network-monitor-udp/default.nix
rename to distros/kinetic/network-monitor-udp/default.nix
diff --git a/kinetic/network-traffic-control/default.nix b/distros/kinetic/network-traffic-control/default.nix
similarity index 100%
rename from kinetic/network-traffic-control/default.nix
rename to distros/kinetic/network-traffic-control/default.nix
diff --git a/kinetic/nextage-calibration/default.nix b/distros/kinetic/nextage-calibration/default.nix
similarity index 100%
rename from kinetic/nextage-calibration/default.nix
rename to distros/kinetic/nextage-calibration/default.nix
diff --git a/kinetic/nextage-description/default.nix b/distros/kinetic/nextage-description/default.nix
similarity index 100%
rename from kinetic/nextage-description/default.nix
rename to distros/kinetic/nextage-description/default.nix
diff --git a/kinetic/nextage-gazebo/default.nix b/distros/kinetic/nextage-gazebo/default.nix
similarity index 100%
rename from kinetic/nextage-gazebo/default.nix
rename to distros/kinetic/nextage-gazebo/default.nix
diff --git a/kinetic/nextage-ik-plugin/default.nix b/distros/kinetic/nextage-ik-plugin/default.nix
similarity index 100%
rename from kinetic/nextage-ik-plugin/default.nix
rename to distros/kinetic/nextage-ik-plugin/default.nix
diff --git a/kinetic/nextage-moveit-config/default.nix b/distros/kinetic/nextage-moveit-config/default.nix
similarity index 100%
rename from kinetic/nextage-moveit-config/default.nix
rename to distros/kinetic/nextage-moveit-config/default.nix
diff --git a/kinetic/nextage-ros-bridge/default.nix b/distros/kinetic/nextage-ros-bridge/default.nix
similarity index 100%
rename from kinetic/nextage-ros-bridge/default.nix
rename to distros/kinetic/nextage-ros-bridge/default.nix
diff --git a/kinetic/nlopt/default.nix b/distros/kinetic/nlopt/default.nix
similarity index 100%
rename from kinetic/nlopt/default.nix
rename to distros/kinetic/nlopt/default.nix
diff --git a/kinetic/nmea-comms/default.nix b/distros/kinetic/nmea-comms/default.nix
similarity index 100%
rename from kinetic/nmea-comms/default.nix
rename to distros/kinetic/nmea-comms/default.nix
diff --git a/kinetic/nmea-gps-plugin/default.nix b/distros/kinetic/nmea-gps-plugin/default.nix
similarity index 100%
rename from kinetic/nmea-gps-plugin/default.nix
rename to distros/kinetic/nmea-gps-plugin/default.nix
diff --git a/kinetic/nmea-msgs/default.nix b/distros/kinetic/nmea-msgs/default.nix
similarity index 100%
rename from kinetic/nmea-msgs/default.nix
rename to distros/kinetic/nmea-msgs/default.nix
diff --git a/kinetic/nmea-navsat-driver/default.nix b/distros/kinetic/nmea-navsat-driver/default.nix
similarity index 100%
rename from kinetic/nmea-navsat-driver/default.nix
rename to distros/kinetic/nmea-navsat-driver/default.nix
diff --git a/kinetic/node-manager-fkie/default.nix b/distros/kinetic/node-manager-fkie/default.nix
similarity index 100%
rename from kinetic/node-manager-fkie/default.nix
rename to distros/kinetic/node-manager-fkie/default.nix
diff --git a/kinetic/nodelet-core/default.nix b/distros/kinetic/nodelet-core/default.nix
similarity index 100%
rename from kinetic/nodelet-core/default.nix
rename to distros/kinetic/nodelet-core/default.nix
diff --git a/kinetic/nodelet-topic-tools/default.nix b/distros/kinetic/nodelet-topic-tools/default.nix
similarity index 100%
rename from kinetic/nodelet-topic-tools/default.nix
rename to distros/kinetic/nodelet-topic-tools/default.nix
diff --git a/kinetic/nodelet-tutorial-math/default.nix b/distros/kinetic/nodelet-tutorial-math/default.nix
similarity index 100%
rename from kinetic/nodelet-tutorial-math/default.nix
rename to distros/kinetic/nodelet-tutorial-math/default.nix
diff --git a/kinetic/nodelet/default.nix b/distros/kinetic/nodelet/default.nix
similarity index 100%
rename from kinetic/nodelet/default.nix
rename to distros/kinetic/nodelet/default.nix
diff --git a/kinetic/nonpersistent-voxel-layer/default.nix b/distros/kinetic/nonpersistent-voxel-layer/default.nix
similarity index 100%
rename from kinetic/nonpersistent-voxel-layer/default.nix
rename to distros/kinetic/nonpersistent-voxel-layer/default.nix
diff --git a/kinetic/novatel-gps-driver/default.nix b/distros/kinetic/novatel-gps-driver/default.nix
similarity index 100%
rename from kinetic/novatel-gps-driver/default.nix
rename to distros/kinetic/novatel-gps-driver/default.nix
diff --git a/kinetic/novatel-gps-msgs/default.nix b/distros/kinetic/novatel-gps-msgs/default.nix
similarity index 100%
rename from kinetic/novatel-gps-msgs/default.nix
rename to distros/kinetic/novatel-gps-msgs/default.nix
diff --git a/kinetic/novatel-msgs/default.nix b/distros/kinetic/novatel-msgs/default.nix
similarity index 100%
rename from kinetic/novatel-msgs/default.nix
rename to distros/kinetic/novatel-msgs/default.nix
diff --git a/kinetic/ntpd-driver/default.nix b/distros/kinetic/ntpd-driver/default.nix
similarity index 100%
rename from kinetic/ntpd-driver/default.nix
rename to distros/kinetic/ntpd-driver/default.nix
diff --git a/kinetic/o3m151-driver/default.nix b/distros/kinetic/o3m151-driver/default.nix
similarity index 100%
rename from kinetic/o3m151-driver/default.nix
rename to distros/kinetic/o3m151-driver/default.nix
diff --git a/kinetic/obj-to-pointcloud/default.nix b/distros/kinetic/obj-to-pointcloud/default.nix
similarity index 100%
rename from kinetic/obj-to-pointcloud/default.nix
rename to distros/kinetic/obj-to-pointcloud/default.nix
diff --git a/kinetic/object-recognition-capture/default.nix b/distros/kinetic/object-recognition-capture/default.nix
similarity index 100%
rename from kinetic/object-recognition-capture/default.nix
rename to distros/kinetic/object-recognition-capture/default.nix
diff --git a/kinetic/object-recognition-core/default.nix b/distros/kinetic/object-recognition-core/default.nix
similarity index 100%
rename from kinetic/object-recognition-core/default.nix
rename to distros/kinetic/object-recognition-core/default.nix
diff --git a/kinetic/object-recognition-msgs/default.nix b/distros/kinetic/object-recognition-msgs/default.nix
similarity index 100%
rename from kinetic/object-recognition-msgs/default.nix
rename to distros/kinetic/object-recognition-msgs/default.nix
diff --git a/kinetic/object-recognition-reconstruction/default.nix b/distros/kinetic/object-recognition-reconstruction/default.nix
similarity index 100%
rename from kinetic/object-recognition-reconstruction/default.nix
rename to distros/kinetic/object-recognition-reconstruction/default.nix
diff --git a/kinetic/object-recognition-ros-visualization/default.nix b/distros/kinetic/object-recognition-ros-visualization/default.nix
similarity index 100%
rename from kinetic/object-recognition-ros-visualization/default.nix
rename to distros/kinetic/object-recognition-ros-visualization/default.nix
diff --git a/kinetic/object-recognition-ros/default.nix b/distros/kinetic/object-recognition-ros/default.nix
similarity index 100%
rename from kinetic/object-recognition-ros/default.nix
rename to distros/kinetic/object-recognition-ros/default.nix
diff --git a/kinetic/object-recognition-tod/default.nix b/distros/kinetic/object-recognition-tod/default.nix
similarity index 100%
rename from kinetic/object-recognition-tod/default.nix
rename to distros/kinetic/object-recognition-tod/default.nix
diff --git a/kinetic/object-recognition-transparent-objects/default.nix b/distros/kinetic/object-recognition-transparent-objects/default.nix
similarity index 100%
rename from kinetic/object-recognition-transparent-objects/default.nix
rename to distros/kinetic/object-recognition-transparent-objects/default.nix
diff --git a/kinetic/ocean-battery-driver/default.nix b/distros/kinetic/ocean-battery-driver/default.nix
similarity index 100%
rename from kinetic/ocean-battery-driver/default.nix
rename to distros/kinetic/ocean-battery-driver/default.nix
diff --git a/kinetic/ocl/default.nix b/distros/kinetic/ocl/default.nix
similarity index 100%
rename from kinetic/ocl/default.nix
rename to distros/kinetic/ocl/default.nix
diff --git a/kinetic/octomap-mapping/default.nix b/distros/kinetic/octomap-mapping/default.nix
similarity index 100%
rename from kinetic/octomap-mapping/default.nix
rename to distros/kinetic/octomap-mapping/default.nix
diff --git a/kinetic/octomap-msgs/default.nix b/distros/kinetic/octomap-msgs/default.nix
similarity index 100%
rename from kinetic/octomap-msgs/default.nix
rename to distros/kinetic/octomap-msgs/default.nix
diff --git a/kinetic/octomap-pa/default.nix b/distros/kinetic/octomap-pa/default.nix
similarity index 100%
rename from kinetic/octomap-pa/default.nix
rename to distros/kinetic/octomap-pa/default.nix
diff --git a/kinetic/octomap-ros/default.nix b/distros/kinetic/octomap-ros/default.nix
similarity index 100%
rename from kinetic/octomap-ros/default.nix
rename to distros/kinetic/octomap-ros/default.nix
diff --git a/kinetic/octomap-rviz-plugins/default.nix b/distros/kinetic/octomap-rviz-plugins/default.nix
similarity index 100%
rename from kinetic/octomap-rviz-plugins/default.nix
rename to distros/kinetic/octomap-rviz-plugins/default.nix
diff --git a/kinetic/octomap-server/default.nix b/distros/kinetic/octomap-server/default.nix
similarity index 100%
rename from kinetic/octomap-server/default.nix
rename to distros/kinetic/octomap-server/default.nix
diff --git a/kinetic/octomap/default.nix b/distros/kinetic/octomap/default.nix
similarity index 100%
rename from kinetic/octomap/default.nix
rename to distros/kinetic/octomap/default.nix
diff --git a/kinetic/oculusprime/default.nix b/distros/kinetic/oculusprime/default.nix
similarity index 100%
rename from kinetic/oculusprime/default.nix
rename to distros/kinetic/oculusprime/default.nix
diff --git a/kinetic/odom-frame-publisher/default.nix b/distros/kinetic/odom-frame-publisher/default.nix
similarity index 100%
rename from kinetic/odom-frame-publisher/default.nix
rename to distros/kinetic/odom-frame-publisher/default.nix
diff --git a/kinetic/odometry-publisher-tutorial/default.nix b/distros/kinetic/odometry-publisher-tutorial/default.nix
similarity index 100%
rename from kinetic/odometry-publisher-tutorial/default.nix
rename to distros/kinetic/odometry-publisher-tutorial/default.nix
diff --git a/kinetic/odva-ethernetip/default.nix b/distros/kinetic/odva-ethernetip/default.nix
similarity index 100%
rename from kinetic/odva-ethernetip/default.nix
rename to distros/kinetic/odva-ethernetip/default.nix
diff --git a/kinetic/ompl/default.nix b/distros/kinetic/ompl/default.nix
similarity index 100%
rename from kinetic/ompl/default.nix
rename to distros/kinetic/ompl/default.nix
diff --git a/kinetic/omron-os32c-driver/default.nix b/distros/kinetic/omron-os32c-driver/default.nix
similarity index 100%
rename from kinetic/omron-os32c-driver/default.nix
rename to distros/kinetic/omron-os32c-driver/default.nix
diff --git a/kinetic/op3-action-editor/default.nix b/distros/kinetic/op3-action-editor/default.nix
similarity index 100%
rename from kinetic/op3-action-editor/default.nix
rename to distros/kinetic/op3-action-editor/default.nix
diff --git a/kinetic/op3-action-module-msgs/default.nix b/distros/kinetic/op3-action-module-msgs/default.nix
similarity index 100%
rename from kinetic/op3-action-module-msgs/default.nix
rename to distros/kinetic/op3-action-module-msgs/default.nix
diff --git a/kinetic/op3-action-module/default.nix b/distros/kinetic/op3-action-module/default.nix
similarity index 100%
rename from kinetic/op3-action-module/default.nix
rename to distros/kinetic/op3-action-module/default.nix
diff --git a/kinetic/op3-balance-control/default.nix b/distros/kinetic/op3-balance-control/default.nix
similarity index 100%
rename from kinetic/op3-balance-control/default.nix
rename to distros/kinetic/op3-balance-control/default.nix
diff --git a/kinetic/op3-ball-detector/default.nix b/distros/kinetic/op3-ball-detector/default.nix
similarity index 100%
rename from kinetic/op3-ball-detector/default.nix
rename to distros/kinetic/op3-ball-detector/default.nix
diff --git a/kinetic/op3-base-module/default.nix b/distros/kinetic/op3-base-module/default.nix
similarity index 100%
rename from kinetic/op3-base-module/default.nix
rename to distros/kinetic/op3-base-module/default.nix
diff --git a/kinetic/op3-bringup/default.nix b/distros/kinetic/op3-bringup/default.nix
similarity index 100%
rename from kinetic/op3-bringup/default.nix
rename to distros/kinetic/op3-bringup/default.nix
diff --git a/kinetic/op3-camera-setting-tool/default.nix b/distros/kinetic/op3-camera-setting-tool/default.nix
similarity index 100%
rename from kinetic/op3-camera-setting-tool/default.nix
rename to distros/kinetic/op3-camera-setting-tool/default.nix
diff --git a/kinetic/op3-demo/default.nix b/distros/kinetic/op3-demo/default.nix
similarity index 100%
rename from kinetic/op3-demo/default.nix
rename to distros/kinetic/op3-demo/default.nix
diff --git a/kinetic/op3-description/default.nix b/distros/kinetic/op3-description/default.nix
similarity index 100%
rename from kinetic/op3-description/default.nix
rename to distros/kinetic/op3-description/default.nix
diff --git a/kinetic/op3-direct-control-module/default.nix b/distros/kinetic/op3-direct-control-module/default.nix
similarity index 100%
rename from kinetic/op3-direct-control-module/default.nix
rename to distros/kinetic/op3-direct-control-module/default.nix
diff --git a/kinetic/op3-gazebo/default.nix b/distros/kinetic/op3-gazebo/default.nix
similarity index 100%
rename from kinetic/op3-gazebo/default.nix
rename to distros/kinetic/op3-gazebo/default.nix
diff --git a/kinetic/op3-gui-demo/default.nix b/distros/kinetic/op3-gui-demo/default.nix
similarity index 100%
rename from kinetic/op3-gui-demo/default.nix
rename to distros/kinetic/op3-gui-demo/default.nix
diff --git a/kinetic/op3-head-control-module/default.nix b/distros/kinetic/op3-head-control-module/default.nix
similarity index 100%
rename from kinetic/op3-head-control-module/default.nix
rename to distros/kinetic/op3-head-control-module/default.nix
diff --git a/kinetic/op3-kinematics-dynamics/default.nix b/distros/kinetic/op3-kinematics-dynamics/default.nix
similarity index 100%
rename from kinetic/op3-kinematics-dynamics/default.nix
rename to distros/kinetic/op3-kinematics-dynamics/default.nix
diff --git a/kinetic/op3-localization/default.nix b/distros/kinetic/op3-localization/default.nix
similarity index 100%
rename from kinetic/op3-localization/default.nix
rename to distros/kinetic/op3-localization/default.nix
diff --git a/kinetic/op3-manager/default.nix b/distros/kinetic/op3-manager/default.nix
similarity index 100%
rename from kinetic/op3-manager/default.nix
rename to distros/kinetic/op3-manager/default.nix
diff --git a/kinetic/op3-navigation/default.nix b/distros/kinetic/op3-navigation/default.nix
similarity index 100%
rename from kinetic/op3-navigation/default.nix
rename to distros/kinetic/op3-navigation/default.nix
diff --git a/kinetic/op3-offset-tuner-client/default.nix b/distros/kinetic/op3-offset-tuner-client/default.nix
similarity index 100%
rename from kinetic/op3-offset-tuner-client/default.nix
rename to distros/kinetic/op3-offset-tuner-client/default.nix
diff --git a/kinetic/op3-offset-tuner-msgs/default.nix b/distros/kinetic/op3-offset-tuner-msgs/default.nix
similarity index 100%
rename from kinetic/op3-offset-tuner-msgs/default.nix
rename to distros/kinetic/op3-offset-tuner-msgs/default.nix
diff --git a/kinetic/op3-offset-tuner-server/default.nix b/distros/kinetic/op3-offset-tuner-server/default.nix
similarity index 100%
rename from kinetic/op3-offset-tuner-server/default.nix
rename to distros/kinetic/op3-offset-tuner-server/default.nix
diff --git a/kinetic/op3-online-walking-module-msgs/default.nix b/distros/kinetic/op3-online-walking-module-msgs/default.nix
similarity index 100%
rename from kinetic/op3-online-walking-module-msgs/default.nix
rename to distros/kinetic/op3-online-walking-module-msgs/default.nix
diff --git a/kinetic/op3-online-walking-module/default.nix b/distros/kinetic/op3-online-walking-module/default.nix
similarity index 100%
rename from kinetic/op3-online-walking-module/default.nix
rename to distros/kinetic/op3-online-walking-module/default.nix
diff --git a/kinetic/op3-walking-module-msgs/default.nix b/distros/kinetic/op3-walking-module-msgs/default.nix
similarity index 100%
rename from kinetic/op3-walking-module-msgs/default.nix
rename to distros/kinetic/op3-walking-module-msgs/default.nix
diff --git a/kinetic/op3-walking-module/default.nix b/distros/kinetic/op3-walking-module/default.nix
similarity index 100%
rename from kinetic/op3-walking-module/default.nix
rename to distros/kinetic/op3-walking-module/default.nix
diff --git a/kinetic/op3-web-setting-tool/default.nix b/distros/kinetic/op3-web-setting-tool/default.nix
similarity index 100%
rename from kinetic/op3-web-setting-tool/default.nix
rename to distros/kinetic/op3-web-setting-tool/default.nix
diff --git a/kinetic/open-cr-module/default.nix b/distros/kinetic/open-cr-module/default.nix
similarity index 100%
rename from kinetic/open-cr-module/default.nix
rename to distros/kinetic/open-cr-module/default.nix
diff --git a/kinetic/open-karto/default.nix b/distros/kinetic/open-karto/default.nix
similarity index 100%
rename from kinetic/open-karto/default.nix
rename to distros/kinetic/open-karto/default.nix
diff --git a/kinetic/open-manipulator-ar-markers/default.nix b/distros/kinetic/open-manipulator-ar-markers/default.nix
similarity index 100%
rename from kinetic/open-manipulator-ar-markers/default.nix
rename to distros/kinetic/open-manipulator-ar-markers/default.nix
diff --git a/kinetic/open-manipulator-control-gui/default.nix b/distros/kinetic/open-manipulator-control-gui/default.nix
similarity index 100%
rename from kinetic/open-manipulator-control-gui/default.nix
rename to distros/kinetic/open-manipulator-control-gui/default.nix
diff --git a/kinetic/open-manipulator-controller/default.nix b/distros/kinetic/open-manipulator-controller/default.nix
similarity index 100%
rename from kinetic/open-manipulator-controller/default.nix
rename to distros/kinetic/open-manipulator-controller/default.nix
diff --git a/kinetic/open-manipulator-description/default.nix b/distros/kinetic/open-manipulator-description/default.nix
similarity index 100%
rename from kinetic/open-manipulator-description/default.nix
rename to distros/kinetic/open-manipulator-description/default.nix
diff --git a/kinetic/open-manipulator-gazebo/default.nix b/distros/kinetic/open-manipulator-gazebo/default.nix
similarity index 100%
rename from kinetic/open-manipulator-gazebo/default.nix
rename to distros/kinetic/open-manipulator-gazebo/default.nix
diff --git a/kinetic/open-manipulator-libs/default.nix b/distros/kinetic/open-manipulator-libs/default.nix
similarity index 100%
rename from kinetic/open-manipulator-libs/default.nix
rename to distros/kinetic/open-manipulator-libs/default.nix
diff --git a/kinetic/open-manipulator-moveit/default.nix b/distros/kinetic/open-manipulator-moveit/default.nix
similarity index 100%
rename from kinetic/open-manipulator-moveit/default.nix
rename to distros/kinetic/open-manipulator-moveit/default.nix
diff --git a/kinetic/open-manipulator-msgs/default.nix b/distros/kinetic/open-manipulator-msgs/default.nix
similarity index 100%
rename from kinetic/open-manipulator-msgs/default.nix
rename to distros/kinetic/open-manipulator-msgs/default.nix
diff --git a/kinetic/open-manipulator-perceptions/default.nix b/distros/kinetic/open-manipulator-perceptions/default.nix
similarity index 100%
rename from kinetic/open-manipulator-perceptions/default.nix
rename to distros/kinetic/open-manipulator-perceptions/default.nix
diff --git a/kinetic/open-manipulator-simulations/default.nix b/distros/kinetic/open-manipulator-simulations/default.nix
similarity index 100%
rename from kinetic/open-manipulator-simulations/default.nix
rename to distros/kinetic/open-manipulator-simulations/default.nix
diff --git a/kinetic/open-manipulator-teleop/default.nix b/distros/kinetic/open-manipulator-teleop/default.nix
similarity index 100%
rename from kinetic/open-manipulator-teleop/default.nix
rename to distros/kinetic/open-manipulator-teleop/default.nix
diff --git a/kinetic/open-manipulator-with-tb3-description/default.nix b/distros/kinetic/open-manipulator-with-tb3-description/default.nix
similarity index 100%
rename from kinetic/open-manipulator-with-tb3-description/default.nix
rename to distros/kinetic/open-manipulator-with-tb3-description/default.nix
diff --git a/kinetic/open-manipulator-with-tb3-gazebo/default.nix b/distros/kinetic/open-manipulator-with-tb3-gazebo/default.nix
similarity index 100%
rename from kinetic/open-manipulator-with-tb3-gazebo/default.nix
rename to distros/kinetic/open-manipulator-with-tb3-gazebo/default.nix
diff --git a/kinetic/open-manipulator-with-tb3-simulations/default.nix b/distros/kinetic/open-manipulator-with-tb3-simulations/default.nix
similarity index 100%
rename from kinetic/open-manipulator-with-tb3-simulations/default.nix
rename to distros/kinetic/open-manipulator-with-tb3-simulations/default.nix
diff --git a/kinetic/open-manipulator-with-tb3-tools/default.nix b/distros/kinetic/open-manipulator-with-tb3-tools/default.nix
similarity index 100%
rename from kinetic/open-manipulator-with-tb3-tools/default.nix
rename to distros/kinetic/open-manipulator-with-tb3-tools/default.nix
diff --git a/kinetic/open-manipulator-with-tb3-waffle-moveit/default.nix b/distros/kinetic/open-manipulator-with-tb3-waffle-moveit/default.nix
similarity index 100%
rename from kinetic/open-manipulator-with-tb3-waffle-moveit/default.nix
rename to distros/kinetic/open-manipulator-with-tb3-waffle-moveit/default.nix
diff --git a/kinetic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix b/distros/kinetic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix
similarity index 100%
rename from kinetic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix
rename to distros/kinetic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix
diff --git a/kinetic/open-manipulator-with-tb3/default.nix b/distros/kinetic/open-manipulator-with-tb3/default.nix
similarity index 100%
rename from kinetic/open-manipulator-with-tb3/default.nix
rename to distros/kinetic/open-manipulator-with-tb3/default.nix
diff --git a/kinetic/open-manipulator/default.nix b/distros/kinetic/open-manipulator/default.nix
similarity index 100%
rename from kinetic/open-manipulator/default.nix
rename to distros/kinetic/open-manipulator/default.nix
diff --git a/kinetic/opencv-apps/default.nix b/distros/kinetic/opencv-apps/default.nix
similarity index 100%
rename from kinetic/opencv-apps/default.nix
rename to distros/kinetic/opencv-apps/default.nix
diff --git a/kinetic/opencv-candidate/default.nix b/distros/kinetic/opencv-candidate/default.nix
similarity index 100%
rename from kinetic/opencv-candidate/default.nix
rename to distros/kinetic/opencv-candidate/default.nix
diff --git a/kinetic/opencv3/default.nix b/distros/kinetic/opencv3/default.nix
similarity index 100%
rename from kinetic/opencv3/default.nix
rename to distros/kinetic/opencv3/default.nix
diff --git a/kinetic/openface-ros/default.nix b/distros/kinetic/openface-ros/default.nix
similarity index 100%
rename from kinetic/openface-ros/default.nix
rename to distros/kinetic/openface-ros/default.nix
diff --git a/kinetic/opengm/default.nix b/distros/kinetic/opengm/default.nix
similarity index 100%
rename from kinetic/opengm/default.nix
rename to distros/kinetic/opengm/default.nix
diff --git a/kinetic/openni-description/default.nix b/distros/kinetic/openni-description/default.nix
similarity index 100%
rename from kinetic/openni-description/default.nix
rename to distros/kinetic/openni-description/default.nix
diff --git a/kinetic/openni-launch/default.nix b/distros/kinetic/openni-launch/default.nix
similarity index 100%
rename from kinetic/openni-launch/default.nix
rename to distros/kinetic/openni-launch/default.nix
diff --git a/kinetic/openni2-camera/default.nix b/distros/kinetic/openni2-camera/default.nix
similarity index 100%
rename from kinetic/openni2-camera/default.nix
rename to distros/kinetic/openni2-camera/default.nix
diff --git a/kinetic/openni2-launch/default.nix b/distros/kinetic/openni2-launch/default.nix
similarity index 100%
rename from kinetic/openni2-launch/default.nix
rename to distros/kinetic/openni2-launch/default.nix
diff --git a/kinetic/openrave-planning/default.nix b/distros/kinetic/openrave-planning/default.nix
similarity index 100%
rename from kinetic/openrave-planning/default.nix
rename to distros/kinetic/openrave-planning/default.nix
diff --git a/kinetic/openrtm-aist/default.nix b/distros/kinetic/openrtm-aist/default.nix
similarity index 100%
rename from kinetic/openrtm-aist/default.nix
rename to distros/kinetic/openrtm-aist/default.nix
diff --git a/kinetic/openrtm-ros-bridge/default.nix b/distros/kinetic/openrtm-ros-bridge/default.nix
similarity index 100%
rename from kinetic/openrtm-ros-bridge/default.nix
rename to distros/kinetic/openrtm-ros-bridge/default.nix
diff --git a/kinetic/openrtm-tools/default.nix b/distros/kinetic/openrtm-tools/default.nix
similarity index 100%
rename from kinetic/openrtm-tools/default.nix
rename to distros/kinetic/openrtm-tools/default.nix
diff --git a/kinetic/openslam-gmapping/default.nix b/distros/kinetic/openslam-gmapping/default.nix
similarity index 100%
rename from kinetic/openslam-gmapping/default.nix
rename to distros/kinetic/openslam-gmapping/default.nix
diff --git a/kinetic/opt-camera/default.nix b/distros/kinetic/opt-camera/default.nix
similarity index 100%
rename from kinetic/opt-camera/default.nix
rename to distros/kinetic/opt-camera/default.nix
diff --git a/kinetic/optpp-catkin/default.nix b/distros/kinetic/optpp-catkin/default.nix
similarity index 100%
rename from kinetic/optpp-catkin/default.nix
rename to distros/kinetic/optpp-catkin/default.nix
diff --git a/kinetic/orocos-kdl/default.nix b/distros/kinetic/orocos-kdl/default.nix
similarity index 100%
rename from kinetic/orocos-kdl/default.nix
rename to distros/kinetic/orocos-kdl/default.nix
diff --git a/kinetic/orocos-kinematics-dynamics/default.nix b/distros/kinetic/orocos-kinematics-dynamics/default.nix
similarity index 100%
rename from kinetic/orocos-kinematics-dynamics/default.nix
rename to distros/kinetic/orocos-kinematics-dynamics/default.nix
diff --git a/kinetic/oros-tools-examples/default.nix b/distros/kinetic/oros-tools-examples/default.nix
similarity index 100%
rename from kinetic/oros-tools-examples/default.nix
rename to distros/kinetic/oros-tools-examples/default.nix
diff --git a/kinetic/oros-tools/default.nix b/distros/kinetic/oros-tools/default.nix
similarity index 100%
rename from kinetic/oros-tools/default.nix
rename to distros/kinetic/oros-tools/default.nix
diff --git a/kinetic/osg-interactive-markers/default.nix b/distros/kinetic/osg-interactive-markers/default.nix
similarity index 100%
rename from kinetic/osg-interactive-markers/default.nix
rename to distros/kinetic/osg-interactive-markers/default.nix
diff --git a/kinetic/osg-markers/default.nix b/distros/kinetic/osg-markers/default.nix
similarity index 100%
rename from kinetic/osg-markers/default.nix
rename to distros/kinetic/osg-markers/default.nix
diff --git a/kinetic/osg-utils/default.nix b/distros/kinetic/osg-utils/default.nix
similarity index 100%
rename from kinetic/osg-utils/default.nix
rename to distros/kinetic/osg-utils/default.nix
diff --git a/kinetic/osm-cartography/default.nix b/distros/kinetic/osm-cartography/default.nix
similarity index 100%
rename from kinetic/osm-cartography/default.nix
rename to distros/kinetic/osm-cartography/default.nix
diff --git a/kinetic/ouster-driver/default.nix b/distros/kinetic/ouster-driver/default.nix
similarity index 100%
rename from kinetic/ouster-driver/default.nix
rename to distros/kinetic/ouster-driver/default.nix
diff --git a/kinetic/overrides.nix b/distros/kinetic/overrides.nix
similarity index 100%
rename from kinetic/overrides.nix
rename to distros/kinetic/overrides.nix
diff --git a/kinetic/oxford-gps-eth/default.nix b/distros/kinetic/oxford-gps-eth/default.nix
similarity index 100%
rename from kinetic/oxford-gps-eth/default.nix
rename to distros/kinetic/oxford-gps-eth/default.nix
diff --git a/kinetic/p2os-doc/default.nix b/distros/kinetic/p2os-doc/default.nix
similarity index 100%
rename from kinetic/p2os-doc/default.nix
rename to distros/kinetic/p2os-doc/default.nix
diff --git a/kinetic/p2os-driver/default.nix b/distros/kinetic/p2os-driver/default.nix
similarity index 100%
rename from kinetic/p2os-driver/default.nix
rename to distros/kinetic/p2os-driver/default.nix
diff --git a/kinetic/p2os-launch/default.nix b/distros/kinetic/p2os-launch/default.nix
similarity index 100%
rename from kinetic/p2os-launch/default.nix
rename to distros/kinetic/p2os-launch/default.nix
diff --git a/kinetic/p2os-msgs/default.nix b/distros/kinetic/p2os-msgs/default.nix
similarity index 100%
rename from kinetic/p2os-msgs/default.nix
rename to distros/kinetic/p2os-msgs/default.nix
diff --git a/kinetic/p2os-teleop/default.nix b/distros/kinetic/p2os-teleop/default.nix
similarity index 100%
rename from kinetic/p2os-teleop/default.nix
rename to distros/kinetic/p2os-teleop/default.nix
diff --git a/kinetic/p2os-urdf/default.nix b/distros/kinetic/p2os-urdf/default.nix
similarity index 100%
rename from kinetic/p2os-urdf/default.nix
rename to distros/kinetic/p2os-urdf/default.nix
diff --git a/kinetic/pacmod-game-control/default.nix b/distros/kinetic/pacmod-game-control/default.nix
similarity index 100%
rename from kinetic/pacmod-game-control/default.nix
rename to distros/kinetic/pacmod-game-control/default.nix
diff --git a/kinetic/pacmod-msgs/default.nix b/distros/kinetic/pacmod-msgs/default.nix
similarity index 100%
rename from kinetic/pacmod-msgs/default.nix
rename to distros/kinetic/pacmod-msgs/default.nix
diff --git a/kinetic/pacmod/default.nix b/distros/kinetic/pacmod/default.nix
similarity index 100%
rename from kinetic/pacmod/default.nix
rename to distros/kinetic/pacmod/default.nix
diff --git a/kinetic/pacmod3/default.nix b/distros/kinetic/pacmod3/default.nix
similarity index 100%
rename from kinetic/pacmod3/default.nix
rename to distros/kinetic/pacmod3/default.nix
diff --git a/kinetic/pal-hardware-interfaces/default.nix b/distros/kinetic/pal-hardware-interfaces/default.nix
similarity index 100%
rename from kinetic/pal-hardware-interfaces/default.nix
rename to distros/kinetic/pal-hardware-interfaces/default.nix
diff --git a/kinetic/panda-moveit-config/default.nix b/distros/kinetic/panda-moveit-config/default.nix
similarity index 100%
rename from kinetic/panda-moveit-config/default.nix
rename to distros/kinetic/panda-moveit-config/default.nix
diff --git a/kinetic/parameter-pa/default.nix b/distros/kinetic/parameter-pa/default.nix
similarity index 100%
rename from kinetic/parameter-pa/default.nix
rename to distros/kinetic/parameter-pa/default.nix
diff --git a/kinetic/parrot-arsdk/default.nix b/distros/kinetic/parrot-arsdk/default.nix
similarity index 100%
rename from kinetic/parrot-arsdk/default.nix
rename to distros/kinetic/parrot-arsdk/default.nix
diff --git a/kinetic/pcdfilter-pa/default.nix b/distros/kinetic/pcdfilter-pa/default.nix
similarity index 100%
rename from kinetic/pcdfilter-pa/default.nix
rename to distros/kinetic/pcdfilter-pa/default.nix
diff --git a/kinetic/pcl-conversions/default.nix b/distros/kinetic/pcl-conversions/default.nix
similarity index 100%
rename from kinetic/pcl-conversions/default.nix
rename to distros/kinetic/pcl-conversions/default.nix
diff --git a/kinetic/pcl-msgs/default.nix b/distros/kinetic/pcl-msgs/default.nix
similarity index 100%
rename from kinetic/pcl-msgs/default.nix
rename to distros/kinetic/pcl-msgs/default.nix
diff --git a/kinetic/pcl-ros/default.nix b/distros/kinetic/pcl-ros/default.nix
similarity index 100%
rename from kinetic/pcl-ros/default.nix
rename to distros/kinetic/pcl-ros/default.nix
diff --git a/kinetic/pddl-msgs/default.nix b/distros/kinetic/pddl-msgs/default.nix
similarity index 100%
rename from kinetic/pddl-msgs/default.nix
rename to distros/kinetic/pddl-msgs/default.nix
diff --git a/kinetic/pddl-planner-viewer/default.nix b/distros/kinetic/pddl-planner-viewer/default.nix
similarity index 100%
rename from kinetic/pddl-planner-viewer/default.nix
rename to distros/kinetic/pddl-planner-viewer/default.nix
diff --git a/kinetic/pddl-planner/default.nix b/distros/kinetic/pddl-planner/default.nix
similarity index 100%
rename from kinetic/pddl-planner/default.nix
rename to distros/kinetic/pddl-planner/default.nix
diff --git a/kinetic/people-msgs/default.nix b/distros/kinetic/people-msgs/default.nix
similarity index 100%
rename from kinetic/people-msgs/default.nix
rename to distros/kinetic/people-msgs/default.nix
diff --git a/kinetic/people-tracking-filter/default.nix b/distros/kinetic/people-tracking-filter/default.nix
similarity index 100%
rename from kinetic/people-tracking-filter/default.nix
rename to distros/kinetic/people-tracking-filter/default.nix
diff --git a/kinetic/people-velocity-tracker/default.nix b/distros/kinetic/people-velocity-tracker/default.nix
similarity index 100%
rename from kinetic/people-velocity-tracker/default.nix
rename to distros/kinetic/people-velocity-tracker/default.nix
diff --git a/kinetic/people/default.nix b/distros/kinetic/people/default.nix
similarity index 100%
rename from kinetic/people/default.nix
rename to distros/kinetic/people/default.nix
diff --git a/kinetic/pepper-bringup/default.nix b/distros/kinetic/pepper-bringup/default.nix
similarity index 100%
rename from kinetic/pepper-bringup/default.nix
rename to distros/kinetic/pepper-bringup/default.nix
diff --git a/kinetic/pepper-control/default.nix b/distros/kinetic/pepper-control/default.nix
similarity index 100%
rename from kinetic/pepper-control/default.nix
rename to distros/kinetic/pepper-control/default.nix
diff --git a/kinetic/pepper-dcm-bringup/default.nix b/distros/kinetic/pepper-dcm-bringup/default.nix
similarity index 100%
rename from kinetic/pepper-dcm-bringup/default.nix
rename to distros/kinetic/pepper-dcm-bringup/default.nix
diff --git a/kinetic/pepper-description/default.nix b/distros/kinetic/pepper-description/default.nix
similarity index 100%
rename from kinetic/pepper-description/default.nix
rename to distros/kinetic/pepper-description/default.nix
diff --git a/kinetic/pepper-gazebo-plugin/default.nix b/distros/kinetic/pepper-gazebo-plugin/default.nix
similarity index 100%
rename from kinetic/pepper-gazebo-plugin/default.nix
rename to distros/kinetic/pepper-gazebo-plugin/default.nix
diff --git a/kinetic/pepper-meshes/default.nix b/distros/kinetic/pepper-meshes/default.nix
similarity index 100%
rename from kinetic/pepper-meshes/default.nix
rename to distros/kinetic/pepper-meshes/default.nix
diff --git a/kinetic/pepper-moveit-config/default.nix b/distros/kinetic/pepper-moveit-config/default.nix
similarity index 100%
rename from kinetic/pepper-moveit-config/default.nix
rename to distros/kinetic/pepper-moveit-config/default.nix
diff --git a/kinetic/pepper-robot/default.nix b/distros/kinetic/pepper-robot/default.nix
similarity index 100%
rename from kinetic/pepper-robot/default.nix
rename to distros/kinetic/pepper-robot/default.nix
diff --git a/kinetic/pepper-sensors-py/default.nix b/distros/kinetic/pepper-sensors-py/default.nix
similarity index 100%
rename from kinetic/pepper-sensors-py/default.nix
rename to distros/kinetic/pepper-sensors-py/default.nix
diff --git a/kinetic/pepperl-fuchs-r2000/default.nix b/distros/kinetic/pepperl-fuchs-r2000/default.nix
similarity index 100%
rename from kinetic/pepperl-fuchs-r2000/default.nix
rename to distros/kinetic/pepperl-fuchs-r2000/default.nix
diff --git a/kinetic/perception-pcl/default.nix b/distros/kinetic/perception-pcl/default.nix
similarity index 100%
rename from kinetic/perception-pcl/default.nix
rename to distros/kinetic/perception-pcl/default.nix
diff --git a/kinetic/perception/default.nix b/distros/kinetic/perception/default.nix
similarity index 100%
rename from kinetic/perception/default.nix
rename to distros/kinetic/perception/default.nix
diff --git a/kinetic/pgm-learner/default.nix b/distros/kinetic/pgm-learner/default.nix
similarity index 100%
rename from kinetic/pgm-learner/default.nix
rename to distros/kinetic/pgm-learner/default.nix
diff --git a/kinetic/pheeno-ros-description/default.nix b/distros/kinetic/pheeno-ros-description/default.nix
similarity index 100%
rename from kinetic/pheeno-ros-description/default.nix
rename to distros/kinetic/pheeno-ros-description/default.nix
diff --git a/kinetic/pheeno-ros-sim/default.nix b/distros/kinetic/pheeno-ros-sim/default.nix
similarity index 100%
rename from kinetic/pheeno-ros-sim/default.nix
rename to distros/kinetic/pheeno-ros-sim/default.nix
diff --git a/kinetic/pheeno-ros/default.nix b/distros/kinetic/pheeno-ros/default.nix
similarity index 100%
rename from kinetic/pheeno-ros/default.nix
rename to distros/kinetic/pheeno-ros/default.nix
diff --git a/kinetic/phidgets-api/default.nix b/distros/kinetic/phidgets-api/default.nix
similarity index 100%
rename from kinetic/phidgets-api/default.nix
rename to distros/kinetic/phidgets-api/default.nix
diff --git a/kinetic/phidgets-drivers/default.nix b/distros/kinetic/phidgets-drivers/default.nix
similarity index 100%
rename from kinetic/phidgets-drivers/default.nix
rename to distros/kinetic/phidgets-drivers/default.nix
diff --git a/kinetic/phidgets-high-speed-encoder/default.nix b/distros/kinetic/phidgets-high-speed-encoder/default.nix
similarity index 100%
rename from kinetic/phidgets-high-speed-encoder/default.nix
rename to distros/kinetic/phidgets-high-speed-encoder/default.nix
diff --git a/kinetic/phidgets-ik/default.nix b/distros/kinetic/phidgets-ik/default.nix
similarity index 100%
rename from kinetic/phidgets-ik/default.nix
rename to distros/kinetic/phidgets-ik/default.nix
diff --git a/kinetic/phidgets-imu/default.nix b/distros/kinetic/phidgets-imu/default.nix
similarity index 100%
rename from kinetic/phidgets-imu/default.nix
rename to distros/kinetic/phidgets-imu/default.nix
diff --git a/kinetic/pid/default.nix b/distros/kinetic/pid/default.nix
similarity index 100%
rename from kinetic/pid/default.nix
rename to distros/kinetic/pid/default.nix
diff --git a/kinetic/piksi-multi-rtk/default.nix b/distros/kinetic/piksi-multi-rtk/default.nix
similarity index 100%
rename from kinetic/piksi-multi-rtk/default.nix
rename to distros/kinetic/piksi-multi-rtk/default.nix
diff --git a/kinetic/piksi-rtk-msgs/default.nix b/distros/kinetic/piksi-rtk-msgs/default.nix
similarity index 100%
rename from kinetic/piksi-rtk-msgs/default.nix
rename to distros/kinetic/piksi-rtk-msgs/default.nix
diff --git a/kinetic/pilz-control/default.nix b/distros/kinetic/pilz-control/default.nix
similarity index 100%
rename from kinetic/pilz-control/default.nix
rename to distros/kinetic/pilz-control/default.nix
diff --git a/kinetic/pilz-extensions/default.nix b/distros/kinetic/pilz-extensions/default.nix
similarity index 100%
rename from kinetic/pilz-extensions/default.nix
rename to distros/kinetic/pilz-extensions/default.nix
diff --git a/kinetic/pilz-industrial-motion-testutils/default.nix b/distros/kinetic/pilz-industrial-motion-testutils/default.nix
similarity index 100%
rename from kinetic/pilz-industrial-motion-testutils/default.nix
rename to distros/kinetic/pilz-industrial-motion-testutils/default.nix
diff --git a/kinetic/pilz-industrial-motion/default.nix b/distros/kinetic/pilz-industrial-motion/default.nix
similarity index 100%
rename from kinetic/pilz-industrial-motion/default.nix
rename to distros/kinetic/pilz-industrial-motion/default.nix
diff --git a/kinetic/pilz-msgs/default.nix b/distros/kinetic/pilz-msgs/default.nix
similarity index 100%
rename from kinetic/pilz-msgs/default.nix
rename to distros/kinetic/pilz-msgs/default.nix
diff --git a/kinetic/pilz-robot-programming/default.nix b/distros/kinetic/pilz-robot-programming/default.nix
similarity index 100%
rename from kinetic/pilz-robot-programming/default.nix
rename to distros/kinetic/pilz-robot-programming/default.nix
diff --git a/kinetic/pilz-robots/default.nix b/distros/kinetic/pilz-robots/default.nix
similarity index 100%
rename from kinetic/pilz-robots/default.nix
rename to distros/kinetic/pilz-robots/default.nix
diff --git a/kinetic/pilz-testutils/default.nix b/distros/kinetic/pilz-testutils/default.nix
similarity index 100%
rename from kinetic/pilz-testutils/default.nix
rename to distros/kinetic/pilz-testutils/default.nix
diff --git a/kinetic/pilz-trajectory-generation/default.nix b/distros/kinetic/pilz-trajectory-generation/default.nix
similarity index 100%
rename from kinetic/pilz-trajectory-generation/default.nix
rename to distros/kinetic/pilz-trajectory-generation/default.nix
diff --git a/kinetic/pinocchio/default.nix b/distros/kinetic/pinocchio/default.nix
similarity index 100%
rename from kinetic/pinocchio/default.nix
rename to distros/kinetic/pinocchio/default.nix
diff --git a/kinetic/planner-cspace-msgs/default.nix b/distros/kinetic/planner-cspace-msgs/default.nix
similarity index 100%
rename from kinetic/planner-cspace-msgs/default.nix
rename to distros/kinetic/planner-cspace-msgs/default.nix
diff --git a/kinetic/planner-cspace/default.nix b/distros/kinetic/planner-cspace/default.nix
similarity index 100%
rename from kinetic/planner-cspace/default.nix
rename to distros/kinetic/planner-cspace/default.nix
diff --git a/kinetic/play-motion-msgs/default.nix b/distros/kinetic/play-motion-msgs/default.nix
similarity index 100%
rename from kinetic/play-motion-msgs/default.nix
rename to distros/kinetic/play-motion-msgs/default.nix
diff --git a/kinetic/play-motion/default.nix b/distros/kinetic/play-motion/default.nix
similarity index 100%
rename from kinetic/play-motion/default.nix
rename to distros/kinetic/play-motion/default.nix
diff --git a/kinetic/plot-tools/default.nix b/distros/kinetic/plot-tools/default.nix
similarity index 100%
rename from kinetic/plot-tools/default.nix
rename to distros/kinetic/plot-tools/default.nix
diff --git a/kinetic/plotjuggler/default.nix b/distros/kinetic/plotjuggler/default.nix
similarity index 100%
rename from kinetic/plotjuggler/default.nix
rename to distros/kinetic/plotjuggler/default.nix
diff --git a/kinetic/pluginlib-tutorials/default.nix b/distros/kinetic/pluginlib-tutorials/default.nix
similarity index 100%
rename from kinetic/pluginlib-tutorials/default.nix
rename to distros/kinetic/pluginlib-tutorials/default.nix
diff --git a/kinetic/pluginlib/default.nix b/distros/kinetic/pluginlib/default.nix
similarity index 100%
rename from kinetic/pluginlib/default.nix
rename to distros/kinetic/pluginlib/default.nix
diff --git a/kinetic/point-cloud-publisher-tutorial/default.nix b/distros/kinetic/point-cloud-publisher-tutorial/default.nix
similarity index 100%
rename from kinetic/point-cloud-publisher-tutorial/default.nix
rename to distros/kinetic/point-cloud-publisher-tutorial/default.nix
diff --git a/kinetic/pointcloud-to-laserscan/default.nix b/distros/kinetic/pointcloud-to-laserscan/default.nix
similarity index 100%
rename from kinetic/pointcloud-to-laserscan/default.nix
rename to distros/kinetic/pointcloud-to-laserscan/default.nix
diff --git a/kinetic/pointcloud-tools/default.nix b/distros/kinetic/pointcloud-tools/default.nix
similarity index 100%
rename from kinetic/pointcloud-tools/default.nix
rename to distros/kinetic/pointcloud-tools/default.nix
diff --git a/kinetic/pointgrey-camera-description/default.nix b/distros/kinetic/pointgrey-camera-description/default.nix
similarity index 100%
rename from kinetic/pointgrey-camera-description/default.nix
rename to distros/kinetic/pointgrey-camera-description/default.nix
diff --git a/kinetic/pointgrey-camera-driver/default.nix b/distros/kinetic/pointgrey-camera-driver/default.nix
similarity index 100%
rename from kinetic/pointgrey-camera-driver/default.nix
rename to distros/kinetic/pointgrey-camera-driver/default.nix
diff --git a/kinetic/polar-scan-matcher/default.nix b/distros/kinetic/polar-scan-matcher/default.nix
similarity index 100%
rename from kinetic/polar-scan-matcher/default.nix
rename to distros/kinetic/polar-scan-matcher/default.nix
diff --git a/kinetic/polled-camera/default.nix b/distros/kinetic/polled-camera/default.nix
similarity index 100%
rename from kinetic/polled-camera/default.nix
rename to distros/kinetic/polled-camera/default.nix
diff --git a/kinetic/pose-base-controller/default.nix b/distros/kinetic/pose-base-controller/default.nix
similarity index 100%
rename from kinetic/pose-base-controller/default.nix
rename to distros/kinetic/pose-base-controller/default.nix
diff --git a/kinetic/pose-follower/default.nix b/distros/kinetic/pose-follower/default.nix
similarity index 100%
rename from kinetic/pose-follower/default.nix
rename to distros/kinetic/pose-follower/default.nix
diff --git a/kinetic/posedetection-msgs/default.nix b/distros/kinetic/posedetection-msgs/default.nix
similarity index 100%
rename from kinetic/posedetection-msgs/default.nix
rename to distros/kinetic/posedetection-msgs/default.nix
diff --git a/kinetic/position-controllers/default.nix b/distros/kinetic/position-controllers/default.nix
similarity index 100%
rename from kinetic/position-controllers/default.nix
rename to distros/kinetic/position-controllers/default.nix
diff --git a/kinetic/power-monitor/default.nix b/distros/kinetic/power-monitor/default.nix
similarity index 100%
rename from kinetic/power-monitor/default.nix
rename to distros/kinetic/power-monitor/default.nix
diff --git a/kinetic/pr2-2dnav-local/default.nix b/distros/kinetic/pr2-2dnav-local/default.nix
similarity index 100%
rename from kinetic/pr2-2dnav-local/default.nix
rename to distros/kinetic/pr2-2dnav-local/default.nix
diff --git a/kinetic/pr2-2dnav-slam/default.nix b/distros/kinetic/pr2-2dnav-slam/default.nix
similarity index 100%
rename from kinetic/pr2-2dnav-slam/default.nix
rename to distros/kinetic/pr2-2dnav-slam/default.nix
diff --git a/kinetic/pr2-2dnav/default.nix b/distros/kinetic/pr2-2dnav/default.nix
similarity index 100%
rename from kinetic/pr2-2dnav/default.nix
rename to distros/kinetic/pr2-2dnav/default.nix
diff --git a/kinetic/pr2-app-manager/default.nix b/distros/kinetic/pr2-app-manager/default.nix
similarity index 100%
rename from kinetic/pr2-app-manager/default.nix
rename to distros/kinetic/pr2-app-manager/default.nix
diff --git a/kinetic/pr2-apps/default.nix b/distros/kinetic/pr2-apps/default.nix
similarity index 100%
rename from kinetic/pr2-apps/default.nix
rename to distros/kinetic/pr2-apps/default.nix
diff --git a/kinetic/pr2-arm-kinematics/default.nix b/distros/kinetic/pr2-arm-kinematics/default.nix
similarity index 100%
rename from kinetic/pr2-arm-kinematics/default.nix
rename to distros/kinetic/pr2-arm-kinematics/default.nix
diff --git a/kinetic/pr2-arm-move-ik/default.nix b/distros/kinetic/pr2-arm-move-ik/default.nix
similarity index 100%
rename from kinetic/pr2-arm-move-ik/default.nix
rename to distros/kinetic/pr2-arm-move-ik/default.nix
diff --git a/kinetic/pr2-base/default.nix b/distros/kinetic/pr2-base/default.nix
similarity index 100%
rename from kinetic/pr2-base/default.nix
rename to distros/kinetic/pr2-base/default.nix
diff --git a/kinetic/pr2-bringup-tests/default.nix b/distros/kinetic/pr2-bringup-tests/default.nix
similarity index 100%
rename from kinetic/pr2-bringup-tests/default.nix
rename to distros/kinetic/pr2-bringup-tests/default.nix
diff --git a/kinetic/pr2-bringup/default.nix b/distros/kinetic/pr2-bringup/default.nix
similarity index 100%
rename from kinetic/pr2-bringup/default.nix
rename to distros/kinetic/pr2-bringup/default.nix
diff --git a/kinetic/pr2-calibration-controllers/default.nix b/distros/kinetic/pr2-calibration-controllers/default.nix
similarity index 100%
rename from kinetic/pr2-calibration-controllers/default.nix
rename to distros/kinetic/pr2-calibration-controllers/default.nix
diff --git a/kinetic/pr2-calibration-launch/default.nix b/distros/kinetic/pr2-calibration-launch/default.nix
similarity index 100%
rename from kinetic/pr2-calibration-launch/default.nix
rename to distros/kinetic/pr2-calibration-launch/default.nix
diff --git a/kinetic/pr2-calibration/default.nix b/distros/kinetic/pr2-calibration/default.nix
similarity index 100%
rename from kinetic/pr2-calibration/default.nix
rename to distros/kinetic/pr2-calibration/default.nix
diff --git a/kinetic/pr2-camera-synchronizer/default.nix b/distros/kinetic/pr2-camera-synchronizer/default.nix
similarity index 100%
rename from kinetic/pr2-camera-synchronizer/default.nix
rename to distros/kinetic/pr2-camera-synchronizer/default.nix
diff --git a/kinetic/pr2-common-action-msgs/default.nix b/distros/kinetic/pr2-common-action-msgs/default.nix
similarity index 100%
rename from kinetic/pr2-common-action-msgs/default.nix
rename to distros/kinetic/pr2-common-action-msgs/default.nix
diff --git a/kinetic/pr2-common-actions/default.nix b/distros/kinetic/pr2-common-actions/default.nix
similarity index 100%
rename from kinetic/pr2-common-actions/default.nix
rename to distros/kinetic/pr2-common-actions/default.nix
diff --git a/kinetic/pr2-common/default.nix b/distros/kinetic/pr2-common/default.nix
similarity index 100%
rename from kinetic/pr2-common/default.nix
rename to distros/kinetic/pr2-common/default.nix
diff --git a/kinetic/pr2-computer-monitor/default.nix b/distros/kinetic/pr2-computer-monitor/default.nix
similarity index 100%
rename from kinetic/pr2-computer-monitor/default.nix
rename to distros/kinetic/pr2-computer-monitor/default.nix
diff --git a/kinetic/pr2-controller-configuration-gazebo/default.nix b/distros/kinetic/pr2-controller-configuration-gazebo/default.nix
similarity index 100%
rename from kinetic/pr2-controller-configuration-gazebo/default.nix
rename to distros/kinetic/pr2-controller-configuration-gazebo/default.nix
diff --git a/kinetic/pr2-controller-configuration/default.nix b/distros/kinetic/pr2-controller-configuration/default.nix
similarity index 100%
rename from kinetic/pr2-controller-configuration/default.nix
rename to distros/kinetic/pr2-controller-configuration/default.nix
diff --git a/kinetic/pr2-controller-interface/default.nix b/distros/kinetic/pr2-controller-interface/default.nix
similarity index 100%
rename from kinetic/pr2-controller-interface/default.nix
rename to distros/kinetic/pr2-controller-interface/default.nix
diff --git a/kinetic/pr2-controller-manager/default.nix b/distros/kinetic/pr2-controller-manager/default.nix
similarity index 100%
rename from kinetic/pr2-controller-manager/default.nix
rename to distros/kinetic/pr2-controller-manager/default.nix
diff --git a/kinetic/pr2-controllers-msgs/default.nix b/distros/kinetic/pr2-controllers-msgs/default.nix
similarity index 100%
rename from kinetic/pr2-controllers-msgs/default.nix
rename to distros/kinetic/pr2-controllers-msgs/default.nix
diff --git a/kinetic/pr2-controllers/default.nix b/distros/kinetic/pr2-controllers/default.nix
similarity index 100%
rename from kinetic/pr2-controllers/default.nix
rename to distros/kinetic/pr2-controllers/default.nix
diff --git a/kinetic/pr2-counterbalance-check/default.nix b/distros/kinetic/pr2-counterbalance-check/default.nix
similarity index 100%
rename from kinetic/pr2-counterbalance-check/default.nix
rename to distros/kinetic/pr2-counterbalance-check/default.nix
diff --git a/kinetic/pr2-dashboard-aggregator/default.nix b/distros/kinetic/pr2-dashboard-aggregator/default.nix
similarity index 100%
rename from kinetic/pr2-dashboard-aggregator/default.nix
rename to distros/kinetic/pr2-dashboard-aggregator/default.nix
diff --git a/kinetic/pr2-dense-laser-snapshotter/default.nix b/distros/kinetic/pr2-dense-laser-snapshotter/default.nix
similarity index 100%
rename from kinetic/pr2-dense-laser-snapshotter/default.nix
rename to distros/kinetic/pr2-dense-laser-snapshotter/default.nix
diff --git a/kinetic/pr2-description/default.nix b/distros/kinetic/pr2-description/default.nix
similarity index 100%
rename from kinetic/pr2-description/default.nix
rename to distros/kinetic/pr2-description/default.nix
diff --git a/kinetic/pr2-desktop/default.nix b/distros/kinetic/pr2-desktop/default.nix
similarity index 100%
rename from kinetic/pr2-desktop/default.nix
rename to distros/kinetic/pr2-desktop/default.nix
diff --git a/kinetic/pr2-ethercat-drivers/default.nix b/distros/kinetic/pr2-ethercat-drivers/default.nix
similarity index 100%
rename from kinetic/pr2-ethercat-drivers/default.nix
rename to distros/kinetic/pr2-ethercat-drivers/default.nix
diff --git a/kinetic/pr2-ethercat/default.nix b/distros/kinetic/pr2-ethercat/default.nix
similarity index 100%
rename from kinetic/pr2-ethercat/default.nix
rename to distros/kinetic/pr2-ethercat/default.nix
diff --git a/kinetic/pr2-gazebo-plugins/default.nix b/distros/kinetic/pr2-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/pr2-gazebo-plugins/default.nix
rename to distros/kinetic/pr2-gazebo-plugins/default.nix
diff --git a/kinetic/pr2-gazebo/default.nix b/distros/kinetic/pr2-gazebo/default.nix
similarity index 100%
rename from kinetic/pr2-gazebo/default.nix
rename to distros/kinetic/pr2-gazebo/default.nix
diff --git a/kinetic/pr2-gripper-action/default.nix b/distros/kinetic/pr2-gripper-action/default.nix
similarity index 100%
rename from kinetic/pr2-gripper-action/default.nix
rename to distros/kinetic/pr2-gripper-action/default.nix
diff --git a/kinetic/pr2-gripper-sensor-action/default.nix b/distros/kinetic/pr2-gripper-sensor-action/default.nix
similarity index 100%
rename from kinetic/pr2-gripper-sensor-action/default.nix
rename to distros/kinetic/pr2-gripper-sensor-action/default.nix
diff --git a/kinetic/pr2-gripper-sensor-controller/default.nix b/distros/kinetic/pr2-gripper-sensor-controller/default.nix
similarity index 100%
rename from kinetic/pr2-gripper-sensor-controller/default.nix
rename to distros/kinetic/pr2-gripper-sensor-controller/default.nix
diff --git a/kinetic/pr2-gripper-sensor-msgs/default.nix b/distros/kinetic/pr2-gripper-sensor-msgs/default.nix
similarity index 100%
rename from kinetic/pr2-gripper-sensor-msgs/default.nix
rename to distros/kinetic/pr2-gripper-sensor-msgs/default.nix
diff --git a/kinetic/pr2-gripper-sensor/default.nix b/distros/kinetic/pr2-gripper-sensor/default.nix
similarity index 100%
rename from kinetic/pr2-gripper-sensor/default.nix
rename to distros/kinetic/pr2-gripper-sensor/default.nix
diff --git a/kinetic/pr2-hardware-interface/default.nix b/distros/kinetic/pr2-hardware-interface/default.nix
similarity index 100%
rename from kinetic/pr2-hardware-interface/default.nix
rename to distros/kinetic/pr2-hardware-interface/default.nix
diff --git a/kinetic/pr2-head-action/default.nix b/distros/kinetic/pr2-head-action/default.nix
similarity index 100%
rename from kinetic/pr2-head-action/default.nix
rename to distros/kinetic/pr2-head-action/default.nix
diff --git a/kinetic/pr2-kinematics/default.nix b/distros/kinetic/pr2-kinematics/default.nix
similarity index 100%
rename from kinetic/pr2-kinematics/default.nix
rename to distros/kinetic/pr2-kinematics/default.nix
diff --git a/kinetic/pr2-machine/default.nix b/distros/kinetic/pr2-machine/default.nix
similarity index 100%
rename from kinetic/pr2-machine/default.nix
rename to distros/kinetic/pr2-machine/default.nix
diff --git a/kinetic/pr2-mannequin-mode/default.nix b/distros/kinetic/pr2-mannequin-mode/default.nix
similarity index 100%
rename from kinetic/pr2-mannequin-mode/default.nix
rename to distros/kinetic/pr2-mannequin-mode/default.nix
diff --git a/kinetic/pr2-mechanism-controllers/default.nix b/distros/kinetic/pr2-mechanism-controllers/default.nix
similarity index 100%
rename from kinetic/pr2-mechanism-controllers/default.nix
rename to distros/kinetic/pr2-mechanism-controllers/default.nix
diff --git a/kinetic/pr2-mechanism-diagnostics/default.nix b/distros/kinetic/pr2-mechanism-diagnostics/default.nix
similarity index 100%
rename from kinetic/pr2-mechanism-diagnostics/default.nix
rename to distros/kinetic/pr2-mechanism-diagnostics/default.nix
diff --git a/kinetic/pr2-mechanism-model/default.nix b/distros/kinetic/pr2-mechanism-model/default.nix
similarity index 100%
rename from kinetic/pr2-mechanism-model/default.nix
rename to distros/kinetic/pr2-mechanism-model/default.nix
diff --git a/kinetic/pr2-mechanism-msgs/default.nix b/distros/kinetic/pr2-mechanism-msgs/default.nix
similarity index 100%
rename from kinetic/pr2-mechanism-msgs/default.nix
rename to distros/kinetic/pr2-mechanism-msgs/default.nix
diff --git a/kinetic/pr2-mechanism/default.nix b/distros/kinetic/pr2-mechanism/default.nix
similarity index 100%
rename from kinetic/pr2-mechanism/default.nix
rename to distros/kinetic/pr2-mechanism/default.nix
diff --git a/kinetic/pr2-motor-diagnostic-tool/default.nix b/distros/kinetic/pr2-motor-diagnostic-tool/default.nix
similarity index 100%
rename from kinetic/pr2-motor-diagnostic-tool/default.nix
rename to distros/kinetic/pr2-motor-diagnostic-tool/default.nix
diff --git a/kinetic/pr2-move-base/default.nix b/distros/kinetic/pr2-move-base/default.nix
similarity index 100%
rename from kinetic/pr2-move-base/default.nix
rename to distros/kinetic/pr2-move-base/default.nix
diff --git a/kinetic/pr2-moveit-config/default.nix b/distros/kinetic/pr2-moveit-config/default.nix
similarity index 100%
rename from kinetic/pr2-moveit-config/default.nix
rename to distros/kinetic/pr2-moveit-config/default.nix
diff --git a/kinetic/pr2-moveit-plugins/default.nix b/distros/kinetic/pr2-moveit-plugins/default.nix
similarity index 100%
rename from kinetic/pr2-moveit-plugins/default.nix
rename to distros/kinetic/pr2-moveit-plugins/default.nix
diff --git a/kinetic/pr2-msgs/default.nix b/distros/kinetic/pr2-msgs/default.nix
similarity index 100%
rename from kinetic/pr2-msgs/default.nix
rename to distros/kinetic/pr2-msgs/default.nix
diff --git a/kinetic/pr2-navigation-apps/default.nix b/distros/kinetic/pr2-navigation-apps/default.nix
similarity index 100%
rename from kinetic/pr2-navigation-apps/default.nix
rename to distros/kinetic/pr2-navigation-apps/default.nix
diff --git a/kinetic/pr2-navigation-config/default.nix b/distros/kinetic/pr2-navigation-config/default.nix
similarity index 100%
rename from kinetic/pr2-navigation-config/default.nix
rename to distros/kinetic/pr2-navigation-config/default.nix
diff --git a/kinetic/pr2-navigation-global/default.nix b/distros/kinetic/pr2-navigation-global/default.nix
similarity index 100%
rename from kinetic/pr2-navigation-global/default.nix
rename to distros/kinetic/pr2-navigation-global/default.nix
diff --git a/kinetic/pr2-navigation-local/default.nix b/distros/kinetic/pr2-navigation-local/default.nix
similarity index 100%
rename from kinetic/pr2-navigation-local/default.nix
rename to distros/kinetic/pr2-navigation-local/default.nix
diff --git a/kinetic/pr2-navigation-perception/default.nix b/distros/kinetic/pr2-navigation-perception/default.nix
similarity index 100%
rename from kinetic/pr2-navigation-perception/default.nix
rename to distros/kinetic/pr2-navigation-perception/default.nix
diff --git a/kinetic/pr2-navigation-self-filter/default.nix b/distros/kinetic/pr2-navigation-self-filter/default.nix
similarity index 100%
rename from kinetic/pr2-navigation-self-filter/default.nix
rename to distros/kinetic/pr2-navigation-self-filter/default.nix
diff --git a/kinetic/pr2-navigation-slam/default.nix b/distros/kinetic/pr2-navigation-slam/default.nix
similarity index 100%
rename from kinetic/pr2-navigation-slam/default.nix
rename to distros/kinetic/pr2-navigation-slam/default.nix
diff --git a/kinetic/pr2-navigation-teleop/default.nix b/distros/kinetic/pr2-navigation-teleop/default.nix
similarity index 100%
rename from kinetic/pr2-navigation-teleop/default.nix
rename to distros/kinetic/pr2-navigation-teleop/default.nix
diff --git a/kinetic/pr2-navigation/default.nix b/distros/kinetic/pr2-navigation/default.nix
similarity index 100%
rename from kinetic/pr2-navigation/default.nix
rename to distros/kinetic/pr2-navigation/default.nix
diff --git a/kinetic/pr2-position-scripts/default.nix b/distros/kinetic/pr2-position-scripts/default.nix
similarity index 100%
rename from kinetic/pr2-position-scripts/default.nix
rename to distros/kinetic/pr2-position-scripts/default.nix
diff --git a/kinetic/pr2-power-board/default.nix b/distros/kinetic/pr2-power-board/default.nix
similarity index 100%
rename from kinetic/pr2-power-board/default.nix
rename to distros/kinetic/pr2-power-board/default.nix
diff --git a/kinetic/pr2-power-drivers/default.nix b/distros/kinetic/pr2-power-drivers/default.nix
similarity index 100%
rename from kinetic/pr2-power-drivers/default.nix
rename to distros/kinetic/pr2-power-drivers/default.nix
diff --git a/kinetic/pr2-robot/default.nix b/distros/kinetic/pr2-robot/default.nix
similarity index 100%
rename from kinetic/pr2-robot/default.nix
rename to distros/kinetic/pr2-robot/default.nix
diff --git a/kinetic/pr2-run-stop-auto-restart/default.nix b/distros/kinetic/pr2-run-stop-auto-restart/default.nix
similarity index 100%
rename from kinetic/pr2-run-stop-auto-restart/default.nix
rename to distros/kinetic/pr2-run-stop-auto-restart/default.nix
diff --git a/kinetic/pr2-se-calibration-launch/default.nix b/distros/kinetic/pr2-se-calibration-launch/default.nix
similarity index 100%
rename from kinetic/pr2-se-calibration-launch/default.nix
rename to distros/kinetic/pr2-se-calibration-launch/default.nix
diff --git a/kinetic/pr2-self-test-msgs/default.nix b/distros/kinetic/pr2-self-test-msgs/default.nix
similarity index 100%
rename from kinetic/pr2-self-test-msgs/default.nix
rename to distros/kinetic/pr2-self-test-msgs/default.nix
diff --git a/kinetic/pr2-self-test/default.nix b/distros/kinetic/pr2-self-test/default.nix
similarity index 100%
rename from kinetic/pr2-self-test/default.nix
rename to distros/kinetic/pr2-self-test/default.nix
diff --git a/kinetic/pr2-simulator/default.nix b/distros/kinetic/pr2-simulator/default.nix
similarity index 100%
rename from kinetic/pr2-simulator/default.nix
rename to distros/kinetic/pr2-simulator/default.nix
diff --git a/kinetic/pr2-teleop-general/default.nix b/distros/kinetic/pr2-teleop-general/default.nix
similarity index 100%
rename from kinetic/pr2-teleop-general/default.nix
rename to distros/kinetic/pr2-teleop-general/default.nix
diff --git a/kinetic/pr2-teleop/default.nix b/distros/kinetic/pr2-teleop/default.nix
similarity index 100%
rename from kinetic/pr2-teleop/default.nix
rename to distros/kinetic/pr2-teleop/default.nix
diff --git a/kinetic/pr2-tilt-laser-interface/default.nix b/distros/kinetic/pr2-tilt-laser-interface/default.nix
similarity index 100%
rename from kinetic/pr2-tilt-laser-interface/default.nix
rename to distros/kinetic/pr2-tilt-laser-interface/default.nix
diff --git a/kinetic/pr2-tuck-arms-action/default.nix b/distros/kinetic/pr2-tuck-arms-action/default.nix
similarity index 100%
rename from kinetic/pr2-tuck-arms-action/default.nix
rename to distros/kinetic/pr2-tuck-arms-action/default.nix
diff --git a/kinetic/pr2-tuckarm/default.nix b/distros/kinetic/pr2-tuckarm/default.nix
similarity index 100%
rename from kinetic/pr2-tuckarm/default.nix
rename to distros/kinetic/pr2-tuckarm/default.nix
diff --git a/kinetic/pr2/default.nix b/distros/kinetic/pr2/default.nix
similarity index 100%
rename from kinetic/pr2/default.nix
rename to distros/kinetic/pr2/default.nix
diff --git a/kinetic/pr2eus-moveit/default.nix b/distros/kinetic/pr2eus-moveit/default.nix
similarity index 100%
rename from kinetic/pr2eus-moveit/default.nix
rename to distros/kinetic/pr2eus-moveit/default.nix
diff --git a/kinetic/pr2eus-tutorials/default.nix b/distros/kinetic/pr2eus-tutorials/default.nix
similarity index 100%
rename from kinetic/pr2eus-tutorials/default.nix
rename to distros/kinetic/pr2eus-tutorials/default.nix
diff --git a/kinetic/pr2eus/default.nix b/distros/kinetic/pr2eus/default.nix
similarity index 100%
rename from kinetic/pr2eus/default.nix
rename to distros/kinetic/pr2eus/default.nix
diff --git a/kinetic/prbt-gazebo/default.nix b/distros/kinetic/prbt-gazebo/default.nix
similarity index 100%
rename from kinetic/prbt-gazebo/default.nix
rename to distros/kinetic/prbt-gazebo/default.nix
diff --git a/kinetic/prbt-grippers/default.nix b/distros/kinetic/prbt-grippers/default.nix
similarity index 100%
rename from kinetic/prbt-grippers/default.nix
rename to distros/kinetic/prbt-grippers/default.nix
diff --git a/kinetic/prbt-hardware-support/default.nix b/distros/kinetic/prbt-hardware-support/default.nix
similarity index 100%
rename from kinetic/prbt-hardware-support/default.nix
rename to distros/kinetic/prbt-hardware-support/default.nix
diff --git a/kinetic/prbt-ikfast-manipulator-plugin/default.nix b/distros/kinetic/prbt-ikfast-manipulator-plugin/default.nix
similarity index 100%
rename from kinetic/prbt-ikfast-manipulator-plugin/default.nix
rename to distros/kinetic/prbt-ikfast-manipulator-plugin/default.nix
diff --git a/kinetic/prbt-moveit-config/default.nix b/distros/kinetic/prbt-moveit-config/default.nix
similarity index 100%
rename from kinetic/prbt-moveit-config/default.nix
rename to distros/kinetic/prbt-moveit-config/default.nix
diff --git a/kinetic/prbt-pg70-support/default.nix b/distros/kinetic/prbt-pg70-support/default.nix
similarity index 100%
rename from kinetic/prbt-pg70-support/default.nix
rename to distros/kinetic/prbt-pg70-support/default.nix
diff --git a/kinetic/prbt-support/default.nix b/distros/kinetic/prbt-support/default.nix
similarity index 100%
rename from kinetic/prbt-support/default.nix
rename to distros/kinetic/prbt-support/default.nix
diff --git a/kinetic/prosilica-camera/default.nix b/distros/kinetic/prosilica-camera/default.nix
similarity index 100%
rename from kinetic/prosilica-camera/default.nix
rename to distros/kinetic/prosilica-camera/default.nix
diff --git a/kinetic/prosilica-gige-sdk/default.nix b/distros/kinetic/prosilica-gige-sdk/default.nix
similarity index 100%
rename from kinetic/prosilica-gige-sdk/default.nix
rename to distros/kinetic/prosilica-gige-sdk/default.nix
diff --git a/kinetic/ps3joy/default.nix b/distros/kinetic/ps3joy/default.nix
similarity index 100%
rename from kinetic/ps3joy/default.nix
rename to distros/kinetic/ps3joy/default.nix
diff --git a/kinetic/ps4eye/default.nix b/distros/kinetic/ps4eye/default.nix
similarity index 100%
rename from kinetic/ps4eye/default.nix
rename to distros/kinetic/ps4eye/default.nix
diff --git a/kinetic/puma-motor-driver/default.nix b/distros/kinetic/puma-motor-driver/default.nix
similarity index 100%
rename from kinetic/puma-motor-driver/default.nix
rename to distros/kinetic/puma-motor-driver/default.nix
diff --git a/kinetic/puma-motor-msgs/default.nix b/distros/kinetic/puma-motor-msgs/default.nix
similarity index 100%
rename from kinetic/puma-motor-msgs/default.nix
rename to distros/kinetic/puma-motor-msgs/default.nix
diff --git a/kinetic/px4-msgs/default.nix b/distros/kinetic/px4-msgs/default.nix
similarity index 100%
rename from kinetic/px4-msgs/default.nix
rename to distros/kinetic/px4-msgs/default.nix
diff --git a/kinetic/py-trees-msgs/default.nix b/distros/kinetic/py-trees-msgs/default.nix
similarity index 100%
rename from kinetic/py-trees-msgs/default.nix
rename to distros/kinetic/py-trees-msgs/default.nix
diff --git a/kinetic/py-trees-ros/default.nix b/distros/kinetic/py-trees-ros/default.nix
similarity index 100%
rename from kinetic/py-trees-ros/default.nix
rename to distros/kinetic/py-trees-ros/default.nix
diff --git a/kinetic/py-trees/default.nix b/distros/kinetic/py-trees/default.nix
similarity index 100%
rename from kinetic/py-trees/default.nix
rename to distros/kinetic/py-trees/default.nix
diff --git a/kinetic/pybind11-catkin/default.nix b/distros/kinetic/pybind11-catkin/default.nix
similarity index 100%
rename from kinetic/pybind11-catkin/default.nix
rename to distros/kinetic/pybind11-catkin/default.nix
diff --git a/kinetic/pyclearsilver/default.nix b/distros/kinetic/pyclearsilver/default.nix
similarity index 100%
rename from kinetic/pyclearsilver/default.nix
rename to distros/kinetic/pyclearsilver/default.nix
diff --git a/kinetic/pyros-common/default.nix b/distros/kinetic/pyros-common/default.nix
similarity index 100%
rename from kinetic/pyros-common/default.nix
rename to distros/kinetic/pyros-common/default.nix
diff --git a/kinetic/pyros-config/default.nix b/distros/kinetic/pyros-config/default.nix
similarity index 100%
rename from kinetic/pyros-config/default.nix
rename to distros/kinetic/pyros-config/default.nix
diff --git a/kinetic/pyros-interfaces-ros/default.nix b/distros/kinetic/pyros-interfaces-ros/default.nix
similarity index 100%
rename from kinetic/pyros-interfaces-ros/default.nix
rename to distros/kinetic/pyros-interfaces-ros/default.nix
diff --git a/kinetic/pyros-test/default.nix b/distros/kinetic/pyros-test/default.nix
similarity index 100%
rename from kinetic/pyros-test/default.nix
rename to distros/kinetic/pyros-test/default.nix
diff --git a/kinetic/pyros-utils/default.nix b/distros/kinetic/pyros-utils/default.nix
similarity index 100%
rename from kinetic/pyros-utils/default.nix
rename to distros/kinetic/pyros-utils/default.nix
diff --git a/kinetic/pyros/default.nix b/distros/kinetic/pyros/default.nix
similarity index 100%
rename from kinetic/pyros/default.nix
rename to distros/kinetic/pyros/default.nix
diff --git a/kinetic/python-ftputil/default.nix b/distros/kinetic/python-ftputil/default.nix
similarity index 100%
rename from kinetic/python-ftputil/default.nix
rename to distros/kinetic/python-ftputil/default.nix
diff --git a/kinetic/python-orocos-kdl/default.nix b/distros/kinetic/python-orocos-kdl/default.nix
similarity index 100%
rename from kinetic/python-orocos-kdl/default.nix
rename to distros/kinetic/python-orocos-kdl/default.nix
diff --git a/kinetic/python-qt-binding/default.nix b/distros/kinetic/python-qt-binding/default.nix
similarity index 100%
rename from kinetic/python-qt-binding/default.nix
rename to distros/kinetic/python-qt-binding/default.nix
diff --git a/kinetic/pyzmp/default.nix b/distros/kinetic/pyzmp/default.nix
similarity index 100%
rename from kinetic/pyzmp/default.nix
rename to distros/kinetic/pyzmp/default.nix
diff --git a/kinetic/qb-chain-control/default.nix b/distros/kinetic/qb-chain-control/default.nix
similarity index 100%
rename from kinetic/qb-chain-control/default.nix
rename to distros/kinetic/qb-chain-control/default.nix
diff --git a/kinetic/qb-chain-controllers/default.nix b/distros/kinetic/qb-chain-controllers/default.nix
similarity index 100%
rename from kinetic/qb-chain-controllers/default.nix
rename to distros/kinetic/qb-chain-controllers/default.nix
diff --git a/kinetic/qb-chain-description/default.nix b/distros/kinetic/qb-chain-description/default.nix
similarity index 100%
rename from kinetic/qb-chain-description/default.nix
rename to distros/kinetic/qb-chain-description/default.nix
diff --git a/kinetic/qb-chain/default.nix b/distros/kinetic/qb-chain/default.nix
similarity index 100%
rename from kinetic/qb-chain/default.nix
rename to distros/kinetic/qb-chain/default.nix
diff --git a/kinetic/qb-device-bringup/default.nix b/distros/kinetic/qb-device-bringup/default.nix
similarity index 100%
rename from kinetic/qb-device-bringup/default.nix
rename to distros/kinetic/qb-device-bringup/default.nix
diff --git a/kinetic/qb-device-control/default.nix b/distros/kinetic/qb-device-control/default.nix
similarity index 100%
rename from kinetic/qb-device-control/default.nix
rename to distros/kinetic/qb-device-control/default.nix
diff --git a/kinetic/qb-device-description/default.nix b/distros/kinetic/qb-device-description/default.nix
similarity index 100%
rename from kinetic/qb-device-description/default.nix
rename to distros/kinetic/qb-device-description/default.nix
diff --git a/kinetic/qb-device-driver/default.nix b/distros/kinetic/qb-device-driver/default.nix
similarity index 100%
rename from kinetic/qb-device-driver/default.nix
rename to distros/kinetic/qb-device-driver/default.nix
diff --git a/kinetic/qb-device-hardware-interface/default.nix b/distros/kinetic/qb-device-hardware-interface/default.nix
similarity index 100%
rename from kinetic/qb-device-hardware-interface/default.nix
rename to distros/kinetic/qb-device-hardware-interface/default.nix
diff --git a/kinetic/qb-device-msgs/default.nix b/distros/kinetic/qb-device-msgs/default.nix
similarity index 100%
rename from kinetic/qb-device-msgs/default.nix
rename to distros/kinetic/qb-device-msgs/default.nix
diff --git a/kinetic/qb-device-srvs/default.nix b/distros/kinetic/qb-device-srvs/default.nix
similarity index 100%
rename from kinetic/qb-device-srvs/default.nix
rename to distros/kinetic/qb-device-srvs/default.nix
diff --git a/kinetic/qb-device-utils/default.nix b/distros/kinetic/qb-device-utils/default.nix
similarity index 100%
rename from kinetic/qb-device-utils/default.nix
rename to distros/kinetic/qb-device-utils/default.nix
diff --git a/kinetic/qb-device/default.nix b/distros/kinetic/qb-device/default.nix
similarity index 100%
rename from kinetic/qb-device/default.nix
rename to distros/kinetic/qb-device/default.nix
diff --git a/kinetic/qb-hand-control/default.nix b/distros/kinetic/qb-hand-control/default.nix
similarity index 100%
rename from kinetic/qb-hand-control/default.nix
rename to distros/kinetic/qb-hand-control/default.nix
diff --git a/kinetic/qb-hand-description/default.nix b/distros/kinetic/qb-hand-description/default.nix
similarity index 100%
rename from kinetic/qb-hand-description/default.nix
rename to distros/kinetic/qb-hand-description/default.nix
diff --git a/kinetic/qb-hand-hardware-interface/default.nix b/distros/kinetic/qb-hand-hardware-interface/default.nix
similarity index 100%
rename from kinetic/qb-hand-hardware-interface/default.nix
rename to distros/kinetic/qb-hand-hardware-interface/default.nix
diff --git a/kinetic/qb-hand/default.nix b/distros/kinetic/qb-hand/default.nix
similarity index 100%
rename from kinetic/qb-hand/default.nix
rename to distros/kinetic/qb-hand/default.nix
diff --git a/kinetic/qb-move-control/default.nix b/distros/kinetic/qb-move-control/default.nix
similarity index 100%
rename from kinetic/qb-move-control/default.nix
rename to distros/kinetic/qb-move-control/default.nix
diff --git a/kinetic/qb-move-description/default.nix b/distros/kinetic/qb-move-description/default.nix
similarity index 100%
rename from kinetic/qb-move-description/default.nix
rename to distros/kinetic/qb-move-description/default.nix
diff --git a/kinetic/qb-move-hardware-interface/default.nix b/distros/kinetic/qb-move-hardware-interface/default.nix
similarity index 100%
rename from kinetic/qb-move-hardware-interface/default.nix
rename to distros/kinetic/qb-move-hardware-interface/default.nix
diff --git a/kinetic/qb-move/default.nix b/distros/kinetic/qb-move/default.nix
similarity index 100%
rename from kinetic/qb-move/default.nix
rename to distros/kinetic/qb-move/default.nix
diff --git a/kinetic/qt-build/default.nix b/distros/kinetic/qt-build/default.nix
similarity index 100%
rename from kinetic/qt-build/default.nix
rename to distros/kinetic/qt-build/default.nix
diff --git a/kinetic/qt-create/default.nix b/distros/kinetic/qt-create/default.nix
similarity index 100%
rename from kinetic/qt-create/default.nix
rename to distros/kinetic/qt-create/default.nix
diff --git a/kinetic/qt-dotgraph/default.nix b/distros/kinetic/qt-dotgraph/default.nix
similarity index 100%
rename from kinetic/qt-dotgraph/default.nix
rename to distros/kinetic/qt-dotgraph/default.nix
diff --git a/kinetic/qt-gui-app/default.nix b/distros/kinetic/qt-gui-app/default.nix
similarity index 100%
rename from kinetic/qt-gui-app/default.nix
rename to distros/kinetic/qt-gui-app/default.nix
diff --git a/kinetic/qt-gui-core/default.nix b/distros/kinetic/qt-gui-core/default.nix
similarity index 100%
rename from kinetic/qt-gui-core/default.nix
rename to distros/kinetic/qt-gui-core/default.nix
diff --git a/kinetic/qt-gui-cpp/default.nix b/distros/kinetic/qt-gui-cpp/default.nix
similarity index 100%
rename from kinetic/qt-gui-cpp/default.nix
rename to distros/kinetic/qt-gui-cpp/default.nix
diff --git a/kinetic/qt-gui-py-common/default.nix b/distros/kinetic/qt-gui-py-common/default.nix
similarity index 100%
rename from kinetic/qt-gui-py-common/default.nix
rename to distros/kinetic/qt-gui-py-common/default.nix
diff --git a/kinetic/qt-gui/default.nix b/distros/kinetic/qt-gui/default.nix
similarity index 100%
rename from kinetic/qt-gui/default.nix
rename to distros/kinetic/qt-gui/default.nix
diff --git a/kinetic/qt-qmake/default.nix b/distros/kinetic/qt-qmake/default.nix
similarity index 100%
rename from kinetic/qt-qmake/default.nix
rename to distros/kinetic/qt-qmake/default.nix
diff --git a/kinetic/qt-ros/default.nix b/distros/kinetic/qt-ros/default.nix
similarity index 100%
rename from kinetic/qt-ros/default.nix
rename to distros/kinetic/qt-ros/default.nix
diff --git a/kinetic/qt-tutorials/default.nix b/distros/kinetic/qt-tutorials/default.nix
similarity index 100%
rename from kinetic/qt-tutorials/default.nix
rename to distros/kinetic/qt-tutorials/default.nix
diff --git a/kinetic/quaternion-operation/default.nix b/distros/kinetic/quaternion-operation/default.nix
similarity index 100%
rename from kinetic/quaternion-operation/default.nix
rename to distros/kinetic/quaternion-operation/default.nix
diff --git a/kinetic/qwt-dependency/default.nix b/distros/kinetic/qwt-dependency/default.nix
similarity index 100%
rename from kinetic/qwt-dependency/default.nix
rename to distros/kinetic/qwt-dependency/default.nix
diff --git a/kinetic/radar-msgs/default.nix b/distros/kinetic/radar-msgs/default.nix
similarity index 100%
rename from kinetic/radar-msgs/default.nix
rename to distros/kinetic/radar-msgs/default.nix
diff --git a/kinetic/radar-omnipresense/default.nix b/distros/kinetic/radar-omnipresense/default.nix
similarity index 100%
rename from kinetic/radar-omnipresense/default.nix
rename to distros/kinetic/radar-omnipresense/default.nix
diff --git a/kinetic/radar-pa-msgs/default.nix b/distros/kinetic/radar-pa-msgs/default.nix
similarity index 100%
rename from kinetic/radar-pa-msgs/default.nix
rename to distros/kinetic/radar-pa-msgs/default.nix
diff --git a/kinetic/radar-pa/default.nix b/distros/kinetic/radar-pa/default.nix
similarity index 100%
rename from kinetic/radar-pa/default.nix
rename to distros/kinetic/radar-pa/default.nix
diff --git a/kinetic/rail-manipulation-msgs/default.nix b/distros/kinetic/rail-manipulation-msgs/default.nix
similarity index 100%
rename from kinetic/rail-manipulation-msgs/default.nix
rename to distros/kinetic/rail-manipulation-msgs/default.nix
diff --git a/kinetic/rail-segmentation/default.nix b/distros/kinetic/rail-segmentation/default.nix
similarity index 100%
rename from kinetic/rail-segmentation/default.nix
rename to distros/kinetic/rail-segmentation/default.nix
diff --git a/kinetic/random-numbers/default.nix b/distros/kinetic/random-numbers/default.nix
similarity index 100%
rename from kinetic/random-numbers/default.nix
rename to distros/kinetic/random-numbers/default.nix
diff --git a/kinetic/range-sensor-layer/default.nix b/distros/kinetic/range-sensor-layer/default.nix
similarity index 100%
rename from kinetic/range-sensor-layer/default.nix
rename to distros/kinetic/range-sensor-layer/default.nix
diff --git a/kinetic/raspi-temperature/default.nix b/distros/kinetic/raspi-temperature/default.nix
similarity index 100%
rename from kinetic/raspi-temperature/default.nix
rename to distros/kinetic/raspi-temperature/default.nix
diff --git a/kinetic/raspigibbon-bringup/default.nix b/distros/kinetic/raspigibbon-bringup/default.nix
similarity index 100%
rename from kinetic/raspigibbon-bringup/default.nix
rename to distros/kinetic/raspigibbon-bringup/default.nix
diff --git a/kinetic/raspigibbon-control/default.nix b/distros/kinetic/raspigibbon-control/default.nix
similarity index 100%
rename from kinetic/raspigibbon-control/default.nix
rename to distros/kinetic/raspigibbon-control/default.nix
diff --git a/kinetic/raspigibbon-description/default.nix b/distros/kinetic/raspigibbon-description/default.nix
similarity index 100%
rename from kinetic/raspigibbon-description/default.nix
rename to distros/kinetic/raspigibbon-description/default.nix
diff --git a/kinetic/raspigibbon-gazebo/default.nix b/distros/kinetic/raspigibbon-gazebo/default.nix
similarity index 100%
rename from kinetic/raspigibbon-gazebo/default.nix
rename to distros/kinetic/raspigibbon-gazebo/default.nix
diff --git a/kinetic/raspigibbon-msgs/default.nix b/distros/kinetic/raspigibbon-msgs/default.nix
similarity index 100%
rename from kinetic/raspigibbon-msgs/default.nix
rename to distros/kinetic/raspigibbon-msgs/default.nix
diff --git a/kinetic/raspigibbon-ros/default.nix b/distros/kinetic/raspigibbon-ros/default.nix
similarity index 100%
rename from kinetic/raspigibbon-ros/default.nix
rename to distros/kinetic/raspigibbon-ros/default.nix
diff --git a/kinetic/raspigibbon-sim/default.nix b/distros/kinetic/raspigibbon-sim/default.nix
similarity index 100%
rename from kinetic/raspigibbon-sim/default.nix
rename to distros/kinetic/raspigibbon-sim/default.nix
diff --git a/kinetic/raw-description/default.nix b/distros/kinetic/raw-description/default.nix
similarity index 100%
rename from kinetic/raw-description/default.nix
rename to distros/kinetic/raw-description/default.nix
diff --git a/kinetic/razor-imu-9dof/default.nix b/distros/kinetic/razor-imu-9dof/default.nix
similarity index 100%
rename from kinetic/razor-imu-9dof/default.nix
rename to distros/kinetic/razor-imu-9dof/default.nix
diff --git a/kinetic/rb1-base-2dnav/default.nix b/distros/kinetic/rb1-base-2dnav/default.nix
similarity index 100%
rename from kinetic/rb1-base-2dnav/default.nix
rename to distros/kinetic/rb1-base-2dnav/default.nix
diff --git a/kinetic/rb1-base-common/default.nix b/distros/kinetic/rb1-base-common/default.nix
similarity index 100%
rename from kinetic/rb1-base-common/default.nix
rename to distros/kinetic/rb1-base-common/default.nix
diff --git a/kinetic/rb1-base-control/default.nix b/distros/kinetic/rb1-base-control/default.nix
similarity index 100%
rename from kinetic/rb1-base-control/default.nix
rename to distros/kinetic/rb1-base-control/default.nix
diff --git a/kinetic/rb1-base-description/default.nix b/distros/kinetic/rb1-base-description/default.nix
similarity index 100%
rename from kinetic/rb1-base-description/default.nix
rename to distros/kinetic/rb1-base-description/default.nix
diff --git a/kinetic/rb1-base-gazebo/default.nix b/distros/kinetic/rb1-base-gazebo/default.nix
similarity index 100%
rename from kinetic/rb1-base-gazebo/default.nix
rename to distros/kinetic/rb1-base-gazebo/default.nix
diff --git a/kinetic/rb1-base-pad/default.nix b/distros/kinetic/rb1-base-pad/default.nix
similarity index 100%
rename from kinetic/rb1-base-pad/default.nix
rename to distros/kinetic/rb1-base-pad/default.nix
diff --git a/kinetic/rb1-base-purepursuit/default.nix b/distros/kinetic/rb1-base-purepursuit/default.nix
similarity index 100%
rename from kinetic/rb1-base-purepursuit/default.nix
rename to distros/kinetic/rb1-base-purepursuit/default.nix
diff --git a/kinetic/rb1-base-sim/default.nix b/distros/kinetic/rb1-base-sim/default.nix
similarity index 100%
rename from kinetic/rb1-base-sim/default.nix
rename to distros/kinetic/rb1-base-sim/default.nix
diff --git a/kinetic/rbcar-common/default.nix b/distros/kinetic/rbcar-common/default.nix
similarity index 100%
rename from kinetic/rbcar-common/default.nix
rename to distros/kinetic/rbcar-common/default.nix
diff --git a/kinetic/rbcar-control/default.nix b/distros/kinetic/rbcar-control/default.nix
similarity index 100%
rename from kinetic/rbcar-control/default.nix
rename to distros/kinetic/rbcar-control/default.nix
diff --git a/kinetic/rbcar-description/default.nix b/distros/kinetic/rbcar-description/default.nix
similarity index 100%
rename from kinetic/rbcar-description/default.nix
rename to distros/kinetic/rbcar-description/default.nix
diff --git a/kinetic/rbcar-gazebo/default.nix b/distros/kinetic/rbcar-gazebo/default.nix
similarity index 100%
rename from kinetic/rbcar-gazebo/default.nix
rename to distros/kinetic/rbcar-gazebo/default.nix
diff --git a/kinetic/rbcar-joystick/default.nix b/distros/kinetic/rbcar-joystick/default.nix
similarity index 100%
rename from kinetic/rbcar-joystick/default.nix
rename to distros/kinetic/rbcar-joystick/default.nix
diff --git a/kinetic/rbcar-pad/default.nix b/distros/kinetic/rbcar-pad/default.nix
similarity index 100%
rename from kinetic/rbcar-pad/default.nix
rename to distros/kinetic/rbcar-pad/default.nix
diff --git a/kinetic/rbcar-robot-control/default.nix b/distros/kinetic/rbcar-robot-control/default.nix
similarity index 100%
rename from kinetic/rbcar-robot-control/default.nix
rename to distros/kinetic/rbcar-robot-control/default.nix
diff --git a/kinetic/rbcar-sim-bringup/default.nix b/distros/kinetic/rbcar-sim-bringup/default.nix
similarity index 100%
rename from kinetic/rbcar-sim-bringup/default.nix
rename to distros/kinetic/rbcar-sim-bringup/default.nix
diff --git a/kinetic/rbcar-sim/default.nix b/distros/kinetic/rbcar-sim/default.nix
similarity index 100%
rename from kinetic/rbcar-sim/default.nix
rename to distros/kinetic/rbcar-sim/default.nix
diff --git a/kinetic/rc-cloud-accumulator/default.nix b/distros/kinetic/rc-cloud-accumulator/default.nix
similarity index 100%
rename from kinetic/rc-cloud-accumulator/default.nix
rename to distros/kinetic/rc-cloud-accumulator/default.nix
diff --git a/kinetic/rc-common-msgs/default.nix b/distros/kinetic/rc-common-msgs/default.nix
similarity index 100%
rename from kinetic/rc-common-msgs/default.nix
rename to distros/kinetic/rc-common-msgs/default.nix
diff --git a/kinetic/rc-dynamics-api/default.nix b/distros/kinetic/rc-dynamics-api/default.nix
similarity index 100%
rename from kinetic/rc-dynamics-api/default.nix
rename to distros/kinetic/rc-dynamics-api/default.nix
diff --git a/kinetic/rc-genicam-api/default.nix b/distros/kinetic/rc-genicam-api/default.nix
similarity index 100%
rename from kinetic/rc-genicam-api/default.nix
rename to distros/kinetic/rc-genicam-api/default.nix
diff --git a/kinetic/rc-hand-eye-calibration-client/default.nix b/distros/kinetic/rc-hand-eye-calibration-client/default.nix
similarity index 100%
rename from kinetic/rc-hand-eye-calibration-client/default.nix
rename to distros/kinetic/rc-hand-eye-calibration-client/default.nix
diff --git a/kinetic/rc-pick-client/default.nix b/distros/kinetic/rc-pick-client/default.nix
similarity index 100%
rename from kinetic/rc-pick-client/default.nix
rename to distros/kinetic/rc-pick-client/default.nix
diff --git a/kinetic/rc-roi-manager-gui/default.nix b/distros/kinetic/rc-roi-manager-gui/default.nix
similarity index 100%
rename from kinetic/rc-roi-manager-gui/default.nix
rename to distros/kinetic/rc-roi-manager-gui/default.nix
diff --git a/kinetic/rc-tagdetect-client/default.nix b/distros/kinetic/rc-tagdetect-client/default.nix
similarity index 100%
rename from kinetic/rc-tagdetect-client/default.nix
rename to distros/kinetic/rc-tagdetect-client/default.nix
diff --git a/kinetic/rc-visard-description/default.nix b/distros/kinetic/rc-visard-description/default.nix
similarity index 100%
rename from kinetic/rc-visard-description/default.nix
rename to distros/kinetic/rc-visard-description/default.nix
diff --git a/kinetic/rc-visard-driver/default.nix b/distros/kinetic/rc-visard-driver/default.nix
similarity index 100%
rename from kinetic/rc-visard-driver/default.nix
rename to distros/kinetic/rc-visard-driver/default.nix
diff --git a/kinetic/rc-visard/default.nix b/distros/kinetic/rc-visard/default.nix
similarity index 100%
rename from kinetic/rc-visard/default.nix
rename to distros/kinetic/rc-visard/default.nix
diff --git a/kinetic/rcdiscover/default.nix b/distros/kinetic/rcdiscover/default.nix
similarity index 100%
rename from kinetic/rcdiscover/default.nix
rename to distros/kinetic/rcdiscover/default.nix
diff --git a/kinetic/rdl-benchmark/default.nix b/distros/kinetic/rdl-benchmark/default.nix
similarity index 100%
rename from kinetic/rdl-benchmark/default.nix
rename to distros/kinetic/rdl-benchmark/default.nix
diff --git a/kinetic/rdl-cmake/default.nix b/distros/kinetic/rdl-cmake/default.nix
similarity index 100%
rename from kinetic/rdl-cmake/default.nix
rename to distros/kinetic/rdl-cmake/default.nix
diff --git a/kinetic/rdl-dynamics/default.nix b/distros/kinetic/rdl-dynamics/default.nix
similarity index 100%
rename from kinetic/rdl-dynamics/default.nix
rename to distros/kinetic/rdl-dynamics/default.nix
diff --git a/kinetic/rdl-msgs/default.nix b/distros/kinetic/rdl-msgs/default.nix
similarity index 100%
rename from kinetic/rdl-msgs/default.nix
rename to distros/kinetic/rdl-msgs/default.nix
diff --git a/kinetic/rdl-ros-tools/default.nix b/distros/kinetic/rdl-ros-tools/default.nix
similarity index 100%
rename from kinetic/rdl-ros-tools/default.nix
rename to distros/kinetic/rdl-ros-tools/default.nix
diff --git a/kinetic/rdl-urdfreader/default.nix b/distros/kinetic/rdl-urdfreader/default.nix
similarity index 100%
rename from kinetic/rdl-urdfreader/default.nix
rename to distros/kinetic/rdl-urdfreader/default.nix
diff --git a/kinetic/rdl/default.nix b/distros/kinetic/rdl/default.nix
similarity index 100%
rename from kinetic/rdl/default.nix
rename to distros/kinetic/rdl/default.nix
diff --git a/kinetic/realsense-camera/default.nix b/distros/kinetic/realsense-camera/default.nix
similarity index 100%
rename from kinetic/realsense-camera/default.nix
rename to distros/kinetic/realsense-camera/default.nix
diff --git a/kinetic/realsense2-camera/default.nix b/distros/kinetic/realsense2-camera/default.nix
similarity index 100%
rename from kinetic/realsense2-camera/default.nix
rename to distros/kinetic/realsense2-camera/default.nix
diff --git a/kinetic/realsense2-description/default.nix b/distros/kinetic/realsense2-description/default.nix
similarity index 100%
rename from kinetic/realsense2-description/default.nix
rename to distros/kinetic/realsense2-description/default.nix
diff --git a/kinetic/realtime-tools/default.nix b/distros/kinetic/realtime-tools/default.nix
similarity index 100%
rename from kinetic/realtime-tools/default.nix
rename to distros/kinetic/realtime-tools/default.nix
diff --git a/kinetic/recordit/default.nix b/distros/kinetic/recordit/default.nix
similarity index 100%
rename from kinetic/recordit/default.nix
rename to distros/kinetic/recordit/default.nix
diff --git a/kinetic/resized-image-transport/default.nix b/distros/kinetic/resized-image-transport/default.nix
similarity index 100%
rename from kinetic/resized-image-transport/default.nix
rename to distros/kinetic/resized-image-transport/default.nix
diff --git a/kinetic/resource-retriever/default.nix b/distros/kinetic/resource-retriever/default.nix
similarity index 100%
rename from kinetic/resource-retriever/default.nix
rename to distros/kinetic/resource-retriever/default.nix
diff --git a/kinetic/rexrov2-control/default.nix b/distros/kinetic/rexrov2-control/default.nix
similarity index 100%
rename from kinetic/rexrov2-control/default.nix
rename to distros/kinetic/rexrov2-control/default.nix
diff --git a/kinetic/rexrov2-description/default.nix b/distros/kinetic/rexrov2-description/default.nix
similarity index 100%
rename from kinetic/rexrov2-description/default.nix
rename to distros/kinetic/rexrov2-description/default.nix
diff --git a/kinetic/rexrov2-gazebo/default.nix b/distros/kinetic/rexrov2-gazebo/default.nix
similarity index 100%
rename from kinetic/rexrov2-gazebo/default.nix
rename to distros/kinetic/rexrov2-gazebo/default.nix
diff --git a/kinetic/rfsm/default.nix b/distros/kinetic/rfsm/default.nix
similarity index 100%
rename from kinetic/rfsm/default.nix
rename to distros/kinetic/rfsm/default.nix
diff --git a/kinetic/rgbd-launch/default.nix b/distros/kinetic/rgbd-launch/default.nix
similarity index 100%
rename from kinetic/rgbd-launch/default.nix
rename to distros/kinetic/rgbd-launch/default.nix
diff --git a/kinetic/rh-p12-rn-base-module-msgs/default.nix b/distros/kinetic/rh-p12-rn-base-module-msgs/default.nix
similarity index 100%
rename from kinetic/rh-p12-rn-base-module-msgs/default.nix
rename to distros/kinetic/rh-p12-rn-base-module-msgs/default.nix
diff --git a/kinetic/rh-p12-rn-base-module/default.nix b/distros/kinetic/rh-p12-rn-base-module/default.nix
similarity index 100%
rename from kinetic/rh-p12-rn-base-module/default.nix
rename to distros/kinetic/rh-p12-rn-base-module/default.nix
diff --git a/kinetic/rh-p12-rn-description/default.nix b/distros/kinetic/rh-p12-rn-description/default.nix
similarity index 100%
rename from kinetic/rh-p12-rn-description/default.nix
rename to distros/kinetic/rh-p12-rn-description/default.nix
diff --git a/kinetic/rh-p12-rn-gazebo/default.nix b/distros/kinetic/rh-p12-rn-gazebo/default.nix
similarity index 100%
rename from kinetic/rh-p12-rn-gazebo/default.nix
rename to distros/kinetic/rh-p12-rn-gazebo/default.nix
diff --git a/kinetic/rh-p12-rn-gui/default.nix b/distros/kinetic/rh-p12-rn-gui/default.nix
similarity index 100%
rename from kinetic/rh-p12-rn-gui/default.nix
rename to distros/kinetic/rh-p12-rn-gui/default.nix
diff --git a/kinetic/rh-p12-rn-manager/default.nix b/distros/kinetic/rh-p12-rn-manager/default.nix
similarity index 100%
rename from kinetic/rh-p12-rn-manager/default.nix
rename to distros/kinetic/rh-p12-rn-manager/default.nix
diff --git a/kinetic/rh-p12-rn/default.nix b/distros/kinetic/rh-p12-rn/default.nix
similarity index 100%
rename from kinetic/rh-p12-rn/default.nix
rename to distros/kinetic/rh-p12-rn/default.nix
diff --git a/kinetic/ridgeback-control/default.nix b/distros/kinetic/ridgeback-control/default.nix
similarity index 100%
rename from kinetic/ridgeback-control/default.nix
rename to distros/kinetic/ridgeback-control/default.nix
diff --git a/kinetic/ridgeback-description/default.nix b/distros/kinetic/ridgeback-description/default.nix
similarity index 100%
rename from kinetic/ridgeback-description/default.nix
rename to distros/kinetic/ridgeback-description/default.nix
diff --git a/kinetic/ridgeback-desktop/default.nix b/distros/kinetic/ridgeback-desktop/default.nix
similarity index 100%
rename from kinetic/ridgeback-desktop/default.nix
rename to distros/kinetic/ridgeback-desktop/default.nix
diff --git a/kinetic/ridgeback-gazebo-plugins/default.nix b/distros/kinetic/ridgeback-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/ridgeback-gazebo-plugins/default.nix
rename to distros/kinetic/ridgeback-gazebo-plugins/default.nix
diff --git a/kinetic/ridgeback-gazebo/default.nix b/distros/kinetic/ridgeback-gazebo/default.nix
similarity index 100%
rename from kinetic/ridgeback-gazebo/default.nix
rename to distros/kinetic/ridgeback-gazebo/default.nix
diff --git a/kinetic/ridgeback-msgs/default.nix b/distros/kinetic/ridgeback-msgs/default.nix
similarity index 100%
rename from kinetic/ridgeback-msgs/default.nix
rename to distros/kinetic/ridgeback-msgs/default.nix
diff --git a/kinetic/ridgeback-navigation/default.nix b/distros/kinetic/ridgeback-navigation/default.nix
similarity index 100%
rename from kinetic/ridgeback-navigation/default.nix
rename to distros/kinetic/ridgeback-navigation/default.nix
diff --git a/kinetic/ridgeback-simulator/default.nix b/distros/kinetic/ridgeback-simulator/default.nix
similarity index 100%
rename from kinetic/ridgeback-simulator/default.nix
rename to distros/kinetic/ridgeback-simulator/default.nix
diff --git a/kinetic/ridgeback-viz/default.nix b/distros/kinetic/ridgeback-viz/default.nix
similarity index 100%
rename from kinetic/ridgeback-viz/default.nix
rename to distros/kinetic/ridgeback-viz/default.nix
diff --git a/kinetic/robot-activity-msgs/default.nix b/distros/kinetic/robot-activity-msgs/default.nix
similarity index 100%
rename from kinetic/robot-activity-msgs/default.nix
rename to distros/kinetic/robot-activity-msgs/default.nix
diff --git a/kinetic/robot-activity-tutorials/default.nix b/distros/kinetic/robot-activity-tutorials/default.nix
similarity index 100%
rename from kinetic/robot-activity-tutorials/default.nix
rename to distros/kinetic/robot-activity-tutorials/default.nix
diff --git a/kinetic/robot-activity/default.nix b/distros/kinetic/robot-activity/default.nix
similarity index 100%
rename from kinetic/robot-activity/default.nix
rename to distros/kinetic/robot-activity/default.nix
diff --git a/kinetic/robot-calibration-msgs/default.nix b/distros/kinetic/robot-calibration-msgs/default.nix
similarity index 100%
rename from kinetic/robot-calibration-msgs/default.nix
rename to distros/kinetic/robot-calibration-msgs/default.nix
diff --git a/kinetic/robot-calibration/default.nix b/distros/kinetic/robot-calibration/default.nix
similarity index 100%
rename from kinetic/robot-calibration/default.nix
rename to distros/kinetic/robot-calibration/default.nix
diff --git a/kinetic/robot-controllers-interface/default.nix b/distros/kinetic/robot-controllers-interface/default.nix
similarity index 100%
rename from kinetic/robot-controllers-interface/default.nix
rename to distros/kinetic/robot-controllers-interface/default.nix
diff --git a/kinetic/robot-controllers-msgs/default.nix b/distros/kinetic/robot-controllers-msgs/default.nix
similarity index 100%
rename from kinetic/robot-controllers-msgs/default.nix
rename to distros/kinetic/robot-controllers-msgs/default.nix
diff --git a/kinetic/robot-controllers/default.nix b/distros/kinetic/robot-controllers/default.nix
similarity index 100%
rename from kinetic/robot-controllers/default.nix
rename to distros/kinetic/robot-controllers/default.nix
diff --git a/kinetic/robot-localization/default.nix b/distros/kinetic/robot-localization/default.nix
similarity index 100%
rename from kinetic/robot-localization/default.nix
rename to distros/kinetic/robot-localization/default.nix
diff --git a/kinetic/robot-mechanism-controllers/default.nix b/distros/kinetic/robot-mechanism-controllers/default.nix
similarity index 100%
rename from kinetic/robot-mechanism-controllers/default.nix
rename to distros/kinetic/robot-mechanism-controllers/default.nix
diff --git a/kinetic/robot-model/default.nix b/distros/kinetic/robot-model/default.nix
similarity index 100%
rename from kinetic/robot-model/default.nix
rename to distros/kinetic/robot-model/default.nix
diff --git a/kinetic/robot-navigation/default.nix b/distros/kinetic/robot-navigation/default.nix
similarity index 100%
rename from kinetic/robot-navigation/default.nix
rename to distros/kinetic/robot-navigation/default.nix
diff --git a/kinetic/robot-pose-ekf/default.nix b/distros/kinetic/robot-pose-ekf/default.nix
similarity index 100%
rename from kinetic/robot-pose-ekf/default.nix
rename to distros/kinetic/robot-pose-ekf/default.nix
diff --git a/kinetic/robot-pose-publisher/default.nix b/distros/kinetic/robot-pose-publisher/default.nix
similarity index 100%
rename from kinetic/robot-pose-publisher/default.nix
rename to distros/kinetic/robot-pose-publisher/default.nix
diff --git a/kinetic/robot-recorder/default.nix b/distros/kinetic/robot-recorder/default.nix
similarity index 100%
rename from kinetic/robot-recorder/default.nix
rename to distros/kinetic/robot-recorder/default.nix
diff --git a/kinetic/robot-self-filter/default.nix b/distros/kinetic/robot-self-filter/default.nix
similarity index 100%
rename from kinetic/robot-self-filter/default.nix
rename to distros/kinetic/robot-self-filter/default.nix
diff --git a/kinetic/robot-setup-tf-tutorial/default.nix b/distros/kinetic/robot-setup-tf-tutorial/default.nix
similarity index 100%
rename from kinetic/robot-setup-tf-tutorial/default.nix
rename to distros/kinetic/robot-setup-tf-tutorial/default.nix
diff --git a/kinetic/robot-state-publisher/default.nix b/distros/kinetic/robot-state-publisher/default.nix
similarity index 100%
rename from kinetic/robot-state-publisher/default.nix
rename to distros/kinetic/robot-state-publisher/default.nix
diff --git a/kinetic/robot-statemachine/default.nix b/distros/kinetic/robot-statemachine/default.nix
similarity index 100%
rename from kinetic/robot-statemachine/default.nix
rename to distros/kinetic/robot-statemachine/default.nix
diff --git a/kinetic/robot-systemd/default.nix b/distros/kinetic/robot-systemd/default.nix
similarity index 100%
rename from kinetic/robot-systemd/default.nix
rename to distros/kinetic/robot-systemd/default.nix
diff --git a/kinetic/robot-upstart/default.nix b/distros/kinetic/robot-upstart/default.nix
similarity index 100%
rename from kinetic/robot-upstart/default.nix
rename to distros/kinetic/robot-upstart/default.nix
diff --git a/kinetic/robot/default.nix b/distros/kinetic/robot/default.nix
similarity index 100%
rename from kinetic/robot/default.nix
rename to distros/kinetic/robot/default.nix
diff --git a/kinetic/robotis-controller-msgs/default.nix b/distros/kinetic/robotis-controller-msgs/default.nix
similarity index 100%
rename from kinetic/robotis-controller-msgs/default.nix
rename to distros/kinetic/robotis-controller-msgs/default.nix
diff --git a/kinetic/robotis-controller/default.nix b/distros/kinetic/robotis-controller/default.nix
similarity index 100%
rename from kinetic/robotis-controller/default.nix
rename to distros/kinetic/robotis-controller/default.nix
diff --git a/kinetic/robotis-device/default.nix b/distros/kinetic/robotis-device/default.nix
similarity index 100%
rename from kinetic/robotis-device/default.nix
rename to distros/kinetic/robotis-device/default.nix
diff --git a/kinetic/robotis-framework-common/default.nix b/distros/kinetic/robotis-framework-common/default.nix
similarity index 100%
rename from kinetic/robotis-framework-common/default.nix
rename to distros/kinetic/robotis-framework-common/default.nix
diff --git a/kinetic/robotis-framework/default.nix b/distros/kinetic/robotis-framework/default.nix
similarity index 100%
rename from kinetic/robotis-framework/default.nix
rename to distros/kinetic/robotis-framework/default.nix
diff --git a/kinetic/robotis-manipulator/default.nix b/distros/kinetic/robotis-manipulator/default.nix
similarity index 100%
rename from kinetic/robotis-manipulator/default.nix
rename to distros/kinetic/robotis-manipulator/default.nix
diff --git a/kinetic/robotis-math/default.nix b/distros/kinetic/robotis-math/default.nix
similarity index 100%
rename from kinetic/robotis-math/default.nix
rename to distros/kinetic/robotis-math/default.nix
diff --git a/kinetic/robotis-op3-common/default.nix b/distros/kinetic/robotis-op3-common/default.nix
similarity index 100%
rename from kinetic/robotis-op3-common/default.nix
rename to distros/kinetic/robotis-op3-common/default.nix
diff --git a/kinetic/robotis-op3-demo/default.nix b/distros/kinetic/robotis-op3-demo/default.nix
similarity index 100%
rename from kinetic/robotis-op3-demo/default.nix
rename to distros/kinetic/robotis-op3-demo/default.nix
diff --git a/kinetic/robotis-op3-msgs/default.nix b/distros/kinetic/robotis-op3-msgs/default.nix
similarity index 100%
rename from kinetic/robotis-op3-msgs/default.nix
rename to distros/kinetic/robotis-op3-msgs/default.nix
diff --git a/kinetic/robotis-op3-tools/default.nix b/distros/kinetic/robotis-op3-tools/default.nix
similarity index 100%
rename from kinetic/robotis-op3-tools/default.nix
rename to distros/kinetic/robotis-op3-tools/default.nix
diff --git a/kinetic/robotis-op3/default.nix b/distros/kinetic/robotis-op3/default.nix
similarity index 100%
rename from kinetic/robotis-op3/default.nix
rename to distros/kinetic/robotis-op3/default.nix
diff --git a/kinetic/robotis-utility/default.nix b/distros/kinetic/robotis-utility/default.nix
similarity index 100%
rename from kinetic/robotis-utility/default.nix
rename to distros/kinetic/robotis-utility/default.nix
diff --git a/kinetic/robotnik-msgs/default.nix b/distros/kinetic/robotnik-msgs/default.nix
similarity index 100%
rename from kinetic/robotnik-msgs/default.nix
rename to distros/kinetic/robotnik-msgs/default.nix
diff --git a/kinetic/robotnik-sensors/default.nix b/distros/kinetic/robotnik-sensors/default.nix
similarity index 100%
rename from kinetic/robotnik-sensors/default.nix
rename to distros/kinetic/robotnik-sensors/default.nix
diff --git a/kinetic/roch-base/default.nix b/distros/kinetic/roch-base/default.nix
similarity index 100%
rename from kinetic/roch-base/default.nix
rename to distros/kinetic/roch-base/default.nix
diff --git a/kinetic/roch-bringup/default.nix b/distros/kinetic/roch-bringup/default.nix
similarity index 100%
rename from kinetic/roch-bringup/default.nix
rename to distros/kinetic/roch-bringup/default.nix
diff --git a/kinetic/roch-capabilities/default.nix b/distros/kinetic/roch-capabilities/default.nix
similarity index 100%
rename from kinetic/roch-capabilities/default.nix
rename to distros/kinetic/roch-capabilities/default.nix
diff --git a/kinetic/roch-control/default.nix b/distros/kinetic/roch-control/default.nix
similarity index 100%
rename from kinetic/roch-control/default.nix
rename to distros/kinetic/roch-control/default.nix
diff --git a/kinetic/roch-description/default.nix b/distros/kinetic/roch-description/default.nix
similarity index 100%
rename from kinetic/roch-description/default.nix
rename to distros/kinetic/roch-description/default.nix
diff --git a/kinetic/roch-follower/default.nix b/distros/kinetic/roch-follower/default.nix
similarity index 100%
rename from kinetic/roch-follower/default.nix
rename to distros/kinetic/roch-follower/default.nix
diff --git a/kinetic/roch-ftdi/default.nix b/distros/kinetic/roch-ftdi/default.nix
similarity index 100%
rename from kinetic/roch-ftdi/default.nix
rename to distros/kinetic/roch-ftdi/default.nix
diff --git a/kinetic/roch-gazebo/default.nix b/distros/kinetic/roch-gazebo/default.nix
similarity index 100%
rename from kinetic/roch-gazebo/default.nix
rename to distros/kinetic/roch-gazebo/default.nix
diff --git a/kinetic/roch-msgs/default.nix b/distros/kinetic/roch-msgs/default.nix
similarity index 100%
rename from kinetic/roch-msgs/default.nix
rename to distros/kinetic/roch-msgs/default.nix
diff --git a/kinetic/roch-navigation/default.nix b/distros/kinetic/roch-navigation/default.nix
similarity index 100%
rename from kinetic/roch-navigation/default.nix
rename to distros/kinetic/roch-navigation/default.nix
diff --git a/kinetic/roch-rapps/default.nix b/distros/kinetic/roch-rapps/default.nix
similarity index 100%
rename from kinetic/roch-rapps/default.nix
rename to distros/kinetic/roch-rapps/default.nix
diff --git a/kinetic/roch-robot/default.nix b/distros/kinetic/roch-robot/default.nix
similarity index 100%
rename from kinetic/roch-robot/default.nix
rename to distros/kinetic/roch-robot/default.nix
diff --git a/kinetic/roch-safety-controller/default.nix b/distros/kinetic/roch-safety-controller/default.nix
similarity index 100%
rename from kinetic/roch-safety-controller/default.nix
rename to distros/kinetic/roch-safety-controller/default.nix
diff --git a/kinetic/roch-sensorpc/default.nix b/distros/kinetic/roch-sensorpc/default.nix
similarity index 100%
rename from kinetic/roch-sensorpc/default.nix
rename to distros/kinetic/roch-sensorpc/default.nix
diff --git a/kinetic/roch-simulator/default.nix b/distros/kinetic/roch-simulator/default.nix
similarity index 100%
rename from kinetic/roch-simulator/default.nix
rename to distros/kinetic/roch-simulator/default.nix
diff --git a/kinetic/roch-teleop/default.nix b/distros/kinetic/roch-teleop/default.nix
similarity index 100%
rename from kinetic/roch-teleop/default.nix
rename to distros/kinetic/roch-teleop/default.nix
diff --git a/kinetic/roch-viz/default.nix b/distros/kinetic/roch-viz/default.nix
similarity index 100%
rename from kinetic/roch-viz/default.nix
rename to distros/kinetic/roch-viz/default.nix
diff --git a/kinetic/roch/default.nix b/distros/kinetic/roch/default.nix
similarity index 100%
rename from kinetic/roch/default.nix
rename to distros/kinetic/roch/default.nix
diff --git a/kinetic/rocon-app-manager-msgs/default.nix b/distros/kinetic/rocon-app-manager-msgs/default.nix
similarity index 100%
rename from kinetic/rocon-app-manager-msgs/default.nix
rename to distros/kinetic/rocon-app-manager-msgs/default.nix
diff --git a/kinetic/rocon-app-manager/default.nix b/distros/kinetic/rocon-app-manager/default.nix
similarity index 100%
rename from kinetic/rocon-app-manager/default.nix
rename to distros/kinetic/rocon-app-manager/default.nix
diff --git a/kinetic/rocon-app-platform/default.nix b/distros/kinetic/rocon-app-platform/default.nix
similarity index 100%
rename from kinetic/rocon-app-platform/default.nix
rename to distros/kinetic/rocon-app-platform/default.nix
diff --git a/kinetic/rocon-app-utilities/default.nix b/distros/kinetic/rocon-app-utilities/default.nix
similarity index 100%
rename from kinetic/rocon-app-utilities/default.nix
rename to distros/kinetic/rocon-app-utilities/default.nix
diff --git a/kinetic/rocon-apps/default.nix b/distros/kinetic/rocon-apps/default.nix
similarity index 100%
rename from kinetic/rocon-apps/default.nix
rename to distros/kinetic/rocon-apps/default.nix
diff --git a/kinetic/rocon-bubble-icons/default.nix b/distros/kinetic/rocon-bubble-icons/default.nix
similarity index 100%
rename from kinetic/rocon-bubble-icons/default.nix
rename to distros/kinetic/rocon-bubble-icons/default.nix
diff --git a/kinetic/rocon-console/default.nix b/distros/kinetic/rocon-console/default.nix
similarity index 100%
rename from kinetic/rocon-console/default.nix
rename to distros/kinetic/rocon-console/default.nix
diff --git a/kinetic/rocon-device-msgs/default.nix b/distros/kinetic/rocon-device-msgs/default.nix
similarity index 100%
rename from kinetic/rocon-device-msgs/default.nix
rename to distros/kinetic/rocon-device-msgs/default.nix
diff --git a/kinetic/rocon-ebnf/default.nix b/distros/kinetic/rocon-ebnf/default.nix
similarity index 100%
rename from kinetic/rocon-ebnf/default.nix
rename to distros/kinetic/rocon-ebnf/default.nix
diff --git a/kinetic/rocon-gateway-tests/default.nix b/distros/kinetic/rocon-gateway-tests/default.nix
similarity index 100%
rename from kinetic/rocon-gateway-tests/default.nix
rename to distros/kinetic/rocon-gateway-tests/default.nix
diff --git a/kinetic/rocon-gateway-utils/default.nix b/distros/kinetic/rocon-gateway-utils/default.nix
similarity index 100%
rename from kinetic/rocon-gateway-utils/default.nix
rename to distros/kinetic/rocon-gateway-utils/default.nix
diff --git a/kinetic/rocon-gateway/default.nix b/distros/kinetic/rocon-gateway/default.nix
similarity index 100%
rename from kinetic/rocon-gateway/default.nix
rename to distros/kinetic/rocon-gateway/default.nix
diff --git a/kinetic/rocon-hub-client/default.nix b/distros/kinetic/rocon-hub-client/default.nix
similarity index 100%
rename from kinetic/rocon-hub-client/default.nix
rename to distros/kinetic/rocon-hub-client/default.nix
diff --git a/kinetic/rocon-hub/default.nix b/distros/kinetic/rocon-hub/default.nix
similarity index 100%
rename from kinetic/rocon-hub/default.nix
rename to distros/kinetic/rocon-hub/default.nix
diff --git a/kinetic/rocon-icons/default.nix b/distros/kinetic/rocon-icons/default.nix
similarity index 100%
rename from kinetic/rocon-icons/default.nix
rename to distros/kinetic/rocon-icons/default.nix
diff --git a/kinetic/rocon-interaction-msgs/default.nix b/distros/kinetic/rocon-interaction-msgs/default.nix
similarity index 100%
rename from kinetic/rocon-interaction-msgs/default.nix
rename to distros/kinetic/rocon-interaction-msgs/default.nix
diff --git a/kinetic/rocon-interactions/default.nix b/distros/kinetic/rocon-interactions/default.nix
similarity index 100%
rename from kinetic/rocon-interactions/default.nix
rename to distros/kinetic/rocon-interactions/default.nix
diff --git a/kinetic/rocon-launch/default.nix b/distros/kinetic/rocon-launch/default.nix
similarity index 100%
rename from kinetic/rocon-launch/default.nix
rename to distros/kinetic/rocon-launch/default.nix
diff --git a/kinetic/rocon-master-info/default.nix b/distros/kinetic/rocon-master-info/default.nix
similarity index 100%
rename from kinetic/rocon-master-info/default.nix
rename to distros/kinetic/rocon-master-info/default.nix
diff --git a/kinetic/rocon-msgs/default.nix b/distros/kinetic/rocon-msgs/default.nix
similarity index 100%
rename from kinetic/rocon-msgs/default.nix
rename to distros/kinetic/rocon-msgs/default.nix
diff --git a/kinetic/rocon-multimaster/default.nix b/distros/kinetic/rocon-multimaster/default.nix
similarity index 100%
rename from kinetic/rocon-multimaster/default.nix
rename to distros/kinetic/rocon-multimaster/default.nix
diff --git a/kinetic/rocon-python-comms/default.nix b/distros/kinetic/rocon-python-comms/default.nix
similarity index 100%
rename from kinetic/rocon-python-comms/default.nix
rename to distros/kinetic/rocon-python-comms/default.nix
diff --git a/kinetic/rocon-python-redis/default.nix b/distros/kinetic/rocon-python-redis/default.nix
similarity index 100%
rename from kinetic/rocon-python-redis/default.nix
rename to distros/kinetic/rocon-python-redis/default.nix
diff --git a/kinetic/rocon-python-utils/default.nix b/distros/kinetic/rocon-python-utils/default.nix
similarity index 100%
rename from kinetic/rocon-python-utils/default.nix
rename to distros/kinetic/rocon-python-utils/default.nix
diff --git a/kinetic/rocon-python-wifi/default.nix b/distros/kinetic/rocon-python-wifi/default.nix
similarity index 100%
rename from kinetic/rocon-python-wifi/default.nix
rename to distros/kinetic/rocon-python-wifi/default.nix
diff --git a/kinetic/rocon-semantic-version/default.nix b/distros/kinetic/rocon-semantic-version/default.nix
similarity index 100%
rename from kinetic/rocon-semantic-version/default.nix
rename to distros/kinetic/rocon-semantic-version/default.nix
diff --git a/kinetic/rocon-service-pair-msgs/default.nix b/distros/kinetic/rocon-service-pair-msgs/default.nix
similarity index 100%
rename from kinetic/rocon-service-pair-msgs/default.nix
rename to distros/kinetic/rocon-service-pair-msgs/default.nix
diff --git a/kinetic/rocon-std-msgs/default.nix b/distros/kinetic/rocon-std-msgs/default.nix
similarity index 100%
rename from kinetic/rocon-std-msgs/default.nix
rename to distros/kinetic/rocon-std-msgs/default.nix
diff --git a/kinetic/rocon-test/default.nix b/distros/kinetic/rocon-test/default.nix
similarity index 100%
rename from kinetic/rocon-test/default.nix
rename to distros/kinetic/rocon-test/default.nix
diff --git a/kinetic/rocon-tools/default.nix b/distros/kinetic/rocon-tools/default.nix
similarity index 100%
rename from kinetic/rocon-tools/default.nix
rename to distros/kinetic/rocon-tools/default.nix
diff --git a/kinetic/rocon-tutorial-msgs/default.nix b/distros/kinetic/rocon-tutorial-msgs/default.nix
similarity index 100%
rename from kinetic/rocon-tutorial-msgs/default.nix
rename to distros/kinetic/rocon-tutorial-msgs/default.nix
diff --git a/kinetic/rocon-unreliable-experiments/default.nix b/distros/kinetic/rocon-unreliable-experiments/default.nix
similarity index 100%
rename from kinetic/rocon-unreliable-experiments/default.nix
rename to distros/kinetic/rocon-unreliable-experiments/default.nix
diff --git a/kinetic/rocon-uri/default.nix b/distros/kinetic/rocon-uri/default.nix
similarity index 100%
rename from kinetic/rocon-uri/default.nix
rename to distros/kinetic/rocon-uri/default.nix
diff --git a/kinetic/rodi-robot/default.nix b/distros/kinetic/rodi-robot/default.nix
similarity index 100%
rename from kinetic/rodi-robot/default.nix
rename to distros/kinetic/rodi-robot/default.nix
diff --git a/kinetic/romeo-bringup/default.nix b/distros/kinetic/romeo-bringup/default.nix
similarity index 100%
rename from kinetic/romeo-bringup/default.nix
rename to distros/kinetic/romeo-bringup/default.nix
diff --git a/kinetic/romeo-control/default.nix b/distros/kinetic/romeo-control/default.nix
similarity index 100%
rename from kinetic/romeo-control/default.nix
rename to distros/kinetic/romeo-control/default.nix
diff --git a/kinetic/romeo-description/default.nix b/distros/kinetic/romeo-description/default.nix
similarity index 100%
rename from kinetic/romeo-description/default.nix
rename to distros/kinetic/romeo-description/default.nix
diff --git a/kinetic/romeo-gazebo-plugin/default.nix b/distros/kinetic/romeo-gazebo-plugin/default.nix
similarity index 100%
rename from kinetic/romeo-gazebo-plugin/default.nix
rename to distros/kinetic/romeo-gazebo-plugin/default.nix
diff --git a/kinetic/romeo-moveit-config/default.nix b/distros/kinetic/romeo-moveit-config/default.nix
similarity index 100%
rename from kinetic/romeo-moveit-config/default.nix
rename to distros/kinetic/romeo-moveit-config/default.nix
diff --git a/kinetic/romeo-robot/default.nix b/distros/kinetic/romeo-robot/default.nix
similarity index 100%
rename from kinetic/romeo-robot/default.nix
rename to distros/kinetic/romeo-robot/default.nix
diff --git a/kinetic/romeo-sensors-py/default.nix b/distros/kinetic/romeo-sensors-py/default.nix
similarity index 100%
rename from kinetic/romeo-sensors-py/default.nix
rename to distros/kinetic/romeo-sensors-py/default.nix
diff --git a/kinetic/roomba-stage/default.nix b/distros/kinetic/roomba-stage/default.nix
similarity index 100%
rename from kinetic/roomba-stage/default.nix
rename to distros/kinetic/roomba-stage/default.nix
diff --git a/kinetic/roomblock-bringup/default.nix b/distros/kinetic/roomblock-bringup/default.nix
similarity index 100%
rename from kinetic/roomblock-bringup/default.nix
rename to distros/kinetic/roomblock-bringup/default.nix
diff --git a/kinetic/roomblock-description/default.nix b/distros/kinetic/roomblock-description/default.nix
similarity index 100%
rename from kinetic/roomblock-description/default.nix
rename to distros/kinetic/roomblock-description/default.nix
diff --git a/kinetic/roomblock-mapping/default.nix b/distros/kinetic/roomblock-mapping/default.nix
similarity index 100%
rename from kinetic/roomblock-mapping/default.nix
rename to distros/kinetic/roomblock-mapping/default.nix
diff --git a/kinetic/roomblock-navigation/default.nix b/distros/kinetic/roomblock-navigation/default.nix
similarity index 100%
rename from kinetic/roomblock-navigation/default.nix
rename to distros/kinetic/roomblock-navigation/default.nix
diff --git a/kinetic/roomblock/default.nix b/distros/kinetic/roomblock/default.nix
similarity index 100%
rename from kinetic/roomblock/default.nix
rename to distros/kinetic/roomblock/default.nix
diff --git a/kinetic/ros-base/default.nix b/distros/kinetic/ros-base/default.nix
similarity index 100%
rename from kinetic/ros-base/default.nix
rename to distros/kinetic/ros-base/default.nix
diff --git a/kinetic/ros-canopen/default.nix b/distros/kinetic/ros-canopen/default.nix
similarity index 100%
rename from kinetic/ros-canopen/default.nix
rename to distros/kinetic/ros-canopen/default.nix
diff --git a/kinetic/ros-comm/default.nix b/distros/kinetic/ros-comm/default.nix
similarity index 100%
rename from kinetic/ros-comm/default.nix
rename to distros/kinetic/ros-comm/default.nix
diff --git a/kinetic/ros-control-boilerplate/default.nix b/distros/kinetic/ros-control-boilerplate/default.nix
similarity index 100%
rename from kinetic/ros-control-boilerplate/default.nix
rename to distros/kinetic/ros-control-boilerplate/default.nix
diff --git a/kinetic/ros-control/default.nix b/distros/kinetic/ros-control/default.nix
similarity index 100%
rename from kinetic/ros-control/default.nix
rename to distros/kinetic/ros-control/default.nix
diff --git a/kinetic/ros-controllers/default.nix b/distros/kinetic/ros-controllers/default.nix
similarity index 100%
rename from kinetic/ros-controllers/default.nix
rename to distros/kinetic/ros-controllers/default.nix
diff --git a/kinetic/ros-core/default.nix b/distros/kinetic/ros-core/default.nix
similarity index 100%
rename from kinetic/ros-core/default.nix
rename to distros/kinetic/ros-core/default.nix
diff --git a/kinetic/ros-emacs-utils/default.nix b/distros/kinetic/ros-emacs-utils/default.nix
similarity index 100%
rename from kinetic/ros-emacs-utils/default.nix
rename to distros/kinetic/ros-emacs-utils/default.nix
diff --git a/kinetic/ros-environment/default.nix b/distros/kinetic/ros-environment/default.nix
similarity index 100%
rename from kinetic/ros-environment/default.nix
rename to distros/kinetic/ros-environment/default.nix
diff --git a/kinetic/ros-ethercat-eml/default.nix b/distros/kinetic/ros-ethercat-eml/default.nix
similarity index 100%
rename from kinetic/ros-ethercat-eml/default.nix
rename to distros/kinetic/ros-ethercat-eml/default.nix
diff --git a/kinetic/ros-explorer/default.nix b/distros/kinetic/ros-explorer/default.nix
similarity index 100%
rename from kinetic/ros-explorer/default.nix
rename to distros/kinetic/ros-explorer/default.nix
diff --git a/kinetic/ros-introspection/default.nix b/distros/kinetic/ros-introspection/default.nix
similarity index 100%
rename from kinetic/ros-introspection/default.nix
rename to distros/kinetic/ros-introspection/default.nix
diff --git a/kinetic/ros-madplay-player/default.nix b/distros/kinetic/ros-madplay-player/default.nix
similarity index 100%
rename from kinetic/ros-madplay-player/default.nix
rename to distros/kinetic/ros-madplay-player/default.nix
diff --git a/kinetic/ros-monitoring-msgs/default.nix b/distros/kinetic/ros-monitoring-msgs/default.nix
similarity index 100%
rename from kinetic/ros-monitoring-msgs/default.nix
rename to distros/kinetic/ros-monitoring-msgs/default.nix
diff --git a/kinetic/ros-mpg321-player/default.nix b/distros/kinetic/ros-mpg321-player/default.nix
similarity index 100%
rename from kinetic/ros-mpg321-player/default.nix
rename to distros/kinetic/ros-mpg321-player/default.nix
diff --git a/kinetic/ros-mppt/default.nix b/distros/kinetic/ros-mppt/default.nix
similarity index 100%
rename from kinetic/ros-mppt/default.nix
rename to distros/kinetic/ros-mppt/default.nix
diff --git a/kinetic/ros-mynteye/default.nix b/distros/kinetic/ros-mynteye/default.nix
similarity index 100%
rename from kinetic/ros-mynteye/default.nix
rename to distros/kinetic/ros-mynteye/default.nix
diff --git a/kinetic/ros-numpy/default.nix b/distros/kinetic/ros-numpy/default.nix
similarity index 100%
rename from kinetic/ros-numpy/default.nix
rename to distros/kinetic/ros-numpy/default.nix
diff --git a/kinetic/ros-pytest/default.nix b/distros/kinetic/ros-pytest/default.nix
similarity index 100%
rename from kinetic/ros-pytest/default.nix
rename to distros/kinetic/ros-pytest/default.nix
diff --git a/kinetic/ros-realtime/default.nix b/distros/kinetic/ros-realtime/default.nix
similarity index 100%
rename from kinetic/ros-realtime/default.nix
rename to distros/kinetic/ros-realtime/default.nix
diff --git a/kinetic/ros-reflexxes/default.nix b/distros/kinetic/ros-reflexxes/default.nix
similarity index 100%
rename from kinetic/ros-reflexxes/default.nix
rename to distros/kinetic/ros-reflexxes/default.nix
diff --git a/kinetic/ros-tutorials/default.nix b/distros/kinetic/ros-tutorials/default.nix
similarity index 100%
rename from kinetic/ros-tutorials/default.nix
rename to distros/kinetic/ros-tutorials/default.nix
diff --git a/kinetic/ros-type-introspection/default.nix b/distros/kinetic/ros-type-introspection/default.nix
similarity index 100%
rename from kinetic/ros-type-introspection/default.nix
rename to distros/kinetic/ros-type-introspection/default.nix
diff --git a/kinetic/ros-wild/default.nix b/distros/kinetic/ros-wild/default.nix
similarity index 100%
rename from kinetic/ros-wild/default.nix
rename to distros/kinetic/ros-wild/default.nix
diff --git a/kinetic/ros/default.nix b/distros/kinetic/ros/default.nix
similarity index 100%
rename from kinetic/ros/default.nix
rename to distros/kinetic/ros/default.nix
diff --git a/kinetic/rosapi/default.nix b/distros/kinetic/rosapi/default.nix
similarity index 100%
rename from kinetic/rosapi/default.nix
rename to distros/kinetic/rosapi/default.nix
diff --git a/kinetic/rosatomic/default.nix b/distros/kinetic/rosatomic/default.nix
similarity index 100%
rename from kinetic/rosatomic/default.nix
rename to distros/kinetic/rosatomic/default.nix
diff --git a/kinetic/rosauth/default.nix b/distros/kinetic/rosauth/default.nix
similarity index 100%
rename from kinetic/rosauth/default.nix
rename to distros/kinetic/rosauth/default.nix
diff --git a/kinetic/rosbag-editor/default.nix b/distros/kinetic/rosbag-editor/default.nix
similarity index 100%
rename from kinetic/rosbag-editor/default.nix
rename to distros/kinetic/rosbag-editor/default.nix
diff --git a/kinetic/rosbag-migration-rule/default.nix b/distros/kinetic/rosbag-migration-rule/default.nix
similarity index 100%
rename from kinetic/rosbag-migration-rule/default.nix
rename to distros/kinetic/rosbag-migration-rule/default.nix
diff --git a/kinetic/rosbag-pandas/default.nix b/distros/kinetic/rosbag-pandas/default.nix
similarity index 100%
rename from kinetic/rosbag-pandas/default.nix
rename to distros/kinetic/rosbag-pandas/default.nix
diff --git a/kinetic/rosbag-storage/default.nix b/distros/kinetic/rosbag-storage/default.nix
similarity index 100%
rename from kinetic/rosbag-storage/default.nix
rename to distros/kinetic/rosbag-storage/default.nix
diff --git a/kinetic/rosbag/default.nix b/distros/kinetic/rosbag/default.nix
similarity index 100%
rename from kinetic/rosbag/default.nix
rename to distros/kinetic/rosbag/default.nix
diff --git a/kinetic/rosbaglive/default.nix b/distros/kinetic/rosbaglive/default.nix
similarity index 100%
rename from kinetic/rosbaglive/default.nix
rename to distros/kinetic/rosbaglive/default.nix
diff --git a/kinetic/rosbash-params/default.nix b/distros/kinetic/rosbash-params/default.nix
similarity index 100%
rename from kinetic/rosbash-params/default.nix
rename to distros/kinetic/rosbash-params/default.nix
diff --git a/kinetic/rosbash/default.nix b/distros/kinetic/rosbash/default.nix
similarity index 100%
rename from kinetic/rosbash/default.nix
rename to distros/kinetic/rosbash/default.nix
diff --git a/kinetic/rosboost-cfg/default.nix b/distros/kinetic/rosboost-cfg/default.nix
similarity index 100%
rename from kinetic/rosboost-cfg/default.nix
rename to distros/kinetic/rosboost-cfg/default.nix
diff --git a/kinetic/rosbridge-msgs/default.nix b/distros/kinetic/rosbridge-msgs/default.nix
similarity index 100%
rename from kinetic/rosbridge-msgs/default.nix
rename to distros/kinetic/rosbridge-msgs/default.nix
diff --git a/kinetic/rosbridge-server/default.nix b/distros/kinetic/rosbridge-server/default.nix
similarity index 100%
rename from kinetic/rosbridge-server/default.nix
rename to distros/kinetic/rosbridge-server/default.nix
diff --git a/kinetic/rosbridge-suite/default.nix b/distros/kinetic/rosbridge-suite/default.nix
similarity index 100%
rename from kinetic/rosbridge-suite/default.nix
rename to distros/kinetic/rosbridge-suite/default.nix
diff --git a/kinetic/rosbuild/default.nix b/distros/kinetic/rosbuild/default.nix
similarity index 100%
rename from kinetic/rosbuild/default.nix
rename to distros/kinetic/rosbuild/default.nix
diff --git a/kinetic/rosclean/default.nix b/distros/kinetic/rosclean/default.nix
similarity index 100%
rename from kinetic/rosclean/default.nix
rename to distros/kinetic/rosclean/default.nix
diff --git a/kinetic/roscompile/default.nix b/distros/kinetic/roscompile/default.nix
similarity index 100%
rename from kinetic/roscompile/default.nix
rename to distros/kinetic/roscompile/default.nix
diff --git a/kinetic/rosconsole-bridge/default.nix b/distros/kinetic/rosconsole-bridge/default.nix
similarity index 100%
rename from kinetic/rosconsole-bridge/default.nix
rename to distros/kinetic/rosconsole-bridge/default.nix
diff --git a/kinetic/rosconsole/default.nix b/distros/kinetic/rosconsole/default.nix
similarity index 100%
rename from kinetic/rosconsole/default.nix
rename to distros/kinetic/rosconsole/default.nix
diff --git a/kinetic/roscpp-core/default.nix b/distros/kinetic/roscpp-core/default.nix
similarity index 100%
rename from kinetic/roscpp-core/default.nix
rename to distros/kinetic/roscpp-core/default.nix
diff --git a/kinetic/roscpp-serialization/default.nix b/distros/kinetic/roscpp-serialization/default.nix
similarity index 100%
rename from kinetic/roscpp-serialization/default.nix
rename to distros/kinetic/roscpp-serialization/default.nix
diff --git a/kinetic/roscpp-traits/default.nix b/distros/kinetic/roscpp-traits/default.nix
similarity index 100%
rename from kinetic/roscpp-traits/default.nix
rename to distros/kinetic/roscpp-traits/default.nix
diff --git a/kinetic/roscpp-tutorials/default.nix b/distros/kinetic/roscpp-tutorials/default.nix
similarity index 100%
rename from kinetic/roscpp-tutorials/default.nix
rename to distros/kinetic/roscpp-tutorials/default.nix
diff --git a/kinetic/roscpp/default.nix b/distros/kinetic/roscpp/default.nix
similarity index 100%
rename from kinetic/roscpp/default.nix
rename to distros/kinetic/roscpp/default.nix
diff --git a/kinetic/roscreate/default.nix b/distros/kinetic/roscreate/default.nix
similarity index 100%
rename from kinetic/roscreate/default.nix
rename to distros/kinetic/roscreate/default.nix
diff --git a/kinetic/rosdiagnostic/default.nix b/distros/kinetic/rosdiagnostic/default.nix
similarity index 100%
rename from kinetic/rosdiagnostic/default.nix
rename to distros/kinetic/rosdiagnostic/default.nix
diff --git a/kinetic/rosemacs/default.nix b/distros/kinetic/rosemacs/default.nix
similarity index 100%
rename from kinetic/rosemacs/default.nix
rename to distros/kinetic/rosemacs/default.nix
diff --git a/kinetic/roseus-mongo/default.nix b/distros/kinetic/roseus-mongo/default.nix
similarity index 100%
rename from kinetic/roseus-mongo/default.nix
rename to distros/kinetic/roseus-mongo/default.nix
diff --git a/kinetic/roseus-smach/default.nix b/distros/kinetic/roseus-smach/default.nix
similarity index 100%
rename from kinetic/roseus-smach/default.nix
rename to distros/kinetic/roseus-smach/default.nix
diff --git a/kinetic/roseus-tutorials/default.nix b/distros/kinetic/roseus-tutorials/default.nix
similarity index 100%
rename from kinetic/roseus-tutorials/default.nix
rename to distros/kinetic/roseus-tutorials/default.nix
diff --git a/kinetic/roseus/default.nix b/distros/kinetic/roseus/default.nix
similarity index 100%
rename from kinetic/roseus/default.nix
rename to distros/kinetic/roseus/default.nix
diff --git a/kinetic/rosflight-firmware/default.nix b/distros/kinetic/rosflight-firmware/default.nix
similarity index 100%
rename from kinetic/rosflight-firmware/default.nix
rename to distros/kinetic/rosflight-firmware/default.nix
diff --git a/kinetic/rosflight-msgs/default.nix b/distros/kinetic/rosflight-msgs/default.nix
similarity index 100%
rename from kinetic/rosflight-msgs/default.nix
rename to distros/kinetic/rosflight-msgs/default.nix
diff --git a/kinetic/rosflight-pkgs/default.nix b/distros/kinetic/rosflight-pkgs/default.nix
similarity index 100%
rename from kinetic/rosflight-pkgs/default.nix
rename to distros/kinetic/rosflight-pkgs/default.nix
diff --git a/kinetic/rosflight-sim/default.nix b/distros/kinetic/rosflight-sim/default.nix
similarity index 100%
rename from kinetic/rosflight-sim/default.nix
rename to distros/kinetic/rosflight-sim/default.nix
diff --git a/kinetic/rosflight-utils/default.nix b/distros/kinetic/rosflight-utils/default.nix
similarity index 100%
rename from kinetic/rosflight-utils/default.nix
rename to distros/kinetic/rosflight-utils/default.nix
diff --git a/kinetic/rosflight/default.nix b/distros/kinetic/rosflight/default.nix
similarity index 100%
rename from kinetic/rosflight/default.nix
rename to distros/kinetic/rosflight/default.nix
diff --git a/kinetic/rosfmt/default.nix b/distros/kinetic/rosfmt/default.nix
similarity index 100%
rename from kinetic/rosfmt/default.nix
rename to distros/kinetic/rosfmt/default.nix
diff --git a/kinetic/rosgraph-msgs/default.nix b/distros/kinetic/rosgraph-msgs/default.nix
similarity index 100%
rename from kinetic/rosgraph-msgs/default.nix
rename to distros/kinetic/rosgraph-msgs/default.nix
diff --git a/kinetic/rosgraph/default.nix b/distros/kinetic/rosgraph/default.nix
similarity index 100%
rename from kinetic/rosgraph/default.nix
rename to distros/kinetic/rosgraph/default.nix
diff --git a/kinetic/rosjava-bootstrap/default.nix b/distros/kinetic/rosjava-bootstrap/default.nix
similarity index 100%
rename from kinetic/rosjava-bootstrap/default.nix
rename to distros/kinetic/rosjava-bootstrap/default.nix
diff --git a/kinetic/rosjava-build-tools/default.nix b/distros/kinetic/rosjava-build-tools/default.nix
similarity index 100%
rename from kinetic/rosjava-build-tools/default.nix
rename to distros/kinetic/rosjava-build-tools/default.nix
diff --git a/kinetic/rosjava-core/default.nix b/distros/kinetic/rosjava-core/default.nix
similarity index 100%
rename from kinetic/rosjava-core/default.nix
rename to distros/kinetic/rosjava-core/default.nix
diff --git a/kinetic/rosjava-extras/default.nix b/distros/kinetic/rosjava-extras/default.nix
similarity index 100%
rename from kinetic/rosjava-extras/default.nix
rename to distros/kinetic/rosjava-extras/default.nix
diff --git a/kinetic/rosjava-messages/default.nix b/distros/kinetic/rosjava-messages/default.nix
similarity index 100%
rename from kinetic/rosjava-messages/default.nix
rename to distros/kinetic/rosjava-messages/default.nix
diff --git a/kinetic/rosjava-test-msgs/default.nix b/distros/kinetic/rosjava-test-msgs/default.nix
similarity index 100%
rename from kinetic/rosjava-test-msgs/default.nix
rename to distros/kinetic/rosjava-test-msgs/default.nix
diff --git a/kinetic/rosjava/default.nix b/distros/kinetic/rosjava/default.nix
similarity index 100%
rename from kinetic/rosjava/default.nix
rename to distros/kinetic/rosjava/default.nix
diff --git a/kinetic/rosjson/default.nix b/distros/kinetic/rosjson/default.nix
similarity index 100%
rename from kinetic/rosjson/default.nix
rename to distros/kinetic/rosjson/default.nix
diff --git a/kinetic/roslang/default.nix b/distros/kinetic/roslang/default.nix
similarity index 100%
rename from kinetic/roslang/default.nix
rename to distros/kinetic/roslang/default.nix
diff --git a/kinetic/roslaunch/default.nix b/distros/kinetic/roslaunch/default.nix
similarity index 100%
rename from kinetic/roslaunch/default.nix
rename to distros/kinetic/roslaunch/default.nix
diff --git a/kinetic/roslib/default.nix b/distros/kinetic/roslib/default.nix
similarity index 100%
rename from kinetic/roslib/default.nix
rename to distros/kinetic/roslib/default.nix
diff --git a/kinetic/roslint/default.nix b/distros/kinetic/roslint/default.nix
similarity index 100%
rename from kinetic/roslint/default.nix
rename to distros/kinetic/roslint/default.nix
diff --git a/kinetic/roslisp-common/default.nix b/distros/kinetic/roslisp-common/default.nix
similarity index 100%
rename from kinetic/roslisp-common/default.nix
rename to distros/kinetic/roslisp-common/default.nix
diff --git a/kinetic/roslisp-repl/default.nix b/distros/kinetic/roslisp-repl/default.nix
similarity index 100%
rename from kinetic/roslisp-repl/default.nix
rename to distros/kinetic/roslisp-repl/default.nix
diff --git a/kinetic/roslisp-utilities/default.nix b/distros/kinetic/roslisp-utilities/default.nix
similarity index 100%
rename from kinetic/roslisp-utilities/default.nix
rename to distros/kinetic/roslisp-utilities/default.nix
diff --git a/kinetic/roslisp/default.nix b/distros/kinetic/roslisp/default.nix
similarity index 100%
rename from kinetic/roslisp/default.nix
rename to distros/kinetic/roslisp/default.nix
diff --git a/kinetic/roslz4/default.nix b/distros/kinetic/roslz4/default.nix
similarity index 100%
rename from kinetic/roslz4/default.nix
rename to distros/kinetic/roslz4/default.nix
diff --git a/kinetic/rosmake/default.nix b/distros/kinetic/rosmake/default.nix
similarity index 100%
rename from kinetic/rosmake/default.nix
rename to distros/kinetic/rosmake/default.nix
diff --git a/kinetic/rosmaster/default.nix b/distros/kinetic/rosmaster/default.nix
similarity index 100%
rename from kinetic/rosmaster/default.nix
rename to distros/kinetic/rosmaster/default.nix
diff --git a/kinetic/rosmon-core/default.nix b/distros/kinetic/rosmon-core/default.nix
similarity index 100%
rename from kinetic/rosmon-core/default.nix
rename to distros/kinetic/rosmon-core/default.nix
diff --git a/kinetic/rosmon-msgs/default.nix b/distros/kinetic/rosmon-msgs/default.nix
similarity index 100%
rename from kinetic/rosmon-msgs/default.nix
rename to distros/kinetic/rosmon-msgs/default.nix
diff --git a/kinetic/rosmon/default.nix b/distros/kinetic/rosmon/default.nix
similarity index 100%
rename from kinetic/rosmon/default.nix
rename to distros/kinetic/rosmon/default.nix
diff --git a/kinetic/rosmsg/default.nix b/distros/kinetic/rosmsg/default.nix
similarity index 100%
rename from kinetic/rosmsg/default.nix
rename to distros/kinetic/rosmsg/default.nix
diff --git a/kinetic/rosnode-rtc/default.nix b/distros/kinetic/rosnode-rtc/default.nix
similarity index 100%
rename from kinetic/rosnode-rtc/default.nix
rename to distros/kinetic/rosnode-rtc/default.nix
diff --git a/kinetic/rosnode/default.nix b/distros/kinetic/rosnode/default.nix
similarity index 100%
rename from kinetic/rosnode/default.nix
rename to distros/kinetic/rosnode/default.nix
diff --git a/kinetic/rosout/default.nix b/distros/kinetic/rosout/default.nix
similarity index 100%
rename from kinetic/rosout/default.nix
rename to distros/kinetic/rosout/default.nix
diff --git a/kinetic/rospack/default.nix b/distros/kinetic/rospack/default.nix
similarity index 100%
rename from kinetic/rospack/default.nix
rename to distros/kinetic/rospack/default.nix
diff --git a/kinetic/rosparam-handler/default.nix b/distros/kinetic/rosparam-handler/default.nix
similarity index 100%
rename from kinetic/rosparam-handler/default.nix
rename to distros/kinetic/rosparam-handler/default.nix
diff --git a/kinetic/rosparam-shortcuts/default.nix b/distros/kinetic/rosparam-shortcuts/default.nix
similarity index 100%
rename from kinetic/rosparam-shortcuts/default.nix
rename to distros/kinetic/rosparam-shortcuts/default.nix
diff --git a/kinetic/rosparam/default.nix b/distros/kinetic/rosparam/default.nix
similarity index 100%
rename from kinetic/rosparam/default.nix
rename to distros/kinetic/rosparam/default.nix
diff --git a/kinetic/rospatlite/default.nix b/distros/kinetic/rospatlite/default.nix
similarity index 100%
rename from kinetic/rospatlite/default.nix
rename to distros/kinetic/rospatlite/default.nix
diff --git a/kinetic/rosping/default.nix b/distros/kinetic/rosping/default.nix
similarity index 100%
rename from kinetic/rosping/default.nix
rename to distros/kinetic/rosping/default.nix
diff --git a/kinetic/rospy-message-converter/default.nix b/distros/kinetic/rospy-message-converter/default.nix
similarity index 100%
rename from kinetic/rospy-message-converter/default.nix
rename to distros/kinetic/rospy-message-converter/default.nix
diff --git a/kinetic/rospy-tutorials/default.nix b/distros/kinetic/rospy-tutorials/default.nix
similarity index 100%
rename from kinetic/rospy-tutorials/default.nix
rename to distros/kinetic/rospy-tutorials/default.nix
diff --git a/kinetic/rospy-wrapper/default.nix b/distros/kinetic/rospy-wrapper/default.nix
similarity index 100%
rename from kinetic/rospy-wrapper/default.nix
rename to distros/kinetic/rospy-wrapper/default.nix
diff --git a/kinetic/rospy/default.nix b/distros/kinetic/rospy/default.nix
similarity index 100%
rename from kinetic/rospy/default.nix
rename to distros/kinetic/rospy/default.nix
diff --git a/kinetic/rosrt/default.nix b/distros/kinetic/rosrt/default.nix
similarity index 100%
rename from kinetic/rosrt/default.nix
rename to distros/kinetic/rosrt/default.nix
diff --git a/kinetic/rosserial-arduino/default.nix b/distros/kinetic/rosserial-arduino/default.nix
similarity index 100%
rename from kinetic/rosserial-arduino/default.nix
rename to distros/kinetic/rosserial-arduino/default.nix
diff --git a/kinetic/rosserial-client/default.nix b/distros/kinetic/rosserial-client/default.nix
similarity index 100%
rename from kinetic/rosserial-client/default.nix
rename to distros/kinetic/rosserial-client/default.nix
diff --git a/kinetic/rosserial-embeddedlinux/default.nix b/distros/kinetic/rosserial-embeddedlinux/default.nix
similarity index 100%
rename from kinetic/rosserial-embeddedlinux/default.nix
rename to distros/kinetic/rosserial-embeddedlinux/default.nix
diff --git a/kinetic/rosserial-mbed/default.nix b/distros/kinetic/rosserial-mbed/default.nix
similarity index 100%
rename from kinetic/rosserial-mbed/default.nix
rename to distros/kinetic/rosserial-mbed/default.nix
diff --git a/kinetic/rosserial-msgs/default.nix b/distros/kinetic/rosserial-msgs/default.nix
similarity index 100%
rename from kinetic/rosserial-msgs/default.nix
rename to distros/kinetic/rosserial-msgs/default.nix
diff --git a/kinetic/rosserial-python/default.nix b/distros/kinetic/rosserial-python/default.nix
similarity index 100%
rename from kinetic/rosserial-python/default.nix
rename to distros/kinetic/rosserial-python/default.nix
diff --git a/kinetic/rosserial-server/default.nix b/distros/kinetic/rosserial-server/default.nix
similarity index 100%
rename from kinetic/rosserial-server/default.nix
rename to distros/kinetic/rosserial-server/default.nix
diff --git a/kinetic/rosserial-tivac/default.nix b/distros/kinetic/rosserial-tivac/default.nix
similarity index 100%
rename from kinetic/rosserial-tivac/default.nix
rename to distros/kinetic/rosserial-tivac/default.nix
diff --git a/kinetic/rosserial-windows/default.nix b/distros/kinetic/rosserial-windows/default.nix
similarity index 100%
rename from kinetic/rosserial-windows/default.nix
rename to distros/kinetic/rosserial-windows/default.nix
diff --git a/kinetic/rosserial-xbee/default.nix b/distros/kinetic/rosserial-xbee/default.nix
similarity index 100%
rename from kinetic/rosserial-xbee/default.nix
rename to distros/kinetic/rosserial-xbee/default.nix
diff --git a/kinetic/rosserial/default.nix b/distros/kinetic/rosserial/default.nix
similarity index 100%
rename from kinetic/rosserial/default.nix
rename to distros/kinetic/rosserial/default.nix
diff --git a/kinetic/rosservice/default.nix b/distros/kinetic/rosservice/default.nix
similarity index 100%
rename from kinetic/rosservice/default.nix
rename to distros/kinetic/rosservice/default.nix
diff --git a/kinetic/rostate-machine/default.nix b/distros/kinetic/rostate-machine/default.nix
similarity index 100%
rename from kinetic/rostate-machine/default.nix
rename to distros/kinetic/rostate-machine/default.nix
diff --git a/kinetic/rostest/default.nix b/distros/kinetic/rostest/default.nix
similarity index 100%
rename from kinetic/rostest/default.nix
rename to distros/kinetic/rostest/default.nix
diff --git a/kinetic/rostful/default.nix b/distros/kinetic/rostful/default.nix
similarity index 100%
rename from kinetic/rostful/default.nix
rename to distros/kinetic/rostful/default.nix
diff --git a/kinetic/rostime/default.nix b/distros/kinetic/rostime/default.nix
similarity index 100%
rename from kinetic/rostime/default.nix
rename to distros/kinetic/rostime/default.nix
diff --git a/kinetic/rostopic/default.nix b/distros/kinetic/rostopic/default.nix
similarity index 100%
rename from kinetic/rostopic/default.nix
rename to distros/kinetic/rostopic/default.nix
diff --git a/kinetic/rostune/default.nix b/distros/kinetic/rostune/default.nix
similarity index 100%
rename from kinetic/rostune/default.nix
rename to distros/kinetic/rostune/default.nix
diff --git a/kinetic/rosunit/default.nix b/distros/kinetic/rosunit/default.nix
similarity index 100%
rename from kinetic/rosunit/default.nix
rename to distros/kinetic/rosunit/default.nix
diff --git a/kinetic/rosweb/default.nix b/distros/kinetic/rosweb/default.nix
similarity index 100%
rename from kinetic/rosweb/default.nix
rename to distros/kinetic/rosweb/default.nix
diff --git a/kinetic/roswtf/default.nix b/distros/kinetic/roswtf/default.nix
similarity index 100%
rename from kinetic/roswtf/default.nix
rename to distros/kinetic/roswtf/default.nix
diff --git a/kinetic/roswww/default.nix b/distros/kinetic/roswww/default.nix
similarity index 100%
rename from kinetic/roswww/default.nix
rename to distros/kinetic/roswww/default.nix
diff --git a/kinetic/rotate-recovery/default.nix b/distros/kinetic/rotate-recovery/default.nix
similarity index 100%
rename from kinetic/rotate-recovery/default.nix
rename to distros/kinetic/rotate-recovery/default.nix
diff --git a/kinetic/route-network/default.nix b/distros/kinetic/route-network/default.nix
similarity index 100%
rename from kinetic/route-network/default.nix
rename to distros/kinetic/route-network/default.nix
diff --git a/kinetic/rplidar-ros/default.nix b/distros/kinetic/rplidar-ros/default.nix
similarity index 100%
rename from kinetic/rplidar-ros/default.nix
rename to distros/kinetic/rplidar-ros/default.nix
diff --git a/kinetic/rqt-action/default.nix b/distros/kinetic/rqt-action/default.nix
similarity index 100%
rename from kinetic/rqt-action/default.nix
rename to distros/kinetic/rqt-action/default.nix
diff --git a/kinetic/rqt-bag-plugins/default.nix b/distros/kinetic/rqt-bag-plugins/default.nix
similarity index 100%
rename from kinetic/rqt-bag-plugins/default.nix
rename to distros/kinetic/rqt-bag-plugins/default.nix
diff --git a/kinetic/rqt-bag/default.nix b/distros/kinetic/rqt-bag/default.nix
similarity index 100%
rename from kinetic/rqt-bag/default.nix
rename to distros/kinetic/rqt-bag/default.nix
diff --git a/kinetic/rqt-bhand/default.nix b/distros/kinetic/rqt-bhand/default.nix
similarity index 100%
rename from kinetic/rqt-bhand/default.nix
rename to distros/kinetic/rqt-bhand/default.nix
diff --git a/kinetic/rqt-common-plugins/default.nix b/distros/kinetic/rqt-common-plugins/default.nix
similarity index 100%
rename from kinetic/rqt-common-plugins/default.nix
rename to distros/kinetic/rqt-common-plugins/default.nix
diff --git a/kinetic/rqt-console/default.nix b/distros/kinetic/rqt-console/default.nix
similarity index 100%
rename from kinetic/rqt-console/default.nix
rename to distros/kinetic/rqt-console/default.nix
diff --git a/kinetic/rqt-controller-manager/default.nix b/distros/kinetic/rqt-controller-manager/default.nix
similarity index 100%
rename from kinetic/rqt-controller-manager/default.nix
rename to distros/kinetic/rqt-controller-manager/default.nix
diff --git a/kinetic/rqt-dep/default.nix b/distros/kinetic/rqt-dep/default.nix
similarity index 100%
rename from kinetic/rqt-dep/default.nix
rename to distros/kinetic/rqt-dep/default.nix
diff --git a/kinetic/rqt-drone-teleop/default.nix b/distros/kinetic/rqt-drone-teleop/default.nix
similarity index 100%
rename from kinetic/rqt-drone-teleop/default.nix
rename to distros/kinetic/rqt-drone-teleop/default.nix
diff --git a/kinetic/rqt-ez-publisher/default.nix b/distros/kinetic/rqt-ez-publisher/default.nix
similarity index 100%
rename from kinetic/rqt-ez-publisher/default.nix
rename to distros/kinetic/rqt-ez-publisher/default.nix
diff --git a/kinetic/rqt-gauges/default.nix b/distros/kinetic/rqt-gauges/default.nix
similarity index 100%
rename from kinetic/rqt-gauges/default.nix
rename to distros/kinetic/rqt-gauges/default.nix
diff --git a/kinetic/rqt-graph/default.nix b/distros/kinetic/rqt-graph/default.nix
similarity index 100%
rename from kinetic/rqt-graph/default.nix
rename to distros/kinetic/rqt-graph/default.nix
diff --git a/kinetic/rqt-ground-robot-teleop/default.nix b/distros/kinetic/rqt-ground-robot-teleop/default.nix
similarity index 100%
rename from kinetic/rqt-ground-robot-teleop/default.nix
rename to distros/kinetic/rqt-ground-robot-teleop/default.nix
diff --git a/kinetic/rqt-gui-cpp/default.nix b/distros/kinetic/rqt-gui-cpp/default.nix
similarity index 100%
rename from kinetic/rqt-gui-cpp/default.nix
rename to distros/kinetic/rqt-gui-cpp/default.nix
diff --git a/kinetic/rqt-gui-py/default.nix b/distros/kinetic/rqt-gui-py/default.nix
similarity index 100%
rename from kinetic/rqt-gui-py/default.nix
rename to distros/kinetic/rqt-gui-py/default.nix
diff --git a/kinetic/rqt-gui/default.nix b/distros/kinetic/rqt-gui/default.nix
similarity index 100%
rename from kinetic/rqt-gui/default.nix
rename to distros/kinetic/rqt-gui/default.nix
diff --git a/kinetic/rqt-image-view/default.nix b/distros/kinetic/rqt-image-view/default.nix
similarity index 100%
rename from kinetic/rqt-image-view/default.nix
rename to distros/kinetic/rqt-image-view/default.nix
diff --git a/kinetic/rqt-joint-trajectory-controller/default.nix b/distros/kinetic/rqt-joint-trajectory-controller/default.nix
similarity index 100%
rename from kinetic/rqt-joint-trajectory-controller/default.nix
rename to distros/kinetic/rqt-joint-trajectory-controller/default.nix
diff --git a/kinetic/rqt-joint-trajectory-plot/default.nix b/distros/kinetic/rqt-joint-trajectory-plot/default.nix
similarity index 100%
rename from kinetic/rqt-joint-trajectory-plot/default.nix
rename to distros/kinetic/rqt-joint-trajectory-plot/default.nix
diff --git a/kinetic/rqt-launch/default.nix b/distros/kinetic/rqt-launch/default.nix
similarity index 100%
rename from kinetic/rqt-launch/default.nix
rename to distros/kinetic/rqt-launch/default.nix
diff --git a/kinetic/rqt-launchtree/default.nix b/distros/kinetic/rqt-launchtree/default.nix
similarity index 100%
rename from kinetic/rqt-launchtree/default.nix
rename to distros/kinetic/rqt-launchtree/default.nix
diff --git a/kinetic/rqt-logger-level/default.nix b/distros/kinetic/rqt-logger-level/default.nix
similarity index 100%
rename from kinetic/rqt-logger-level/default.nix
rename to distros/kinetic/rqt-logger-level/default.nix
diff --git a/kinetic/rqt-moveit/default.nix b/distros/kinetic/rqt-moveit/default.nix
similarity index 100%
rename from kinetic/rqt-moveit/default.nix
rename to distros/kinetic/rqt-moveit/default.nix
diff --git a/kinetic/rqt-msg/default.nix b/distros/kinetic/rqt-msg/default.nix
similarity index 100%
rename from kinetic/rqt-msg/default.nix
rename to distros/kinetic/rqt-msg/default.nix
diff --git a/kinetic/rqt-multiplot/default.nix b/distros/kinetic/rqt-multiplot/default.nix
similarity index 100%
rename from kinetic/rqt-multiplot/default.nix
rename to distros/kinetic/rqt-multiplot/default.nix
diff --git a/kinetic/rqt-nav-view/default.nix b/distros/kinetic/rqt-nav-view/default.nix
similarity index 100%
rename from kinetic/rqt-nav-view/default.nix
rename to distros/kinetic/rqt-nav-view/default.nix
diff --git a/kinetic/rqt-plot/default.nix b/distros/kinetic/rqt-plot/default.nix
similarity index 100%
rename from kinetic/rqt-plot/default.nix
rename to distros/kinetic/rqt-plot/default.nix
diff --git a/kinetic/rqt-pose-view/default.nix b/distros/kinetic/rqt-pose-view/default.nix
similarity index 100%
rename from kinetic/rqt-pose-view/default.nix
rename to distros/kinetic/rqt-pose-view/default.nix
diff --git a/kinetic/rqt-pr2-dashboard/default.nix b/distros/kinetic/rqt-pr2-dashboard/default.nix
similarity index 100%
rename from kinetic/rqt-pr2-dashboard/default.nix
rename to distros/kinetic/rqt-pr2-dashboard/default.nix
diff --git a/kinetic/rqt-publisher/default.nix b/distros/kinetic/rqt-publisher/default.nix
similarity index 100%
rename from kinetic/rqt-publisher/default.nix
rename to distros/kinetic/rqt-publisher/default.nix
diff --git a/kinetic/rqt-py-common/default.nix b/distros/kinetic/rqt-py-common/default.nix
similarity index 100%
rename from kinetic/rqt-py-common/default.nix
rename to distros/kinetic/rqt-py-common/default.nix
diff --git a/kinetic/rqt-py-console/default.nix b/distros/kinetic/rqt-py-console/default.nix
similarity index 100%
rename from kinetic/rqt-py-console/default.nix
rename to distros/kinetic/rqt-py-console/default.nix
diff --git a/kinetic/rqt-py-trees/default.nix b/distros/kinetic/rqt-py-trees/default.nix
similarity index 100%
rename from kinetic/rqt-py-trees/default.nix
rename to distros/kinetic/rqt-py-trees/default.nix
diff --git a/kinetic/rqt-reconfigure/default.nix b/distros/kinetic/rqt-reconfigure/default.nix
similarity index 100%
rename from kinetic/rqt-reconfigure/default.nix
rename to distros/kinetic/rqt-reconfigure/default.nix
diff --git a/kinetic/rqt-robot-dashboard/default.nix b/distros/kinetic/rqt-robot-dashboard/default.nix
similarity index 100%
rename from kinetic/rqt-robot-dashboard/default.nix
rename to distros/kinetic/rqt-robot-dashboard/default.nix
diff --git a/kinetic/rqt-robot-monitor/default.nix b/distros/kinetic/rqt-robot-monitor/default.nix
similarity index 100%
rename from kinetic/rqt-robot-monitor/default.nix
rename to distros/kinetic/rqt-robot-monitor/default.nix
diff --git a/kinetic/rqt-robot-plugins/default.nix b/distros/kinetic/rqt-robot-plugins/default.nix
similarity index 100%
rename from kinetic/rqt-robot-plugins/default.nix
rename to distros/kinetic/rqt-robot-plugins/default.nix
diff --git a/kinetic/rqt-robot-steering/default.nix b/distros/kinetic/rqt-robot-steering/default.nix
similarity index 100%
rename from kinetic/rqt-robot-steering/default.nix
rename to distros/kinetic/rqt-robot-steering/default.nix
diff --git a/kinetic/rqt-rosmon/default.nix b/distros/kinetic/rqt-rosmon/default.nix
similarity index 100%
rename from kinetic/rqt-rosmon/default.nix
rename to distros/kinetic/rqt-rosmon/default.nix
diff --git a/kinetic/rqt-runtime-monitor/default.nix b/distros/kinetic/rqt-runtime-monitor/default.nix
similarity index 100%
rename from kinetic/rqt-runtime-monitor/default.nix
rename to distros/kinetic/rqt-runtime-monitor/default.nix
diff --git a/kinetic/rqt-rviz/default.nix b/distros/kinetic/rqt-rviz/default.nix
similarity index 100%
rename from kinetic/rqt-rviz/default.nix
rename to distros/kinetic/rqt-rviz/default.nix
diff --git a/kinetic/rqt-service-caller/default.nix b/distros/kinetic/rqt-service-caller/default.nix
similarity index 100%
rename from kinetic/rqt-service-caller/default.nix
rename to distros/kinetic/rqt-service-caller/default.nix
diff --git a/kinetic/rqt-shell/default.nix b/distros/kinetic/rqt-shell/default.nix
similarity index 100%
rename from kinetic/rqt-shell/default.nix
rename to distros/kinetic/rqt-shell/default.nix
diff --git a/kinetic/rqt-srv/default.nix b/distros/kinetic/rqt-srv/default.nix
similarity index 100%
rename from kinetic/rqt-srv/default.nix
rename to distros/kinetic/rqt-srv/default.nix
diff --git a/kinetic/rqt-tf-tree/default.nix b/distros/kinetic/rqt-tf-tree/default.nix
similarity index 100%
rename from kinetic/rqt-tf-tree/default.nix
rename to distros/kinetic/rqt-tf-tree/default.nix
diff --git a/kinetic/rqt-top/default.nix b/distros/kinetic/rqt-top/default.nix
similarity index 100%
rename from kinetic/rqt-top/default.nix
rename to distros/kinetic/rqt-top/default.nix
diff --git a/kinetic/rqt-topic/default.nix b/distros/kinetic/rqt-topic/default.nix
similarity index 100%
rename from kinetic/rqt-topic/default.nix
rename to distros/kinetic/rqt-topic/default.nix
diff --git a/kinetic/rqt-web/default.nix b/distros/kinetic/rqt-web/default.nix
similarity index 100%
rename from kinetic/rqt-web/default.nix
rename to distros/kinetic/rqt-web/default.nix
diff --git a/kinetic/rqt-wrapper/default.nix b/distros/kinetic/rqt-wrapper/default.nix
similarity index 100%
rename from kinetic/rqt-wrapper/default.nix
rename to distros/kinetic/rqt-wrapper/default.nix
diff --git a/kinetic/rqt/default.nix b/distros/kinetic/rqt/default.nix
similarity index 100%
rename from kinetic/rqt/default.nix
rename to distros/kinetic/rqt/default.nix
diff --git a/kinetic/rr-control-input-manager/default.nix b/distros/kinetic/rr-control-input-manager/default.nix
similarity index 100%
rename from kinetic/rr-control-input-manager/default.nix
rename to distros/kinetic/rr-control-input-manager/default.nix
diff --git a/kinetic/rr-openrover-basic/default.nix b/distros/kinetic/rr-openrover-basic/default.nix
similarity index 100%
rename from kinetic/rr-openrover-basic/default.nix
rename to distros/kinetic/rr-openrover-basic/default.nix
diff --git a/kinetic/rr-openrover-driver-msgs/default.nix b/distros/kinetic/rr-openrover-driver-msgs/default.nix
similarity index 100%
rename from kinetic/rr-openrover-driver-msgs/default.nix
rename to distros/kinetic/rr-openrover-driver-msgs/default.nix
diff --git a/kinetic/rr-openrover-driver/default.nix b/distros/kinetic/rr-openrover-driver/default.nix
similarity index 100%
rename from kinetic/rr-openrover-driver/default.nix
rename to distros/kinetic/rr-openrover-driver/default.nix
diff --git a/kinetic/rr-openrover-stack/default.nix b/distros/kinetic/rr-openrover-stack/default.nix
similarity index 100%
rename from kinetic/rr-openrover-stack/default.nix
rename to distros/kinetic/rr-openrover-stack/default.nix
diff --git a/kinetic/rr-swiftnav-piksi/default.nix b/distros/kinetic/rr-swiftnav-piksi/default.nix
similarity index 100%
rename from kinetic/rr-swiftnav-piksi/default.nix
rename to distros/kinetic/rr-swiftnav-piksi/default.nix
diff --git a/kinetic/rslidar-driver/default.nix b/distros/kinetic/rslidar-driver/default.nix
similarity index 100%
rename from kinetic/rslidar-driver/default.nix
rename to distros/kinetic/rslidar-driver/default.nix
diff --git a/kinetic/rslidar-msgs/default.nix b/distros/kinetic/rslidar-msgs/default.nix
similarity index 100%
rename from kinetic/rslidar-msgs/default.nix
rename to distros/kinetic/rslidar-msgs/default.nix
diff --git a/kinetic/rslidar-pointcloud/default.nix b/distros/kinetic/rslidar-pointcloud/default.nix
similarity index 100%
rename from kinetic/rslidar-pointcloud/default.nix
rename to distros/kinetic/rslidar-pointcloud/default.nix
diff --git a/kinetic/rslidar/default.nix b/distros/kinetic/rslidar/default.nix
similarity index 100%
rename from kinetic/rslidar/default.nix
rename to distros/kinetic/rslidar/default.nix
diff --git a/kinetic/rsm-additions/default.nix b/distros/kinetic/rsm-additions/default.nix
similarity index 100%
rename from kinetic/rsm-additions/default.nix
rename to distros/kinetic/rsm-additions/default.nix
diff --git a/kinetic/rsm-core/default.nix b/distros/kinetic/rsm-core/default.nix
similarity index 100%
rename from kinetic/rsm-core/default.nix
rename to distros/kinetic/rsm-core/default.nix
diff --git a/kinetic/rsm-msgs/default.nix b/distros/kinetic/rsm-msgs/default.nix
similarity index 100%
rename from kinetic/rsm-msgs/default.nix
rename to distros/kinetic/rsm-msgs/default.nix
diff --git a/kinetic/rsm-rqt-plugins/default.nix b/distros/kinetic/rsm-rqt-plugins/default.nix
similarity index 100%
rename from kinetic/rsm-rqt-plugins/default.nix
rename to distros/kinetic/rsm-rqt-plugins/default.nix
diff --git a/kinetic/rsm-rviz-plugins/default.nix b/distros/kinetic/rsm-rviz-plugins/default.nix
similarity index 100%
rename from kinetic/rsm-rviz-plugins/default.nix
rename to distros/kinetic/rsm-rviz-plugins/default.nix
diff --git a/kinetic/rtabmap-ros/default.nix b/distros/kinetic/rtabmap-ros/default.nix
similarity index 100%
rename from kinetic/rtabmap-ros/default.nix
rename to distros/kinetic/rtabmap-ros/default.nix
diff --git a/kinetic/rtmbuild/default.nix b/distros/kinetic/rtmbuild/default.nix
similarity index 100%
rename from kinetic/rtmbuild/default.nix
rename to distros/kinetic/rtmbuild/default.nix
diff --git a/kinetic/rtmros-common/default.nix b/distros/kinetic/rtmros-common/default.nix
similarity index 100%
rename from kinetic/rtmros-common/default.nix
rename to distros/kinetic/rtmros-common/default.nix
diff --git a/kinetic/rtmros-hironx/default.nix b/distros/kinetic/rtmros-hironx/default.nix
similarity index 100%
rename from kinetic/rtmros-hironx/default.nix
rename to distros/kinetic/rtmros-hironx/default.nix
diff --git a/kinetic/rtmros-nextage/default.nix b/distros/kinetic/rtmros-nextage/default.nix
similarity index 100%
rename from kinetic/rtmros-nextage/default.nix
rename to distros/kinetic/rtmros-nextage/default.nix
diff --git a/kinetic/rtt-actionlib-msgs/default.nix b/distros/kinetic/rtt-actionlib-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-actionlib-msgs/default.nix
rename to distros/kinetic/rtt-actionlib-msgs/default.nix
diff --git a/kinetic/rtt-actionlib/default.nix b/distros/kinetic/rtt-actionlib/default.nix
similarity index 100%
rename from kinetic/rtt-actionlib/default.nix
rename to distros/kinetic/rtt-actionlib/default.nix
diff --git a/kinetic/rtt-common-msgs/default.nix b/distros/kinetic/rtt-common-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-common-msgs/default.nix
rename to distros/kinetic/rtt-common-msgs/default.nix
diff --git a/kinetic/rtt-control-msgs/default.nix b/distros/kinetic/rtt-control-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-control-msgs/default.nix
rename to distros/kinetic/rtt-control-msgs/default.nix
diff --git a/kinetic/rtt-controller-manager-msgs/default.nix b/distros/kinetic/rtt-controller-manager-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-controller-manager-msgs/default.nix
rename to distros/kinetic/rtt-controller-manager-msgs/default.nix
diff --git a/kinetic/rtt-diagnostic-msgs/default.nix b/distros/kinetic/rtt-diagnostic-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-diagnostic-msgs/default.nix
rename to distros/kinetic/rtt-diagnostic-msgs/default.nix
diff --git a/kinetic/rtt-dynamic-reconfigure/default.nix b/distros/kinetic/rtt-dynamic-reconfigure/default.nix
similarity index 100%
rename from kinetic/rtt-dynamic-reconfigure/default.nix
rename to distros/kinetic/rtt-dynamic-reconfigure/default.nix
diff --git a/kinetic/rtt-geometry-msgs/default.nix b/distros/kinetic/rtt-geometry-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-geometry-msgs/default.nix
rename to distros/kinetic/rtt-geometry-msgs/default.nix
diff --git a/kinetic/rtt-geometry/default.nix b/distros/kinetic/rtt-geometry/default.nix
similarity index 100%
rename from kinetic/rtt-geometry/default.nix
rename to distros/kinetic/rtt-geometry/default.nix
diff --git a/kinetic/rtt-kdl-conversions/default.nix b/distros/kinetic/rtt-kdl-conversions/default.nix
similarity index 100%
rename from kinetic/rtt-kdl-conversions/default.nix
rename to distros/kinetic/rtt-kdl-conversions/default.nix
diff --git a/kinetic/rtt-nav-msgs/default.nix b/distros/kinetic/rtt-nav-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-nav-msgs/default.nix
rename to distros/kinetic/rtt-nav-msgs/default.nix
diff --git a/kinetic/rtt-pcl-ros/default.nix b/distros/kinetic/rtt-pcl-ros/default.nix
similarity index 100%
rename from kinetic/rtt-pcl-ros/default.nix
rename to distros/kinetic/rtt-pcl-ros/default.nix
diff --git a/kinetic/rtt-pcl/default.nix b/distros/kinetic/rtt-pcl/default.nix
similarity index 100%
rename from kinetic/rtt-pcl/default.nix
rename to distros/kinetic/rtt-pcl/default.nix
diff --git a/kinetic/rtt-ros-comm/default.nix b/distros/kinetic/rtt-ros-comm/default.nix
similarity index 100%
rename from kinetic/rtt-ros-comm/default.nix
rename to distros/kinetic/rtt-ros-comm/default.nix
diff --git a/kinetic/rtt-ros-integration/default.nix b/distros/kinetic/rtt-ros-integration/default.nix
similarity index 100%
rename from kinetic/rtt-ros-integration/default.nix
rename to distros/kinetic/rtt-ros-integration/default.nix
diff --git a/kinetic/rtt-ros-msgs/default.nix b/distros/kinetic/rtt-ros-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-ros-msgs/default.nix
rename to distros/kinetic/rtt-ros-msgs/default.nix
diff --git a/kinetic/rtt-ros/default.nix b/distros/kinetic/rtt-ros/default.nix
similarity index 100%
rename from kinetic/rtt-ros/default.nix
rename to distros/kinetic/rtt-ros/default.nix
diff --git a/kinetic/rtt-rosclock/default.nix b/distros/kinetic/rtt-rosclock/default.nix
similarity index 100%
rename from kinetic/rtt-rosclock/default.nix
rename to distros/kinetic/rtt-rosclock/default.nix
diff --git a/kinetic/rtt-roscomm/default.nix b/distros/kinetic/rtt-roscomm/default.nix
similarity index 100%
rename from kinetic/rtt-roscomm/default.nix
rename to distros/kinetic/rtt-roscomm/default.nix
diff --git a/kinetic/rtt-rosdeployment/default.nix b/distros/kinetic/rtt-rosdeployment/default.nix
similarity index 100%
rename from kinetic/rtt-rosdeployment/default.nix
rename to distros/kinetic/rtt-rosdeployment/default.nix
diff --git a/kinetic/rtt-rosgraph-msgs/default.nix b/distros/kinetic/rtt-rosgraph-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-rosgraph-msgs/default.nix
rename to distros/kinetic/rtt-rosgraph-msgs/default.nix
diff --git a/kinetic/rtt-rosnode/default.nix b/distros/kinetic/rtt-rosnode/default.nix
similarity index 100%
rename from kinetic/rtt-rosnode/default.nix
rename to distros/kinetic/rtt-rosnode/default.nix
diff --git a/kinetic/rtt-rospack/default.nix b/distros/kinetic/rtt-rospack/default.nix
similarity index 100%
rename from kinetic/rtt-rospack/default.nix
rename to distros/kinetic/rtt-rospack/default.nix
diff --git a/kinetic/rtt-rosparam/default.nix b/distros/kinetic/rtt-rosparam/default.nix
similarity index 100%
rename from kinetic/rtt-rosparam/default.nix
rename to distros/kinetic/rtt-rosparam/default.nix
diff --git a/kinetic/rtt-sensor-msgs/default.nix b/distros/kinetic/rtt-sensor-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-sensor-msgs/default.nix
rename to distros/kinetic/rtt-sensor-msgs/default.nix
diff --git a/kinetic/rtt-shape-msgs/default.nix b/distros/kinetic/rtt-shape-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-shape-msgs/default.nix
rename to distros/kinetic/rtt-shape-msgs/default.nix
diff --git a/kinetic/rtt-std-msgs/default.nix b/distros/kinetic/rtt-std-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-std-msgs/default.nix
rename to distros/kinetic/rtt-std-msgs/default.nix
diff --git a/kinetic/rtt-std-srvs/default.nix b/distros/kinetic/rtt-std-srvs/default.nix
similarity index 100%
rename from kinetic/rtt-std-srvs/default.nix
rename to distros/kinetic/rtt-std-srvs/default.nix
diff --git a/kinetic/rtt-stereo-msgs/default.nix b/distros/kinetic/rtt-stereo-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-stereo-msgs/default.nix
rename to distros/kinetic/rtt-stereo-msgs/default.nix
diff --git a/kinetic/rtt-tf/default.nix b/distros/kinetic/rtt-tf/default.nix
similarity index 100%
rename from kinetic/rtt-tf/default.nix
rename to distros/kinetic/rtt-tf/default.nix
diff --git a/kinetic/rtt-trajectory-msgs/default.nix b/distros/kinetic/rtt-trajectory-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-trajectory-msgs/default.nix
rename to distros/kinetic/rtt-trajectory-msgs/default.nix
diff --git a/kinetic/rtt-visualization-msgs/default.nix b/distros/kinetic/rtt-visualization-msgs/default.nix
similarity index 100%
rename from kinetic/rtt-visualization-msgs/default.nix
rename to distros/kinetic/rtt-visualization-msgs/default.nix
diff --git a/kinetic/rv4fl-moveit-config/default.nix b/distros/kinetic/rv4fl-moveit-config/default.nix
similarity index 100%
rename from kinetic/rv4fl-moveit-config/default.nix
rename to distros/kinetic/rv4fl-moveit-config/default.nix
diff --git a/kinetic/rv7fl-moveit-config/default.nix b/distros/kinetic/rv7fl-moveit-config/default.nix
similarity index 100%
rename from kinetic/rv7fl-moveit-config/default.nix
rename to distros/kinetic/rv7fl-moveit-config/default.nix
diff --git a/kinetic/rviz-imu-plugin/default.nix b/distros/kinetic/rviz-imu-plugin/default.nix
similarity index 100%
rename from kinetic/rviz-imu-plugin/default.nix
rename to distros/kinetic/rviz-imu-plugin/default.nix
diff --git a/kinetic/rviz-plugin-tutorials/default.nix b/distros/kinetic/rviz-plugin-tutorials/default.nix
similarity index 100%
rename from kinetic/rviz-plugin-tutorials/default.nix
rename to distros/kinetic/rviz-plugin-tutorials/default.nix
diff --git a/kinetic/rviz-python-tutorial/default.nix b/distros/kinetic/rviz-python-tutorial/default.nix
similarity index 100%
rename from kinetic/rviz-python-tutorial/default.nix
rename to distros/kinetic/rviz-python-tutorial/default.nix
diff --git a/kinetic/rviz-recorder-buttons/default.nix b/distros/kinetic/rviz-recorder-buttons/default.nix
similarity index 100%
rename from kinetic/rviz-recorder-buttons/default.nix
rename to distros/kinetic/rviz-recorder-buttons/default.nix
diff --git a/kinetic/rviz-visual-tools/default.nix b/distros/kinetic/rviz-visual-tools/default.nix
similarity index 100%
rename from kinetic/rviz-visual-tools/default.nix
rename to distros/kinetic/rviz-visual-tools/default.nix
diff --git a/kinetic/rviz/default.nix b/distros/kinetic/rviz/default.nix
similarity index 100%
rename from kinetic/rviz/default.nix
rename to distros/kinetic/rviz/default.nix
diff --git a/kinetic/rxcpp-vendor/default.nix b/distros/kinetic/rxcpp-vendor/default.nix
similarity index 100%
rename from kinetic/rxcpp-vendor/default.nix
rename to distros/kinetic/rxcpp-vendor/default.nix
diff --git a/kinetic/rxros-tf/default.nix b/distros/kinetic/rxros-tf/default.nix
similarity index 100%
rename from kinetic/rxros-tf/default.nix
rename to distros/kinetic/rxros-tf/default.nix
diff --git a/kinetic/rxros/default.nix b/distros/kinetic/rxros/default.nix
similarity index 100%
rename from kinetic/rxros/default.nix
rename to distros/kinetic/rxros/default.nix
diff --git a/kinetic/safe-teleop-base/default.nix b/distros/kinetic/safe-teleop-base/default.nix
similarity index 100%
rename from kinetic/safe-teleop-base/default.nix
rename to distros/kinetic/safe-teleop-base/default.nix
diff --git a/kinetic/safe-teleop-stage/default.nix b/distros/kinetic/safe-teleop-stage/default.nix
similarity index 100%
rename from kinetic/safe-teleop-stage/default.nix
rename to distros/kinetic/safe-teleop-stage/default.nix
diff --git a/kinetic/safety-limiter-msgs/default.nix b/distros/kinetic/safety-limiter-msgs/default.nix
similarity index 100%
rename from kinetic/safety-limiter-msgs/default.nix
rename to distros/kinetic/safety-limiter-msgs/default.nix
diff --git a/kinetic/safety-limiter/default.nix b/distros/kinetic/safety-limiter/default.nix
similarity index 100%
rename from kinetic/safety-limiter/default.nix
rename to distros/kinetic/safety-limiter/default.nix
diff --git a/kinetic/sainsmart-relay-usb/default.nix b/distros/kinetic/sainsmart-relay-usb/default.nix
similarity index 100%
rename from kinetic/sainsmart-relay-usb/default.nix
rename to distros/kinetic/sainsmart-relay-usb/default.nix
diff --git a/kinetic/sand-island/default.nix b/distros/kinetic/sand-island/default.nix
similarity index 100%
rename from kinetic/sand-island/default.nix
rename to distros/kinetic/sand-island/default.nix
diff --git a/kinetic/sbg-driver/default.nix b/distros/kinetic/sbg-driver/default.nix
similarity index 100%
rename from kinetic/sbg-driver/default.nix
rename to distros/kinetic/sbg-driver/default.nix
diff --git a/kinetic/sbpl-lattice-planner/default.nix b/distros/kinetic/sbpl-lattice-planner/default.nix
similarity index 100%
rename from kinetic/sbpl-lattice-planner/default.nix
rename to distros/kinetic/sbpl-lattice-planner/default.nix
diff --git a/kinetic/sbpl-recovery/default.nix b/distros/kinetic/sbpl-recovery/default.nix
similarity index 100%
rename from kinetic/sbpl-recovery/default.nix
rename to distros/kinetic/sbpl-recovery/default.nix
diff --git a/kinetic/sbpl/default.nix b/distros/kinetic/sbpl/default.nix
similarity index 100%
rename from kinetic/sbpl/default.nix
rename to distros/kinetic/sbpl/default.nix
diff --git a/kinetic/scan-to-cloud-converter/default.nix b/distros/kinetic/scan-to-cloud-converter/default.nix
similarity index 100%
rename from kinetic/scan-to-cloud-converter/default.nix
rename to distros/kinetic/scan-to-cloud-converter/default.nix
diff --git a/kinetic/scan-tools/default.nix b/distros/kinetic/scan-tools/default.nix
similarity index 100%
rename from kinetic/scan-tools/default.nix
rename to distros/kinetic/scan-tools/default.nix
diff --git a/kinetic/scheduler-msgs/default.nix b/distros/kinetic/scheduler-msgs/default.nix
similarity index 100%
rename from kinetic/scheduler-msgs/default.nix
rename to distros/kinetic/scheduler-msgs/default.nix
diff --git a/kinetic/schunk-canopen-driver/default.nix b/distros/kinetic/schunk-canopen-driver/default.nix
similarity index 100%
rename from kinetic/schunk-canopen-driver/default.nix
rename to distros/kinetic/schunk-canopen-driver/default.nix
diff --git a/kinetic/schunk-description/default.nix b/distros/kinetic/schunk-description/default.nix
similarity index 100%
rename from kinetic/schunk-description/default.nix
rename to distros/kinetic/schunk-description/default.nix
diff --git a/kinetic/schunk-libm5api/default.nix b/distros/kinetic/schunk-libm5api/default.nix
similarity index 100%
rename from kinetic/schunk-libm5api/default.nix
rename to distros/kinetic/schunk-libm5api/default.nix
diff --git a/kinetic/schunk-modular-robotics/default.nix b/distros/kinetic/schunk-modular-robotics/default.nix
similarity index 100%
rename from kinetic/schunk-modular-robotics/default.nix
rename to distros/kinetic/schunk-modular-robotics/default.nix
diff --git a/kinetic/schunk-powercube-chain/default.nix b/distros/kinetic/schunk-powercube-chain/default.nix
similarity index 100%
rename from kinetic/schunk-powercube-chain/default.nix
rename to distros/kinetic/schunk-powercube-chain/default.nix
diff --git a/kinetic/schunk-sdh/default.nix b/distros/kinetic/schunk-sdh/default.nix
similarity index 100%
rename from kinetic/schunk-sdh/default.nix
rename to distros/kinetic/schunk-sdh/default.nix
diff --git a/kinetic/schunk-simulated-tactile-sensors/default.nix b/distros/kinetic/schunk-simulated-tactile-sensors/default.nix
similarity index 100%
rename from kinetic/schunk-simulated-tactile-sensors/default.nix
rename to distros/kinetic/schunk-simulated-tactile-sensors/default.nix
diff --git a/kinetic/schunk-svh-driver/default.nix b/distros/kinetic/schunk-svh-driver/default.nix
similarity index 100%
rename from kinetic/schunk-svh-driver/default.nix
rename to distros/kinetic/schunk-svh-driver/default.nix
diff --git a/kinetic/scratch4robots/default.nix b/distros/kinetic/scratch4robots/default.nix
similarity index 100%
rename from kinetic/scratch4robots/default.nix
rename to distros/kinetic/scratch4robots/default.nix
diff --git a/kinetic/sdhlibrary-cpp/default.nix b/distros/kinetic/sdhlibrary-cpp/default.nix
similarity index 100%
rename from kinetic/sdhlibrary-cpp/default.nix
rename to distros/kinetic/sdhlibrary-cpp/default.nix
diff --git a/kinetic/seed-r7-bringup/default.nix b/distros/kinetic/seed-r7-bringup/default.nix
similarity index 100%
rename from kinetic/seed-r7-bringup/default.nix
rename to distros/kinetic/seed-r7-bringup/default.nix
diff --git a/kinetic/seed-r7-description/default.nix b/distros/kinetic/seed-r7-description/default.nix
similarity index 100%
rename from kinetic/seed-r7-description/default.nix
rename to distros/kinetic/seed-r7-description/default.nix
diff --git a/kinetic/seed-r7-moveit-config/default.nix b/distros/kinetic/seed-r7-moveit-config/default.nix
similarity index 100%
rename from kinetic/seed-r7-moveit-config/default.nix
rename to distros/kinetic/seed-r7-moveit-config/default.nix
diff --git a/kinetic/seed-r7-navigation/default.nix b/distros/kinetic/seed-r7-navigation/default.nix
similarity index 100%
rename from kinetic/seed-r7-navigation/default.nix
rename to distros/kinetic/seed-r7-navigation/default.nix
diff --git a/kinetic/seed-r7-robot-interface/default.nix b/distros/kinetic/seed-r7-robot-interface/default.nix
similarity index 100%
rename from kinetic/seed-r7-robot-interface/default.nix
rename to distros/kinetic/seed-r7-robot-interface/default.nix
diff --git a/kinetic/seed-r7-ros-controller/default.nix b/distros/kinetic/seed-r7-ros-controller/default.nix
similarity index 100%
rename from kinetic/seed-r7-ros-controller/default.nix
rename to distros/kinetic/seed-r7-ros-controller/default.nix
diff --git a/kinetic/seed-r7-ros-pkg/default.nix b/distros/kinetic/seed-r7-ros-pkg/default.nix
similarity index 100%
rename from kinetic/seed-r7-ros-pkg/default.nix
rename to distros/kinetic/seed-r7-ros-pkg/default.nix
diff --git a/kinetic/seed-r7-samples/default.nix b/distros/kinetic/seed-r7-samples/default.nix
similarity index 100%
rename from kinetic/seed-r7-samples/default.nix
rename to distros/kinetic/seed-r7-samples/default.nix
diff --git a/kinetic/seed-r7-typef-moveit-config/default.nix b/distros/kinetic/seed-r7-typef-moveit-config/default.nix
similarity index 100%
rename from kinetic/seed-r7-typef-moveit-config/default.nix
rename to distros/kinetic/seed-r7-typef-moveit-config/default.nix
diff --git a/kinetic/seed-smartactuator-sdk/default.nix b/distros/kinetic/seed-smartactuator-sdk/default.nix
similarity index 100%
rename from kinetic/seed-smartactuator-sdk/default.nix
rename to distros/kinetic/seed-smartactuator-sdk/default.nix
diff --git a/kinetic/self-test/default.nix b/distros/kinetic/self-test/default.nix
similarity index 100%
rename from kinetic/self-test/default.nix
rename to distros/kinetic/self-test/default.nix
diff --git a/kinetic/semantic-point-annotator/default.nix b/distros/kinetic/semantic-point-annotator/default.nix
similarity index 100%
rename from kinetic/semantic-point-annotator/default.nix
rename to distros/kinetic/semantic-point-annotator/default.nix
diff --git a/kinetic/sensor-module-tutorial/default.nix b/distros/kinetic/sensor-module-tutorial/default.nix
similarity index 100%
rename from kinetic/sensor-module-tutorial/default.nix
rename to distros/kinetic/sensor-module-tutorial/default.nix
diff --git a/kinetic/sensor-msgs/default.nix b/distros/kinetic/sensor-msgs/default.nix
similarity index 100%
rename from kinetic/sensor-msgs/default.nix
rename to distros/kinetic/sensor-msgs/default.nix
diff --git a/kinetic/serial-utils/default.nix b/distros/kinetic/serial-utils/default.nix
similarity index 100%
rename from kinetic/serial-utils/default.nix
rename to distros/kinetic/serial-utils/default.nix
diff --git a/kinetic/serial/default.nix b/distros/kinetic/serial/default.nix
similarity index 100%
rename from kinetic/serial/default.nix
rename to distros/kinetic/serial/default.nix
diff --git a/kinetic/service-tools/default.nix b/distros/kinetic/service-tools/default.nix
similarity index 100%
rename from kinetic/service-tools/default.nix
rename to distros/kinetic/service-tools/default.nix
diff --git a/kinetic/sesame-ros/default.nix b/distros/kinetic/sesame-ros/default.nix
similarity index 100%
rename from kinetic/sesame-ros/default.nix
rename to distros/kinetic/sesame-ros/default.nix
diff --git a/kinetic/settlerlib/default.nix b/distros/kinetic/settlerlib/default.nix
similarity index 100%
rename from kinetic/settlerlib/default.nix
rename to distros/kinetic/settlerlib/default.nix
diff --git a/kinetic/shape-msgs/default.nix b/distros/kinetic/shape-msgs/default.nix
similarity index 100%
rename from kinetic/shape-msgs/default.nix
rename to distros/kinetic/shape-msgs/default.nix
diff --git a/kinetic/sick-safetyscanners/default.nix b/distros/kinetic/sick-safetyscanners/default.nix
similarity index 100%
rename from kinetic/sick-safetyscanners/default.nix
rename to distros/kinetic/sick-safetyscanners/default.nix
diff --git a/kinetic/sick-scan/default.nix b/distros/kinetic/sick-scan/default.nix
similarity index 100%
rename from kinetic/sick-scan/default.nix
rename to distros/kinetic/sick-scan/default.nix
diff --git a/kinetic/sick-tim/default.nix b/distros/kinetic/sick-tim/default.nix
similarity index 100%
rename from kinetic/sick-tim/default.nix
rename to distros/kinetic/sick-tim/default.nix
diff --git a/kinetic/sick-visionary-t-driver/default.nix b/distros/kinetic/sick-visionary-t-driver/default.nix
similarity index 100%
rename from kinetic/sick-visionary-t-driver/default.nix
rename to distros/kinetic/sick-visionary-t-driver/default.nix
diff --git a/kinetic/sick-visionary-t/default.nix b/distros/kinetic/sick-visionary-t/default.nix
similarity index 100%
rename from kinetic/sick-visionary-t/default.nix
rename to distros/kinetic/sick-visionary-t/default.nix
diff --git a/kinetic/sicktoolbox-wrapper/default.nix b/distros/kinetic/sicktoolbox-wrapper/default.nix
similarity index 100%
rename from kinetic/sicktoolbox-wrapper/default.nix
rename to distros/kinetic/sicktoolbox-wrapper/default.nix
diff --git a/kinetic/sicktoolbox/default.nix b/distros/kinetic/sicktoolbox/default.nix
similarity index 100%
rename from kinetic/sicktoolbox/default.nix
rename to distros/kinetic/sicktoolbox/default.nix
diff --git a/kinetic/simple-arm/default.nix b/distros/kinetic/simple-arm/default.nix
similarity index 100%
rename from kinetic/simple-arm/default.nix
rename to distros/kinetic/simple-arm/default.nix
diff --git a/kinetic/simple-drive/default.nix b/distros/kinetic/simple-drive/default.nix
similarity index 100%
rename from kinetic/simple-drive/default.nix
rename to distros/kinetic/simple-drive/default.nix
diff --git a/kinetic/simple-grasping/default.nix b/distros/kinetic/simple-grasping/default.nix
similarity index 100%
rename from kinetic/simple-grasping/default.nix
rename to distros/kinetic/simple-grasping/default.nix
diff --git a/kinetic/simple-message/default.nix b/distros/kinetic/simple-message/default.nix
similarity index 100%
rename from kinetic/simple-message/default.nix
rename to distros/kinetic/simple-message/default.nix
diff --git a/kinetic/simple-navigation-goals-tutorial/default.nix b/distros/kinetic/simple-navigation-goals-tutorial/default.nix
similarity index 100%
rename from kinetic/simple-navigation-goals-tutorial/default.nix
rename to distros/kinetic/simple-navigation-goals-tutorial/default.nix
diff --git a/kinetic/simulators/default.nix b/distros/kinetic/simulators/default.nix
similarity index 100%
rename from kinetic/simulators/default.nix
rename to distros/kinetic/simulators/default.nix
diff --git a/kinetic/single-joint-position-action/default.nix b/distros/kinetic/single-joint-position-action/default.nix
similarity index 100%
rename from kinetic/single-joint-position-action/default.nix
rename to distros/kinetic/single-joint-position-action/default.nix
diff --git a/kinetic/skybiometry-ros/default.nix b/distros/kinetic/skybiometry-ros/default.nix
similarity index 100%
rename from kinetic/skybiometry-ros/default.nix
rename to distros/kinetic/skybiometry-ros/default.nix
diff --git a/kinetic/slam-constructor/default.nix b/distros/kinetic/slam-constructor/default.nix
similarity index 100%
rename from kinetic/slam-constructor/default.nix
rename to distros/kinetic/slam-constructor/default.nix
diff --git a/kinetic/slam-gmapping/default.nix b/distros/kinetic/slam-gmapping/default.nix
similarity index 100%
rename from kinetic/slam-gmapping/default.nix
rename to distros/kinetic/slam-gmapping/default.nix
diff --git a/kinetic/slam-karto/default.nix b/distros/kinetic/slam-karto/default.nix
similarity index 100%
rename from kinetic/slam-karto/default.nix
rename to distros/kinetic/slam-karto/default.nix
diff --git a/kinetic/slic/default.nix b/distros/kinetic/slic/default.nix
similarity index 100%
rename from kinetic/slic/default.nix
rename to distros/kinetic/slic/default.nix
diff --git a/kinetic/slime-ros/default.nix b/distros/kinetic/slime-ros/default.nix
similarity index 100%
rename from kinetic/slime-ros/default.nix
rename to distros/kinetic/slime-ros/default.nix
diff --git a/kinetic/slime-wrapper/default.nix b/distros/kinetic/slime-wrapper/default.nix
similarity index 100%
rename from kinetic/slime-wrapper/default.nix
rename to distros/kinetic/slime-wrapper/default.nix
diff --git a/kinetic/smach-msgs/default.nix b/distros/kinetic/smach-msgs/default.nix
similarity index 100%
rename from kinetic/smach-msgs/default.nix
rename to distros/kinetic/smach-msgs/default.nix
diff --git a/kinetic/smach-ros/default.nix b/distros/kinetic/smach-ros/default.nix
similarity index 100%
rename from kinetic/smach-ros/default.nix
rename to distros/kinetic/smach-ros/default.nix
diff --git a/kinetic/smach-viewer/default.nix b/distros/kinetic/smach-viewer/default.nix
similarity index 100%
rename from kinetic/smach-viewer/default.nix
rename to distros/kinetic/smach-viewer/default.nix
diff --git a/kinetic/smach/default.nix b/distros/kinetic/smach/default.nix
similarity index 100%
rename from kinetic/smach/default.nix
rename to distros/kinetic/smach/default.nix
diff --git a/kinetic/smacha-ros/default.nix b/distros/kinetic/smacha-ros/default.nix
similarity index 100%
rename from kinetic/smacha-ros/default.nix
rename to distros/kinetic/smacha-ros/default.nix
diff --git a/kinetic/smacha/default.nix b/distros/kinetic/smacha/default.nix
similarity index 100%
rename from kinetic/smacha/default.nix
rename to distros/kinetic/smacha/default.nix
diff --git a/kinetic/smclib/default.nix b/distros/kinetic/smclib/default.nix
similarity index 100%
rename from kinetic/smclib/default.nix
rename to distros/kinetic/smclib/default.nix
diff --git a/kinetic/sns-ik-lib/default.nix b/distros/kinetic/sns-ik-lib/default.nix
similarity index 100%
rename from kinetic/sns-ik-lib/default.nix
rename to distros/kinetic/sns-ik-lib/default.nix
diff --git a/kinetic/social-navigation-layers/default.nix b/distros/kinetic/social-navigation-layers/default.nix
similarity index 100%
rename from kinetic/social-navigation-layers/default.nix
rename to distros/kinetic/social-navigation-layers/default.nix
diff --git a/kinetic/socketcan-bridge/default.nix b/distros/kinetic/socketcan-bridge/default.nix
similarity index 100%
rename from kinetic/socketcan-bridge/default.nix
rename to distros/kinetic/socketcan-bridge/default.nix
diff --git a/kinetic/socketcan-interface/default.nix b/distros/kinetic/socketcan-interface/default.nix
similarity index 100%
rename from kinetic/socketcan-interface/default.nix
rename to distros/kinetic/socketcan-interface/default.nix
diff --git a/kinetic/soem/default.nix b/distros/kinetic/soem/default.nix
similarity index 100%
rename from kinetic/soem/default.nix
rename to distros/kinetic/soem/default.nix
diff --git a/kinetic/sophus-ros-conversions/default.nix b/distros/kinetic/sophus-ros-conversions/default.nix
similarity index 100%
rename from kinetic/sophus-ros-conversions/default.nix
rename to distros/kinetic/sophus-ros-conversions/default.nix
diff --git a/kinetic/sophus/default.nix b/distros/kinetic/sophus/default.nix
similarity index 100%
rename from kinetic/sophus/default.nix
rename to distros/kinetic/sophus/default.nix
diff --git a/kinetic/sparse-bundle-adjustment/default.nix b/distros/kinetic/sparse-bundle-adjustment/default.nix
similarity index 100%
rename from kinetic/sparse-bundle-adjustment/default.nix
rename to distros/kinetic/sparse-bundle-adjustment/default.nix
diff --git a/kinetic/spatio-temporal-voxel-layer/default.nix b/distros/kinetic/spatio-temporal-voxel-layer/default.nix
similarity index 100%
rename from kinetic/spatio-temporal-voxel-layer/default.nix
rename to distros/kinetic/spatio-temporal-voxel-layer/default.nix
diff --git a/kinetic/speech-recognition-msgs/default.nix b/distros/kinetic/speech-recognition-msgs/default.nix
similarity index 100%
rename from kinetic/speech-recognition-msgs/default.nix
rename to distros/kinetic/speech-recognition-msgs/default.nix
diff --git a/kinetic/srdfdom/default.nix b/distros/kinetic/srdfdom/default.nix
similarity index 100%
rename from kinetic/srdfdom/default.nix
rename to distros/kinetic/srdfdom/default.nix
diff --git a/kinetic/stage-ros/default.nix b/distros/kinetic/stage-ros/default.nix
similarity index 100%
rename from kinetic/stage-ros/default.nix
rename to distros/kinetic/stage-ros/default.nix
diff --git a/kinetic/stage/default.nix b/distros/kinetic/stage/default.nix
similarity index 100%
rename from kinetic/stage/default.nix
rename to distros/kinetic/stage/default.nix
diff --git a/kinetic/state-exchanger/default.nix b/distros/kinetic/state-exchanger/default.nix
similarity index 100%
rename from kinetic/state-exchanger/default.nix
rename to distros/kinetic/state-exchanger/default.nix
diff --git a/kinetic/static-tf/default.nix b/distros/kinetic/static-tf/default.nix
similarity index 100%
rename from kinetic/static-tf/default.nix
rename to distros/kinetic/static-tf/default.nix
diff --git a/kinetic/static-transform-mux/default.nix b/distros/kinetic/static-transform-mux/default.nix
similarity index 100%
rename from kinetic/static-transform-mux/default.nix
rename to distros/kinetic/static-transform-mux/default.nix
diff --git a/kinetic/statistics-msgs/default.nix b/distros/kinetic/statistics-msgs/default.nix
similarity index 100%
rename from kinetic/statistics-msgs/default.nix
rename to distros/kinetic/statistics-msgs/default.nix
diff --git a/kinetic/std-capabilities/default.nix b/distros/kinetic/std-capabilities/default.nix
similarity index 100%
rename from kinetic/std-capabilities/default.nix
rename to distros/kinetic/std-capabilities/default.nix
diff --git a/kinetic/std-msgs/default.nix b/distros/kinetic/std-msgs/default.nix
similarity index 100%
rename from kinetic/std-msgs/default.nix
rename to distros/kinetic/std-msgs/default.nix
diff --git a/kinetic/std-srvs/default.nix b/distros/kinetic/std-srvs/default.nix
similarity index 100%
rename from kinetic/std-srvs/default.nix
rename to distros/kinetic/std-srvs/default.nix
diff --git a/kinetic/stdr-gui/default.nix b/distros/kinetic/stdr-gui/default.nix
similarity index 100%
rename from kinetic/stdr-gui/default.nix
rename to distros/kinetic/stdr-gui/default.nix
diff --git a/kinetic/stdr-launchers/default.nix b/distros/kinetic/stdr-launchers/default.nix
similarity index 100%
rename from kinetic/stdr-launchers/default.nix
rename to distros/kinetic/stdr-launchers/default.nix
diff --git a/kinetic/stdr-msgs/default.nix b/distros/kinetic/stdr-msgs/default.nix
similarity index 100%
rename from kinetic/stdr-msgs/default.nix
rename to distros/kinetic/stdr-msgs/default.nix
diff --git a/kinetic/stdr-parser/default.nix b/distros/kinetic/stdr-parser/default.nix
similarity index 100%
rename from kinetic/stdr-parser/default.nix
rename to distros/kinetic/stdr-parser/default.nix
diff --git a/kinetic/stdr-resources/default.nix b/distros/kinetic/stdr-resources/default.nix
similarity index 100%
rename from kinetic/stdr-resources/default.nix
rename to distros/kinetic/stdr-resources/default.nix
diff --git a/kinetic/stdr-robot/default.nix b/distros/kinetic/stdr-robot/default.nix
similarity index 100%
rename from kinetic/stdr-robot/default.nix
rename to distros/kinetic/stdr-robot/default.nix
diff --git a/kinetic/stdr-samples/default.nix b/distros/kinetic/stdr-samples/default.nix
similarity index 100%
rename from kinetic/stdr-samples/default.nix
rename to distros/kinetic/stdr-samples/default.nix
diff --git a/kinetic/stdr-server/default.nix b/distros/kinetic/stdr-server/default.nix
similarity index 100%
rename from kinetic/stdr-server/default.nix
rename to distros/kinetic/stdr-server/default.nix
diff --git a/kinetic/stdr-simulator/default.nix b/distros/kinetic/stdr-simulator/default.nix
similarity index 100%
rename from kinetic/stdr-simulator/default.nix
rename to distros/kinetic/stdr-simulator/default.nix
diff --git a/kinetic/stereo-image-proc/default.nix b/distros/kinetic/stereo-image-proc/default.nix
similarity index 100%
rename from kinetic/stereo-image-proc/default.nix
rename to distros/kinetic/stereo-image-proc/default.nix
diff --git a/kinetic/stereo-msgs/default.nix b/distros/kinetic/stereo-msgs/default.nix
similarity index 100%
rename from kinetic/stereo-msgs/default.nix
rename to distros/kinetic/stereo-msgs/default.nix
diff --git a/kinetic/summit-x-common/default.nix b/distros/kinetic/summit-x-common/default.nix
similarity index 100%
rename from kinetic/summit-x-common/default.nix
rename to distros/kinetic/summit-x-common/default.nix
diff --git a/kinetic/summit-x-control/default.nix b/distros/kinetic/summit-x-control/default.nix
similarity index 100%
rename from kinetic/summit-x-control/default.nix
rename to distros/kinetic/summit-x-control/default.nix
diff --git a/kinetic/summit-x-description/default.nix b/distros/kinetic/summit-x-description/default.nix
similarity index 100%
rename from kinetic/summit-x-description/default.nix
rename to distros/kinetic/summit-x-description/default.nix
diff --git a/kinetic/summit-x-gazebo/default.nix b/distros/kinetic/summit-x-gazebo/default.nix
similarity index 100%
rename from kinetic/summit-x-gazebo/default.nix
rename to distros/kinetic/summit-x-gazebo/default.nix
diff --git a/kinetic/summit-x-robot-control/default.nix b/distros/kinetic/summit-x-robot-control/default.nix
similarity index 100%
rename from kinetic/summit-x-robot-control/default.nix
rename to distros/kinetic/summit-x-robot-control/default.nix
diff --git a/kinetic/summit-x-sim-bringup/default.nix b/distros/kinetic/summit-x-sim-bringup/default.nix
similarity index 100%
rename from kinetic/summit-x-sim-bringup/default.nix
rename to distros/kinetic/summit-x-sim-bringup/default.nix
diff --git a/kinetic/summit-x-sim/default.nix b/distros/kinetic/summit-x-sim/default.nix
similarity index 100%
rename from kinetic/summit-x-sim/default.nix
rename to distros/kinetic/summit-x-sim/default.nix
diff --git a/kinetic/summit-xl-common/default.nix b/distros/kinetic/summit-xl-common/default.nix
similarity index 100%
rename from kinetic/summit-xl-common/default.nix
rename to distros/kinetic/summit-xl-common/default.nix
diff --git a/kinetic/summit-xl-control/default.nix b/distros/kinetic/summit-xl-control/default.nix
similarity index 100%
rename from kinetic/summit-xl-control/default.nix
rename to distros/kinetic/summit-xl-control/default.nix
diff --git a/kinetic/summit-xl-description/default.nix b/distros/kinetic/summit-xl-description/default.nix
similarity index 100%
rename from kinetic/summit-xl-description/default.nix
rename to distros/kinetic/summit-xl-description/default.nix
diff --git a/kinetic/summit-xl-gazebo/default.nix b/distros/kinetic/summit-xl-gazebo/default.nix
similarity index 100%
rename from kinetic/summit-xl-gazebo/default.nix
rename to distros/kinetic/summit-xl-gazebo/default.nix
diff --git a/kinetic/summit-xl-localization/default.nix b/distros/kinetic/summit-xl-localization/default.nix
similarity index 100%
rename from kinetic/summit-xl-localization/default.nix
rename to distros/kinetic/summit-xl-localization/default.nix
diff --git a/kinetic/summit-xl-navigation/default.nix b/distros/kinetic/summit-xl-navigation/default.nix
similarity index 100%
rename from kinetic/summit-xl-navigation/default.nix
rename to distros/kinetic/summit-xl-navigation/default.nix
diff --git a/kinetic/summit-xl-pad/default.nix b/distros/kinetic/summit-xl-pad/default.nix
similarity index 100%
rename from kinetic/summit-xl-pad/default.nix
rename to distros/kinetic/summit-xl-pad/default.nix
diff --git a/kinetic/summit-xl-robot-control/default.nix b/distros/kinetic/summit-xl-robot-control/default.nix
similarity index 100%
rename from kinetic/summit-xl-robot-control/default.nix
rename to distros/kinetic/summit-xl-robot-control/default.nix
diff --git a/kinetic/summit-xl-sim-bringup/default.nix b/distros/kinetic/summit-xl-sim-bringup/default.nix
similarity index 100%
rename from kinetic/summit-xl-sim-bringup/default.nix
rename to distros/kinetic/summit-xl-sim-bringup/default.nix
diff --git a/kinetic/summit-xl-sim/default.nix b/distros/kinetic/summit-xl-sim/default.nix
similarity index 100%
rename from kinetic/summit-xl-sim/default.nix
rename to distros/kinetic/summit-xl-sim/default.nix
diff --git a/kinetic/swarm-behaviors-position/default.nix b/distros/kinetic/swarm-behaviors-position/default.nix
similarity index 100%
rename from kinetic/swarm-behaviors-position/default.nix
rename to distros/kinetic/swarm-behaviors-position/default.nix
diff --git a/kinetic/swarm-behaviors-velocity/default.nix b/distros/kinetic/swarm-behaviors-velocity/default.nix
similarity index 100%
rename from kinetic/swarm-behaviors-velocity/default.nix
rename to distros/kinetic/swarm-behaviors-velocity/default.nix
diff --git a/kinetic/swarm-behaviors/default.nix b/distros/kinetic/swarm-behaviors/default.nix
similarity index 100%
rename from kinetic/swarm-behaviors/default.nix
rename to distros/kinetic/swarm-behaviors/default.nix
diff --git a/kinetic/swarm-functions/default.nix b/distros/kinetic/swarm-functions/default.nix
similarity index 100%
rename from kinetic/swarm-functions/default.nix
rename to distros/kinetic/swarm-functions/default.nix
diff --git a/kinetic/swarmros/default.nix b/distros/kinetic/swarmros/default.nix
similarity index 100%
rename from kinetic/swarmros/default.nix
rename to distros/kinetic/swarmros/default.nix
diff --git a/kinetic/swri-console-util/default.nix b/distros/kinetic/swri-console-util/default.nix
similarity index 100%
rename from kinetic/swri-console-util/default.nix
rename to distros/kinetic/swri-console-util/default.nix
diff --git a/kinetic/swri-console/default.nix b/distros/kinetic/swri-console/default.nix
similarity index 100%
rename from kinetic/swri-console/default.nix
rename to distros/kinetic/swri-console/default.nix
diff --git a/kinetic/swri-dbw-interface/default.nix b/distros/kinetic/swri-dbw-interface/default.nix
similarity index 100%
rename from kinetic/swri-dbw-interface/default.nix
rename to distros/kinetic/swri-dbw-interface/default.nix
diff --git a/kinetic/swri-geometry-util/default.nix b/distros/kinetic/swri-geometry-util/default.nix
similarity index 100%
rename from kinetic/swri-geometry-util/default.nix
rename to distros/kinetic/swri-geometry-util/default.nix
diff --git a/kinetic/swri-image-util/default.nix b/distros/kinetic/swri-image-util/default.nix
similarity index 100%
rename from kinetic/swri-image-util/default.nix
rename to distros/kinetic/swri-image-util/default.nix
diff --git a/kinetic/swri-math-util/default.nix b/distros/kinetic/swri-math-util/default.nix
similarity index 100%
rename from kinetic/swri-math-util/default.nix
rename to distros/kinetic/swri-math-util/default.nix
diff --git a/kinetic/swri-nodelet/default.nix b/distros/kinetic/swri-nodelet/default.nix
similarity index 100%
rename from kinetic/swri-nodelet/default.nix
rename to distros/kinetic/swri-nodelet/default.nix
diff --git a/kinetic/swri-opencv-util/default.nix b/distros/kinetic/swri-opencv-util/default.nix
similarity index 100%
rename from kinetic/swri-opencv-util/default.nix
rename to distros/kinetic/swri-opencv-util/default.nix
diff --git a/kinetic/swri-prefix-tools/default.nix b/distros/kinetic/swri-prefix-tools/default.nix
similarity index 100%
rename from kinetic/swri-prefix-tools/default.nix
rename to distros/kinetic/swri-prefix-tools/default.nix
diff --git a/kinetic/swri-profiler-msgs/default.nix b/distros/kinetic/swri-profiler-msgs/default.nix
similarity index 100%
rename from kinetic/swri-profiler-msgs/default.nix
rename to distros/kinetic/swri-profiler-msgs/default.nix
diff --git a/kinetic/swri-profiler-tools/default.nix b/distros/kinetic/swri-profiler-tools/default.nix
similarity index 100%
rename from kinetic/swri-profiler-tools/default.nix
rename to distros/kinetic/swri-profiler-tools/default.nix
diff --git a/kinetic/swri-profiler/default.nix b/distros/kinetic/swri-profiler/default.nix
similarity index 100%
rename from kinetic/swri-profiler/default.nix
rename to distros/kinetic/swri-profiler/default.nix
diff --git a/kinetic/swri-roscpp/default.nix b/distros/kinetic/swri-roscpp/default.nix
similarity index 100%
rename from kinetic/swri-roscpp/default.nix
rename to distros/kinetic/swri-roscpp/default.nix
diff --git a/kinetic/swri-rospy/default.nix b/distros/kinetic/swri-rospy/default.nix
similarity index 100%
rename from kinetic/swri-rospy/default.nix
rename to distros/kinetic/swri-rospy/default.nix
diff --git a/kinetic/swri-route-util/default.nix b/distros/kinetic/swri-route-util/default.nix
similarity index 100%
rename from kinetic/swri-route-util/default.nix
rename to distros/kinetic/swri-route-util/default.nix
diff --git a/kinetic/swri-serial-util/default.nix b/distros/kinetic/swri-serial-util/default.nix
similarity index 100%
rename from kinetic/swri-serial-util/default.nix
rename to distros/kinetic/swri-serial-util/default.nix
diff --git a/kinetic/swri-string-util/default.nix b/distros/kinetic/swri-string-util/default.nix
similarity index 100%
rename from kinetic/swri-string-util/default.nix
rename to distros/kinetic/swri-string-util/default.nix
diff --git a/kinetic/swri-system-util/default.nix b/distros/kinetic/swri-system-util/default.nix
similarity index 100%
rename from kinetic/swri-system-util/default.nix
rename to distros/kinetic/swri-system-util/default.nix
diff --git a/kinetic/swri-transform-util/default.nix b/distros/kinetic/swri-transform-util/default.nix
similarity index 100%
rename from kinetic/swri-transform-util/default.nix
rename to distros/kinetic/swri-transform-util/default.nix
diff --git a/kinetic/swri-yaml-util/default.nix b/distros/kinetic/swri-yaml-util/default.nix
similarity index 100%
rename from kinetic/swri-yaml-util/default.nix
rename to distros/kinetic/swri-yaml-util/default.nix
diff --git a/kinetic/sync-params/default.nix b/distros/kinetic/sync-params/default.nix
similarity index 100%
rename from kinetic/sync-params/default.nix
rename to distros/kinetic/sync-params/default.nix
diff --git a/kinetic/talos-description-calibration/default.nix b/distros/kinetic/talos-description-calibration/default.nix
similarity index 100%
rename from kinetic/talos-description-calibration/default.nix
rename to distros/kinetic/talos-description-calibration/default.nix
diff --git a/kinetic/talos-description-inertial/default.nix b/distros/kinetic/talos-description-inertial/default.nix
similarity index 100%
rename from kinetic/talos-description-inertial/default.nix
rename to distros/kinetic/talos-description-inertial/default.nix
diff --git a/kinetic/talos-description/default.nix b/distros/kinetic/talos-description/default.nix
similarity index 100%
rename from kinetic/talos-description/default.nix
rename to distros/kinetic/talos-description/default.nix
diff --git a/kinetic/tango-ros-messages/default.nix b/distros/kinetic/tango-ros-messages/default.nix
similarity index 100%
rename from kinetic/tango-ros-messages/default.nix
rename to distros/kinetic/tango-ros-messages/default.nix
diff --git a/kinetic/target-monitor/default.nix b/distros/kinetic/target-monitor/default.nix
similarity index 100%
rename from kinetic/target-monitor/default.nix
rename to distros/kinetic/target-monitor/default.nix
diff --git a/kinetic/task-allocation/default.nix b/distros/kinetic/task-allocation/default.nix
similarity index 100%
rename from kinetic/task-allocation/default.nix
rename to distros/kinetic/task-allocation/default.nix
diff --git a/kinetic/task-compiler/default.nix b/distros/kinetic/task-compiler/default.nix
similarity index 100%
rename from kinetic/task-compiler/default.nix
rename to distros/kinetic/task-compiler/default.nix
diff --git a/kinetic/tblib/default.nix b/distros/kinetic/tblib/default.nix
similarity index 100%
rename from kinetic/tblib/default.nix
rename to distros/kinetic/tblib/default.nix
diff --git a/kinetic/tdk-robokit/default.nix b/distros/kinetic/tdk-robokit/default.nix
similarity index 100%
rename from kinetic/tdk-robokit/default.nix
rename to distros/kinetic/tdk-robokit/default.nix
diff --git a/kinetic/teb-local-planner-tutorials/default.nix b/distros/kinetic/teb-local-planner-tutorials/default.nix
similarity index 100%
rename from kinetic/teb-local-planner-tutorials/default.nix
rename to distros/kinetic/teb-local-planner-tutorials/default.nix
diff --git a/kinetic/teb-local-planner/default.nix b/distros/kinetic/teb-local-planner/default.nix
similarity index 100%
rename from kinetic/teb-local-planner/default.nix
rename to distros/kinetic/teb-local-planner/default.nix
diff --git a/kinetic/teleop-tools-msgs/default.nix b/distros/kinetic/teleop-tools-msgs/default.nix
similarity index 100%
rename from kinetic/teleop-tools-msgs/default.nix
rename to distros/kinetic/teleop-tools-msgs/default.nix
diff --git a/kinetic/teleop-tools/default.nix b/distros/kinetic/teleop-tools/default.nix
similarity index 100%
rename from kinetic/teleop-tools/default.nix
rename to distros/kinetic/teleop-tools/default.nix
diff --git a/kinetic/teleop-twist-joy/default.nix b/distros/kinetic/teleop-twist-joy/default.nix
similarity index 100%
rename from kinetic/teleop-twist-joy/default.nix
rename to distros/kinetic/teleop-twist-joy/default.nix
diff --git a/kinetic/teleop-twist-keyboard/default.nix b/distros/kinetic/teleop-twist-keyboard/default.nix
similarity index 100%
rename from kinetic/teleop-twist-keyboard/default.nix
rename to distros/kinetic/teleop-twist-keyboard/default.nix
diff --git a/kinetic/tello-driver/default.nix b/distros/kinetic/tello-driver/default.nix
similarity index 100%
rename from kinetic/tello-driver/default.nix
rename to distros/kinetic/tello-driver/default.nix
diff --git a/kinetic/tensorflow-ros-rqt/default.nix b/distros/kinetic/tensorflow-ros-rqt/default.nix
similarity index 100%
rename from kinetic/tensorflow-ros-rqt/default.nix
rename to distros/kinetic/tensorflow-ros-rqt/default.nix
diff --git a/kinetic/tensorflow-ros/default.nix b/distros/kinetic/tensorflow-ros/default.nix
similarity index 100%
rename from kinetic/tensorflow-ros/default.nix
rename to distros/kinetic/tensorflow-ros/default.nix
diff --git a/kinetic/teraranger-array-converter/default.nix b/distros/kinetic/teraranger-array-converter/default.nix
similarity index 100%
rename from kinetic/teraranger-array-converter/default.nix
rename to distros/kinetic/teraranger-array-converter/default.nix
diff --git a/kinetic/teraranger-array/default.nix b/distros/kinetic/teraranger-array/default.nix
similarity index 100%
rename from kinetic/teraranger-array/default.nix
rename to distros/kinetic/teraranger-array/default.nix
diff --git a/kinetic/teraranger-description/default.nix b/distros/kinetic/teraranger-description/default.nix
similarity index 100%
rename from kinetic/teraranger-description/default.nix
rename to distros/kinetic/teraranger-description/default.nix
diff --git a/kinetic/teraranger/default.nix b/distros/kinetic/teraranger/default.nix
similarity index 100%
rename from kinetic/teraranger/default.nix
rename to distros/kinetic/teraranger/default.nix
diff --git a/kinetic/test-diagnostic-aggregator/default.nix b/distros/kinetic/test-diagnostic-aggregator/default.nix
similarity index 100%
rename from kinetic/test-diagnostic-aggregator/default.nix
rename to distros/kinetic/test-diagnostic-aggregator/default.nix
diff --git a/kinetic/test-mavros/default.nix b/distros/kinetic/test-mavros/default.nix
similarity index 100%
rename from kinetic/test-mavros/default.nix
rename to distros/kinetic/test-mavros/default.nix
diff --git a/kinetic/test-osm/default.nix b/distros/kinetic/test-osm/default.nix
similarity index 100%
rename from kinetic/test-osm/default.nix
rename to distros/kinetic/test-osm/default.nix
diff --git a/kinetic/tf-conversions/default.nix b/distros/kinetic/tf-conversions/default.nix
similarity index 100%
rename from kinetic/tf-conversions/default.nix
rename to distros/kinetic/tf-conversions/default.nix
diff --git a/kinetic/tf-remapper-cpp/default.nix b/distros/kinetic/tf-remapper-cpp/default.nix
similarity index 100%
rename from kinetic/tf-remapper-cpp/default.nix
rename to distros/kinetic/tf-remapper-cpp/default.nix
diff --git a/kinetic/tf-tools/default.nix b/distros/kinetic/tf-tools/default.nix
similarity index 100%
rename from kinetic/tf-tools/default.nix
rename to distros/kinetic/tf-tools/default.nix
diff --git a/kinetic/tf/default.nix b/distros/kinetic/tf/default.nix
similarity index 100%
rename from kinetic/tf/default.nix
rename to distros/kinetic/tf/default.nix
diff --git a/kinetic/tf2-bullet/default.nix b/distros/kinetic/tf2-bullet/default.nix
similarity index 100%
rename from kinetic/tf2-bullet/default.nix
rename to distros/kinetic/tf2-bullet/default.nix
diff --git a/kinetic/tf2-eigen/default.nix b/distros/kinetic/tf2-eigen/default.nix
similarity index 100%
rename from kinetic/tf2-eigen/default.nix
rename to distros/kinetic/tf2-eigen/default.nix
diff --git a/kinetic/tf2-geometry-msgs/default.nix b/distros/kinetic/tf2-geometry-msgs/default.nix
similarity index 100%
rename from kinetic/tf2-geometry-msgs/default.nix
rename to distros/kinetic/tf2-geometry-msgs/default.nix
diff --git a/kinetic/tf2-kdl/default.nix b/distros/kinetic/tf2-kdl/default.nix
similarity index 100%
rename from kinetic/tf2-kdl/default.nix
rename to distros/kinetic/tf2-kdl/default.nix
diff --git a/kinetic/tf2-msgs/default.nix b/distros/kinetic/tf2-msgs/default.nix
similarity index 100%
rename from kinetic/tf2-msgs/default.nix
rename to distros/kinetic/tf2-msgs/default.nix
diff --git a/kinetic/tf2-py/default.nix b/distros/kinetic/tf2-py/default.nix
similarity index 100%
rename from kinetic/tf2-py/default.nix
rename to distros/kinetic/tf2-py/default.nix
diff --git a/kinetic/tf2-relay/default.nix b/distros/kinetic/tf2-relay/default.nix
similarity index 100%
rename from kinetic/tf2-relay/default.nix
rename to distros/kinetic/tf2-relay/default.nix
diff --git a/kinetic/tf2-ros/default.nix b/distros/kinetic/tf2-ros/default.nix
similarity index 100%
rename from kinetic/tf2-ros/default.nix
rename to distros/kinetic/tf2-ros/default.nix
diff --git a/kinetic/tf2-sensor-msgs/default.nix b/distros/kinetic/tf2-sensor-msgs/default.nix
similarity index 100%
rename from kinetic/tf2-sensor-msgs/default.nix
rename to distros/kinetic/tf2-sensor-msgs/default.nix
diff --git a/kinetic/tf2-tools/default.nix b/distros/kinetic/tf2-tools/default.nix
similarity index 100%
rename from kinetic/tf2-tools/default.nix
rename to distros/kinetic/tf2-tools/default.nix
diff --git a/kinetic/tf2-web-republisher/default.nix b/distros/kinetic/tf2-web-republisher/default.nix
similarity index 100%
rename from kinetic/tf2-web-republisher/default.nix
rename to distros/kinetic/tf2-web-republisher/default.nix
diff --git a/kinetic/tf2/default.nix b/distros/kinetic/tf2/default.nix
similarity index 100%
rename from kinetic/tf2/default.nix
rename to distros/kinetic/tf2/default.nix
diff --git a/kinetic/theora-image-transport/default.nix b/distros/kinetic/theora-image-transport/default.nix
similarity index 100%
rename from kinetic/theora-image-transport/default.nix
rename to distros/kinetic/theora-image-transport/default.nix
diff --git a/kinetic/thormang3-action-editor/default.nix b/distros/kinetic/thormang3-action-editor/default.nix
similarity index 100%
rename from kinetic/thormang3-action-editor/default.nix
rename to distros/kinetic/thormang3-action-editor/default.nix
diff --git a/kinetic/thormang3-action-module-msgs/default.nix b/distros/kinetic/thormang3-action-module-msgs/default.nix
similarity index 100%
rename from kinetic/thormang3-action-module-msgs/default.nix
rename to distros/kinetic/thormang3-action-module-msgs/default.nix
diff --git a/kinetic/thormang3-action-module/default.nix b/distros/kinetic/thormang3-action-module/default.nix
similarity index 100%
rename from kinetic/thormang3-action-module/default.nix
rename to distros/kinetic/thormang3-action-module/default.nix
diff --git a/kinetic/thormang3-action-script-player/default.nix b/distros/kinetic/thormang3-action-script-player/default.nix
similarity index 100%
rename from kinetic/thormang3-action-script-player/default.nix
rename to distros/kinetic/thormang3-action-script-player/default.nix
diff --git a/kinetic/thormang3-balance-control/default.nix b/distros/kinetic/thormang3-balance-control/default.nix
similarity index 100%
rename from kinetic/thormang3-balance-control/default.nix
rename to distros/kinetic/thormang3-balance-control/default.nix
diff --git a/kinetic/thormang3-base-module/default.nix b/distros/kinetic/thormang3-base-module/default.nix
similarity index 100%
rename from kinetic/thormang3-base-module/default.nix
rename to distros/kinetic/thormang3-base-module/default.nix
diff --git a/kinetic/thormang3-common/default.nix b/distros/kinetic/thormang3-common/default.nix
similarity index 100%
rename from kinetic/thormang3-common/default.nix
rename to distros/kinetic/thormang3-common/default.nix
diff --git a/kinetic/thormang3-demo/default.nix b/distros/kinetic/thormang3-demo/default.nix
similarity index 100%
rename from kinetic/thormang3-demo/default.nix
rename to distros/kinetic/thormang3-demo/default.nix
diff --git a/kinetic/thormang3-description/default.nix b/distros/kinetic/thormang3-description/default.nix
similarity index 100%
rename from kinetic/thormang3-description/default.nix
rename to distros/kinetic/thormang3-description/default.nix
diff --git a/kinetic/thormang3-feet-ft-module-msgs/default.nix b/distros/kinetic/thormang3-feet-ft-module-msgs/default.nix
similarity index 100%
rename from kinetic/thormang3-feet-ft-module-msgs/default.nix
rename to distros/kinetic/thormang3-feet-ft-module-msgs/default.nix
diff --git a/kinetic/thormang3-feet-ft-module/default.nix b/distros/kinetic/thormang3-feet-ft-module/default.nix
similarity index 100%
rename from kinetic/thormang3-feet-ft-module/default.nix
rename to distros/kinetic/thormang3-feet-ft-module/default.nix
diff --git a/kinetic/thormang3-foot-step-generator/default.nix b/distros/kinetic/thormang3-foot-step-generator/default.nix
similarity index 100%
rename from kinetic/thormang3-foot-step-generator/default.nix
rename to distros/kinetic/thormang3-foot-step-generator/default.nix
diff --git a/kinetic/thormang3-gazebo/default.nix b/distros/kinetic/thormang3-gazebo/default.nix
similarity index 100%
rename from kinetic/thormang3-gazebo/default.nix
rename to distros/kinetic/thormang3-gazebo/default.nix
diff --git a/kinetic/thormang3-gripper-module/default.nix b/distros/kinetic/thormang3-gripper-module/default.nix
similarity index 100%
rename from kinetic/thormang3-gripper-module/default.nix
rename to distros/kinetic/thormang3-gripper-module/default.nix
diff --git a/kinetic/thormang3-head-control-module-msgs/default.nix b/distros/kinetic/thormang3-head-control-module-msgs/default.nix
similarity index 100%
rename from kinetic/thormang3-head-control-module-msgs/default.nix
rename to distros/kinetic/thormang3-head-control-module-msgs/default.nix
diff --git a/kinetic/thormang3-head-control-module/default.nix b/distros/kinetic/thormang3-head-control-module/default.nix
similarity index 100%
rename from kinetic/thormang3-head-control-module/default.nix
rename to distros/kinetic/thormang3-head-control-module/default.nix
diff --git a/kinetic/thormang3-imu-3dm-gx4/default.nix b/distros/kinetic/thormang3-imu-3dm-gx4/default.nix
similarity index 100%
rename from kinetic/thormang3-imu-3dm-gx4/default.nix
rename to distros/kinetic/thormang3-imu-3dm-gx4/default.nix
diff --git a/kinetic/thormang3-kinematics-dynamics/default.nix b/distros/kinetic/thormang3-kinematics-dynamics/default.nix
similarity index 100%
rename from kinetic/thormang3-kinematics-dynamics/default.nix
rename to distros/kinetic/thormang3-kinematics-dynamics/default.nix
diff --git a/kinetic/thormang3-manager/default.nix b/distros/kinetic/thormang3-manager/default.nix
similarity index 100%
rename from kinetic/thormang3-manager/default.nix
rename to distros/kinetic/thormang3-manager/default.nix
diff --git a/kinetic/thormang3-manipulation-demo/default.nix b/distros/kinetic/thormang3-manipulation-demo/default.nix
similarity index 100%
rename from kinetic/thormang3-manipulation-demo/default.nix
rename to distros/kinetic/thormang3-manipulation-demo/default.nix
diff --git a/kinetic/thormang3-manipulation-module-msgs/default.nix b/distros/kinetic/thormang3-manipulation-module-msgs/default.nix
similarity index 100%
rename from kinetic/thormang3-manipulation-module-msgs/default.nix
rename to distros/kinetic/thormang3-manipulation-module-msgs/default.nix
diff --git a/kinetic/thormang3-manipulation-module/default.nix b/distros/kinetic/thormang3-manipulation-module/default.nix
similarity index 100%
rename from kinetic/thormang3-manipulation-module/default.nix
rename to distros/kinetic/thormang3-manipulation-module/default.nix
diff --git a/kinetic/thormang3-mpc-sensors/default.nix b/distros/kinetic/thormang3-mpc-sensors/default.nix
similarity index 100%
rename from kinetic/thormang3-mpc-sensors/default.nix
rename to distros/kinetic/thormang3-mpc-sensors/default.nix
diff --git a/kinetic/thormang3-mpc/default.nix b/distros/kinetic/thormang3-mpc/default.nix
similarity index 100%
rename from kinetic/thormang3-mpc/default.nix
rename to distros/kinetic/thormang3-mpc/default.nix
diff --git a/kinetic/thormang3-msgs/default.nix b/distros/kinetic/thormang3-msgs/default.nix
similarity index 100%
rename from kinetic/thormang3-msgs/default.nix
rename to distros/kinetic/thormang3-msgs/default.nix
diff --git a/kinetic/thormang3-navigation/default.nix b/distros/kinetic/thormang3-navigation/default.nix
similarity index 100%
rename from kinetic/thormang3-navigation/default.nix
rename to distros/kinetic/thormang3-navigation/default.nix
diff --git a/kinetic/thormang3-offset-tuner-client/default.nix b/distros/kinetic/thormang3-offset-tuner-client/default.nix
similarity index 100%
rename from kinetic/thormang3-offset-tuner-client/default.nix
rename to distros/kinetic/thormang3-offset-tuner-client/default.nix
diff --git a/kinetic/thormang3-offset-tuner-msgs/default.nix b/distros/kinetic/thormang3-offset-tuner-msgs/default.nix
similarity index 100%
rename from kinetic/thormang3-offset-tuner-msgs/default.nix
rename to distros/kinetic/thormang3-offset-tuner-msgs/default.nix
diff --git a/kinetic/thormang3-offset-tuner-server/default.nix b/distros/kinetic/thormang3-offset-tuner-server/default.nix
similarity index 100%
rename from kinetic/thormang3-offset-tuner-server/default.nix
rename to distros/kinetic/thormang3-offset-tuner-server/default.nix
diff --git a/kinetic/thormang3-opc/default.nix b/distros/kinetic/thormang3-opc/default.nix
similarity index 100%
rename from kinetic/thormang3-opc/default.nix
rename to distros/kinetic/thormang3-opc/default.nix
diff --git a/kinetic/thormang3-ppc/default.nix b/distros/kinetic/thormang3-ppc/default.nix
similarity index 100%
rename from kinetic/thormang3-ppc/default.nix
rename to distros/kinetic/thormang3-ppc/default.nix
diff --git a/kinetic/thormang3-sensors/default.nix b/distros/kinetic/thormang3-sensors/default.nix
similarity index 100%
rename from kinetic/thormang3-sensors/default.nix
rename to distros/kinetic/thormang3-sensors/default.nix
diff --git a/kinetic/thormang3-tools/default.nix b/distros/kinetic/thormang3-tools/default.nix
similarity index 100%
rename from kinetic/thormang3-tools/default.nix
rename to distros/kinetic/thormang3-tools/default.nix
diff --git a/kinetic/thormang3-walking-demo/default.nix b/distros/kinetic/thormang3-walking-demo/default.nix
similarity index 100%
rename from kinetic/thormang3-walking-demo/default.nix
rename to distros/kinetic/thormang3-walking-demo/default.nix
diff --git a/kinetic/thormang3-walking-module-msgs/default.nix b/distros/kinetic/thormang3-walking-module-msgs/default.nix
similarity index 100%
rename from kinetic/thormang3-walking-module-msgs/default.nix
rename to distros/kinetic/thormang3-walking-module-msgs/default.nix
diff --git a/kinetic/thormang3-walking-module/default.nix b/distros/kinetic/thormang3-walking-module/default.nix
similarity index 100%
rename from kinetic/thormang3-walking-module/default.nix
rename to distros/kinetic/thormang3-walking-module/default.nix
diff --git a/kinetic/tile-map/default.nix b/distros/kinetic/tile-map/default.nix
similarity index 100%
rename from kinetic/tile-map/default.nix
rename to distros/kinetic/tile-map/default.nix
diff --git a/kinetic/timed-roslaunch/default.nix b/distros/kinetic/timed-roslaunch/default.nix
similarity index 100%
rename from kinetic/timed-roslaunch/default.nix
rename to distros/kinetic/timed-roslaunch/default.nix
diff --git a/kinetic/timestamp-tools/default.nix b/distros/kinetic/timestamp-tools/default.nix
similarity index 100%
rename from kinetic/timestamp-tools/default.nix
rename to distros/kinetic/timestamp-tools/default.nix
diff --git a/kinetic/topic-switch/default.nix b/distros/kinetic/topic-switch/default.nix
similarity index 100%
rename from kinetic/topic-switch/default.nix
rename to distros/kinetic/topic-switch/default.nix
diff --git a/kinetic/topic-tools/default.nix b/distros/kinetic/topic-tools/default.nix
similarity index 100%
rename from kinetic/topic-tools/default.nix
rename to distros/kinetic/topic-tools/default.nix
diff --git a/kinetic/toposens-description/default.nix b/distros/kinetic/toposens-description/default.nix
similarity index 100%
rename from kinetic/toposens-description/default.nix
rename to distros/kinetic/toposens-description/default.nix
diff --git a/kinetic/toposens-driver/default.nix b/distros/kinetic/toposens-driver/default.nix
similarity index 100%
rename from kinetic/toposens-driver/default.nix
rename to distros/kinetic/toposens-driver/default.nix
diff --git a/kinetic/toposens-markers/default.nix b/distros/kinetic/toposens-markers/default.nix
similarity index 100%
rename from kinetic/toposens-markers/default.nix
rename to distros/kinetic/toposens-markers/default.nix
diff --git a/kinetic/toposens-msgs/default.nix b/distros/kinetic/toposens-msgs/default.nix
similarity index 100%
rename from kinetic/toposens-msgs/default.nix
rename to distros/kinetic/toposens-msgs/default.nix
diff --git a/kinetic/toposens-pointcloud/default.nix b/distros/kinetic/toposens-pointcloud/default.nix
similarity index 100%
rename from kinetic/toposens-pointcloud/default.nix
rename to distros/kinetic/toposens-pointcloud/default.nix
diff --git a/kinetic/toposens-sync/default.nix b/distros/kinetic/toposens-sync/default.nix
similarity index 100%
rename from kinetic/toposens-sync/default.nix
rename to distros/kinetic/toposens-sync/default.nix
diff --git a/kinetic/toposens/default.nix b/distros/kinetic/toposens/default.nix
similarity index 100%
rename from kinetic/toposens/default.nix
rename to distros/kinetic/toposens/default.nix
diff --git a/kinetic/towr-ros/default.nix b/distros/kinetic/towr-ros/default.nix
similarity index 100%
rename from kinetic/towr-ros/default.nix
rename to distros/kinetic/towr-ros/default.nix
diff --git a/kinetic/towr/default.nix b/distros/kinetic/towr/default.nix
similarity index 100%
rename from kinetic/towr/default.nix
rename to distros/kinetic/towr/default.nix
diff --git a/kinetic/tra1-bringup/default.nix b/distros/kinetic/tra1-bringup/default.nix
similarity index 100%
rename from kinetic/tra1-bringup/default.nix
rename to distros/kinetic/tra1-bringup/default.nix
diff --git a/kinetic/tra1-description/default.nix b/distros/kinetic/tra1-description/default.nix
similarity index 100%
rename from kinetic/tra1-description/default.nix
rename to distros/kinetic/tra1-description/default.nix
diff --git a/kinetic/tra1-moveit-config/default.nix b/distros/kinetic/tra1-moveit-config/default.nix
similarity index 100%
rename from kinetic/tra1-moveit-config/default.nix
rename to distros/kinetic/tra1-moveit-config/default.nix
diff --git a/kinetic/trac-ik-examples/default.nix b/distros/kinetic/trac-ik-examples/default.nix
similarity index 100%
rename from kinetic/trac-ik-examples/default.nix
rename to distros/kinetic/trac-ik-examples/default.nix
diff --git a/kinetic/trac-ik-kinematics-plugin/default.nix b/distros/kinetic/trac-ik-kinematics-plugin/default.nix
similarity index 100%
rename from kinetic/trac-ik-kinematics-plugin/default.nix
rename to distros/kinetic/trac-ik-kinematics-plugin/default.nix
diff --git a/kinetic/trac-ik-python/default.nix b/distros/kinetic/trac-ik-python/default.nix
similarity index 100%
rename from kinetic/trac-ik-python/default.nix
rename to distros/kinetic/trac-ik-python/default.nix
diff --git a/kinetic/trac-ik/default.nix b/distros/kinetic/trac-ik/default.nix
similarity index 100%
rename from kinetic/trac-ik/default.nix
rename to distros/kinetic/trac-ik/default.nix
diff --git a/kinetic/tracetools/default.nix b/distros/kinetic/tracetools/default.nix
similarity index 100%
rename from kinetic/tracetools/default.nix
rename to distros/kinetic/tracetools/default.nix
diff --git a/kinetic/track-odometry/default.nix b/distros/kinetic/track-odometry/default.nix
similarity index 100%
rename from kinetic/track-odometry/default.nix
rename to distros/kinetic/track-odometry/default.nix
diff --git a/kinetic/trajectory-msgs/default.nix b/distros/kinetic/trajectory-msgs/default.nix
similarity index 100%
rename from kinetic/trajectory-msgs/default.nix
rename to distros/kinetic/trajectory-msgs/default.nix
diff --git a/kinetic/trajectory-tracker-msgs/default.nix b/distros/kinetic/trajectory-tracker-msgs/default.nix
similarity index 100%
rename from kinetic/trajectory-tracker-msgs/default.nix
rename to distros/kinetic/trajectory-tracker-msgs/default.nix
diff --git a/kinetic/trajectory-tracker-rviz-plugins/default.nix b/distros/kinetic/trajectory-tracker-rviz-plugins/default.nix
similarity index 100%
rename from kinetic/trajectory-tracker-rviz-plugins/default.nix
rename to distros/kinetic/trajectory-tracker-rviz-plugins/default.nix
diff --git a/kinetic/trajectory-tracker/default.nix b/distros/kinetic/trajectory-tracker/default.nix
similarity index 100%
rename from kinetic/trajectory-tracker/default.nix
rename to distros/kinetic/trajectory-tracker/default.nix
diff --git a/kinetic/transmission-interface/default.nix b/distros/kinetic/transmission-interface/default.nix
similarity index 100%
rename from kinetic/transmission-interface/default.nix
rename to distros/kinetic/transmission-interface/default.nix
diff --git a/kinetic/tts/default.nix b/distros/kinetic/tts/default.nix
similarity index 100%
rename from kinetic/tts/default.nix
rename to distros/kinetic/tts/default.nix
diff --git a/kinetic/turtle-actionlib/default.nix b/distros/kinetic/turtle-actionlib/default.nix
similarity index 100%
rename from kinetic/turtle-actionlib/default.nix
rename to distros/kinetic/turtle-actionlib/default.nix
diff --git a/kinetic/turtle-tf/default.nix b/distros/kinetic/turtle-tf/default.nix
similarity index 100%
rename from kinetic/turtle-tf/default.nix
rename to distros/kinetic/turtle-tf/default.nix
diff --git a/kinetic/turtle-tf2/default.nix b/distros/kinetic/turtle-tf2/default.nix
similarity index 100%
rename from kinetic/turtle-tf2/default.nix
rename to distros/kinetic/turtle-tf2/default.nix
diff --git a/kinetic/turtlebot-actions/default.nix b/distros/kinetic/turtlebot-actions/default.nix
similarity index 100%
rename from kinetic/turtlebot-actions/default.nix
rename to distros/kinetic/turtlebot-actions/default.nix
diff --git a/kinetic/turtlebot-apps/default.nix b/distros/kinetic/turtlebot-apps/default.nix
similarity index 100%
rename from kinetic/turtlebot-apps/default.nix
rename to distros/kinetic/turtlebot-apps/default.nix
diff --git a/kinetic/turtlebot-bringup/default.nix b/distros/kinetic/turtlebot-bringup/default.nix
similarity index 100%
rename from kinetic/turtlebot-bringup/default.nix
rename to distros/kinetic/turtlebot-bringup/default.nix
diff --git a/kinetic/turtlebot-calibration/default.nix b/distros/kinetic/turtlebot-calibration/default.nix
similarity index 100%
rename from kinetic/turtlebot-calibration/default.nix
rename to distros/kinetic/turtlebot-calibration/default.nix
diff --git a/kinetic/turtlebot-capabilities/default.nix b/distros/kinetic/turtlebot-capabilities/default.nix
similarity index 100%
rename from kinetic/turtlebot-capabilities/default.nix
rename to distros/kinetic/turtlebot-capabilities/default.nix
diff --git a/kinetic/turtlebot-create/default.nix b/distros/kinetic/turtlebot-create/default.nix
similarity index 100%
rename from kinetic/turtlebot-create/default.nix
rename to distros/kinetic/turtlebot-create/default.nix
diff --git a/kinetic/turtlebot-dashboard/default.nix b/distros/kinetic/turtlebot-dashboard/default.nix
similarity index 100%
rename from kinetic/turtlebot-dashboard/default.nix
rename to distros/kinetic/turtlebot-dashboard/default.nix
diff --git a/kinetic/turtlebot-description/default.nix b/distros/kinetic/turtlebot-description/default.nix
similarity index 100%
rename from kinetic/turtlebot-description/default.nix
rename to distros/kinetic/turtlebot-description/default.nix
diff --git a/kinetic/turtlebot-follower/default.nix b/distros/kinetic/turtlebot-follower/default.nix
similarity index 100%
rename from kinetic/turtlebot-follower/default.nix
rename to distros/kinetic/turtlebot-follower/default.nix
diff --git a/kinetic/turtlebot-gazebo/default.nix b/distros/kinetic/turtlebot-gazebo/default.nix
similarity index 100%
rename from kinetic/turtlebot-gazebo/default.nix
rename to distros/kinetic/turtlebot-gazebo/default.nix
diff --git a/kinetic/turtlebot-interactions/default.nix b/distros/kinetic/turtlebot-interactions/default.nix
similarity index 100%
rename from kinetic/turtlebot-interactions/default.nix
rename to distros/kinetic/turtlebot-interactions/default.nix
diff --git a/kinetic/turtlebot-interactive-markers/default.nix b/distros/kinetic/turtlebot-interactive-markers/default.nix
similarity index 100%
rename from kinetic/turtlebot-interactive-markers/default.nix
rename to distros/kinetic/turtlebot-interactive-markers/default.nix
diff --git a/kinetic/turtlebot-loadout-kha1/default.nix b/distros/kinetic/turtlebot-loadout-kha1/default.nix
similarity index 100%
rename from kinetic/turtlebot-loadout-kha1/default.nix
rename to distros/kinetic/turtlebot-loadout-kha1/default.nix
diff --git a/kinetic/turtlebot-msgs/default.nix b/distros/kinetic/turtlebot-msgs/default.nix
similarity index 100%
rename from kinetic/turtlebot-msgs/default.nix
rename to distros/kinetic/turtlebot-msgs/default.nix
diff --git a/kinetic/turtlebot-navigation/default.nix b/distros/kinetic/turtlebot-navigation/default.nix
similarity index 100%
rename from kinetic/turtlebot-navigation/default.nix
rename to distros/kinetic/turtlebot-navigation/default.nix
diff --git a/kinetic/turtlebot-rapps/default.nix b/distros/kinetic/turtlebot-rapps/default.nix
similarity index 100%
rename from kinetic/turtlebot-rapps/default.nix
rename to distros/kinetic/turtlebot-rapps/default.nix
diff --git a/kinetic/turtlebot-rviz-launchers/default.nix b/distros/kinetic/turtlebot-rviz-launchers/default.nix
similarity index 100%
rename from kinetic/turtlebot-rviz-launchers/default.nix
rename to distros/kinetic/turtlebot-rviz-launchers/default.nix
diff --git a/kinetic/turtlebot-simulator/default.nix b/distros/kinetic/turtlebot-simulator/default.nix
similarity index 100%
rename from kinetic/turtlebot-simulator/default.nix
rename to distros/kinetic/turtlebot-simulator/default.nix
diff --git a/kinetic/turtlebot-stage/default.nix b/distros/kinetic/turtlebot-stage/default.nix
similarity index 100%
rename from kinetic/turtlebot-stage/default.nix
rename to distros/kinetic/turtlebot-stage/default.nix
diff --git a/kinetic/turtlebot-stdr/default.nix b/distros/kinetic/turtlebot-stdr/default.nix
similarity index 100%
rename from kinetic/turtlebot-stdr/default.nix
rename to distros/kinetic/turtlebot-stdr/default.nix
diff --git a/kinetic/turtlebot-teleop/default.nix b/distros/kinetic/turtlebot-teleop/default.nix
similarity index 100%
rename from kinetic/turtlebot-teleop/default.nix
rename to distros/kinetic/turtlebot-teleop/default.nix
diff --git a/kinetic/turtlebot/default.nix b/distros/kinetic/turtlebot/default.nix
similarity index 100%
rename from kinetic/turtlebot/default.nix
rename to distros/kinetic/turtlebot/default.nix
diff --git a/kinetic/turtlebot3-applications-msgs/default.nix b/distros/kinetic/turtlebot3-applications-msgs/default.nix
similarity index 100%
rename from kinetic/turtlebot3-applications-msgs/default.nix
rename to distros/kinetic/turtlebot3-applications-msgs/default.nix
diff --git a/kinetic/turtlebot3-applications/default.nix b/distros/kinetic/turtlebot3-applications/default.nix
similarity index 100%
rename from kinetic/turtlebot3-applications/default.nix
rename to distros/kinetic/turtlebot3-applications/default.nix
diff --git a/kinetic/turtlebot3-automatic-parking-vision/default.nix b/distros/kinetic/turtlebot3-automatic-parking-vision/default.nix
similarity index 100%
rename from kinetic/turtlebot3-automatic-parking-vision/default.nix
rename to distros/kinetic/turtlebot3-automatic-parking-vision/default.nix
diff --git a/kinetic/turtlebot3-automatic-parking/default.nix b/distros/kinetic/turtlebot3-automatic-parking/default.nix
similarity index 100%
rename from kinetic/turtlebot3-automatic-parking/default.nix
rename to distros/kinetic/turtlebot3-automatic-parking/default.nix
diff --git a/kinetic/turtlebot3-autorace-camera/default.nix b/distros/kinetic/turtlebot3-autorace-camera/default.nix
similarity index 100%
rename from kinetic/turtlebot3-autorace-camera/default.nix
rename to distros/kinetic/turtlebot3-autorace-camera/default.nix
diff --git a/kinetic/turtlebot3-autorace-control/default.nix b/distros/kinetic/turtlebot3-autorace-control/default.nix
similarity index 100%
rename from kinetic/turtlebot3-autorace-control/default.nix
rename to distros/kinetic/turtlebot3-autorace-control/default.nix
diff --git a/kinetic/turtlebot3-autorace-core/default.nix b/distros/kinetic/turtlebot3-autorace-core/default.nix
similarity index 100%
rename from kinetic/turtlebot3-autorace-core/default.nix
rename to distros/kinetic/turtlebot3-autorace-core/default.nix
diff --git a/kinetic/turtlebot3-autorace-detect/default.nix b/distros/kinetic/turtlebot3-autorace-detect/default.nix
similarity index 100%
rename from kinetic/turtlebot3-autorace-detect/default.nix
rename to distros/kinetic/turtlebot3-autorace-detect/default.nix
diff --git a/kinetic/turtlebot3-autorace/default.nix b/distros/kinetic/turtlebot3-autorace/default.nix
similarity index 100%
rename from kinetic/turtlebot3-autorace/default.nix
rename to distros/kinetic/turtlebot3-autorace/default.nix
diff --git a/kinetic/turtlebot3-bringup/default.nix b/distros/kinetic/turtlebot3-bringup/default.nix
similarity index 100%
rename from kinetic/turtlebot3-bringup/default.nix
rename to distros/kinetic/turtlebot3-bringup/default.nix
diff --git a/kinetic/turtlebot3-description/default.nix b/distros/kinetic/turtlebot3-description/default.nix
similarity index 100%
rename from kinetic/turtlebot3-description/default.nix
rename to distros/kinetic/turtlebot3-description/default.nix
diff --git a/kinetic/turtlebot3-example/default.nix b/distros/kinetic/turtlebot3-example/default.nix
similarity index 100%
rename from kinetic/turtlebot3-example/default.nix
rename to distros/kinetic/turtlebot3-example/default.nix
diff --git a/kinetic/turtlebot3-fake/default.nix b/distros/kinetic/turtlebot3-fake/default.nix
similarity index 100%
rename from kinetic/turtlebot3-fake/default.nix
rename to distros/kinetic/turtlebot3-fake/default.nix
diff --git a/kinetic/turtlebot3-follow-filter/default.nix b/distros/kinetic/turtlebot3-follow-filter/default.nix
similarity index 100%
rename from kinetic/turtlebot3-follow-filter/default.nix
rename to distros/kinetic/turtlebot3-follow-filter/default.nix
diff --git a/kinetic/turtlebot3-follower/default.nix b/distros/kinetic/turtlebot3-follower/default.nix
similarity index 100%
rename from kinetic/turtlebot3-follower/default.nix
rename to distros/kinetic/turtlebot3-follower/default.nix
diff --git a/kinetic/turtlebot3-gazebo/default.nix b/distros/kinetic/turtlebot3-gazebo/default.nix
similarity index 100%
rename from kinetic/turtlebot3-gazebo/default.nix
rename to distros/kinetic/turtlebot3-gazebo/default.nix
diff --git a/kinetic/turtlebot3-msgs/default.nix b/distros/kinetic/turtlebot3-msgs/default.nix
similarity index 100%
rename from kinetic/turtlebot3-msgs/default.nix
rename to distros/kinetic/turtlebot3-msgs/default.nix
diff --git a/kinetic/turtlebot3-navigation/default.nix b/distros/kinetic/turtlebot3-navigation/default.nix
similarity index 100%
rename from kinetic/turtlebot3-navigation/default.nix
rename to distros/kinetic/turtlebot3-navigation/default.nix
diff --git a/kinetic/turtlebot3-panorama/default.nix b/distros/kinetic/turtlebot3-panorama/default.nix
similarity index 100%
rename from kinetic/turtlebot3-panorama/default.nix
rename to distros/kinetic/turtlebot3-panorama/default.nix
diff --git a/kinetic/turtlebot3-simulations/default.nix b/distros/kinetic/turtlebot3-simulations/default.nix
similarity index 100%
rename from kinetic/turtlebot3-simulations/default.nix
rename to distros/kinetic/turtlebot3-simulations/default.nix
diff --git a/kinetic/turtlebot3-slam/default.nix b/distros/kinetic/turtlebot3-slam/default.nix
similarity index 100%
rename from kinetic/turtlebot3-slam/default.nix
rename to distros/kinetic/turtlebot3-slam/default.nix
diff --git a/kinetic/turtlebot3-teleop/default.nix b/distros/kinetic/turtlebot3-teleop/default.nix
similarity index 100%
rename from kinetic/turtlebot3-teleop/default.nix
rename to distros/kinetic/turtlebot3-teleop/default.nix
diff --git a/kinetic/turtlebot3/default.nix b/distros/kinetic/turtlebot3/default.nix
similarity index 100%
rename from kinetic/turtlebot3/default.nix
rename to distros/kinetic/turtlebot3/default.nix
diff --git a/kinetic/turtlesim/default.nix b/distros/kinetic/turtlesim/default.nix
similarity index 100%
rename from kinetic/turtlesim/default.nix
rename to distros/kinetic/turtlesim/default.nix
diff --git a/kinetic/tuw-airskin-msgs/default.nix b/distros/kinetic/tuw-airskin-msgs/default.nix
similarity index 100%
rename from kinetic/tuw-airskin-msgs/default.nix
rename to distros/kinetic/tuw-airskin-msgs/default.nix
diff --git a/kinetic/tuw-aruco/default.nix b/distros/kinetic/tuw-aruco/default.nix
similarity index 100%
rename from kinetic/tuw-aruco/default.nix
rename to distros/kinetic/tuw-aruco/default.nix
diff --git a/kinetic/tuw-ellipses/default.nix b/distros/kinetic/tuw-ellipses/default.nix
similarity index 100%
rename from kinetic/tuw-ellipses/default.nix
rename to distros/kinetic/tuw-ellipses/default.nix
diff --git a/kinetic/tuw-gazebo-msgs/default.nix b/distros/kinetic/tuw-gazebo-msgs/default.nix
similarity index 100%
rename from kinetic/tuw-gazebo-msgs/default.nix
rename to distros/kinetic/tuw-gazebo-msgs/default.nix
diff --git a/kinetic/tuw-geometry-msgs/default.nix b/distros/kinetic/tuw-geometry-msgs/default.nix
similarity index 100%
rename from kinetic/tuw-geometry-msgs/default.nix
rename to distros/kinetic/tuw-geometry-msgs/default.nix
diff --git a/kinetic/tuw-marker-detection/default.nix b/distros/kinetic/tuw-marker-detection/default.nix
similarity index 100%
rename from kinetic/tuw-marker-detection/default.nix
rename to distros/kinetic/tuw-marker-detection/default.nix
diff --git a/kinetic/tuw-marker-pose-estimation/default.nix b/distros/kinetic/tuw-marker-pose-estimation/default.nix
similarity index 100%
rename from kinetic/tuw-marker-pose-estimation/default.nix
rename to distros/kinetic/tuw-marker-pose-estimation/default.nix
diff --git a/kinetic/tuw-msgs/default.nix b/distros/kinetic/tuw-msgs/default.nix
similarity index 100%
rename from kinetic/tuw-msgs/default.nix
rename to distros/kinetic/tuw-msgs/default.nix
diff --git a/kinetic/tuw-multi-robot-msgs/default.nix b/distros/kinetic/tuw-multi-robot-msgs/default.nix
similarity index 100%
rename from kinetic/tuw-multi-robot-msgs/default.nix
rename to distros/kinetic/tuw-multi-robot-msgs/default.nix
diff --git a/kinetic/tuw-nav-msgs/default.nix b/distros/kinetic/tuw-nav-msgs/default.nix
similarity index 100%
rename from kinetic/tuw-nav-msgs/default.nix
rename to distros/kinetic/tuw-nav-msgs/default.nix
diff --git a/kinetic/tuw-object-msgs/default.nix b/distros/kinetic/tuw-object-msgs/default.nix
similarity index 100%
rename from kinetic/tuw-object-msgs/default.nix
rename to distros/kinetic/tuw-object-msgs/default.nix
diff --git a/kinetic/tuw-vehicle-msgs/default.nix b/distros/kinetic/tuw-vehicle-msgs/default.nix
similarity index 100%
rename from kinetic/tuw-vehicle-msgs/default.nix
rename to distros/kinetic/tuw-vehicle-msgs/default.nix
diff --git a/kinetic/twist-mux-msgs/default.nix b/distros/kinetic/twist-mux-msgs/default.nix
similarity index 100%
rename from kinetic/twist-mux-msgs/default.nix
rename to distros/kinetic/twist-mux-msgs/default.nix
diff --git a/kinetic/twist-mux/default.nix b/distros/kinetic/twist-mux/default.nix
similarity index 100%
rename from kinetic/twist-mux/default.nix
rename to distros/kinetic/twist-mux/default.nix
diff --git a/kinetic/twist-recovery/default.nix b/distros/kinetic/twist-recovery/default.nix
similarity index 100%
rename from kinetic/twist-recovery/default.nix
rename to distros/kinetic/twist-recovery/default.nix
diff --git a/kinetic/twistimu/default.nix b/distros/kinetic/twistimu/default.nix
similarity index 100%
rename from kinetic/twistimu/default.nix
rename to distros/kinetic/twistimu/default.nix
diff --git a/kinetic/uav-local-coverage/default.nix b/distros/kinetic/uav-local-coverage/default.nix
similarity index 100%
rename from kinetic/uav-local-coverage/default.nix
rename to distros/kinetic/uav-local-coverage/default.nix
diff --git a/kinetic/uav-optimal-coverage/default.nix b/distros/kinetic/uav-optimal-coverage/default.nix
similarity index 100%
rename from kinetic/uav-optimal-coverage/default.nix
rename to distros/kinetic/uav-optimal-coverage/default.nix
diff --git a/kinetic/uav-random-direction/default.nix b/distros/kinetic/uav-random-direction/default.nix
similarity index 100%
rename from kinetic/uav-random-direction/default.nix
rename to distros/kinetic/uav-random-direction/default.nix
diff --git a/kinetic/uav-simple-tracking/default.nix b/distros/kinetic/uav-simple-tracking/default.nix
similarity index 100%
rename from kinetic/uav-simple-tracking/default.nix
rename to distros/kinetic/uav-simple-tracking/default.nix
diff --git a/kinetic/ubiquity-motor/default.nix b/distros/kinetic/ubiquity-motor/default.nix
similarity index 100%
rename from kinetic/ubiquity-motor/default.nix
rename to distros/kinetic/ubiquity-motor/default.nix
diff --git a/kinetic/ueye-cam/default.nix b/distros/kinetic/ueye-cam/default.nix
similarity index 100%
rename from kinetic/ueye-cam/default.nix
rename to distros/kinetic/ueye-cam/default.nix
diff --git a/kinetic/ueye/default.nix b/distros/kinetic/ueye/default.nix
similarity index 100%
rename from kinetic/ueye/default.nix
rename to distros/kinetic/ueye/default.nix
diff --git a/kinetic/ugv-random-walk/default.nix b/distros/kinetic/ugv-random-walk/default.nix
similarity index 100%
rename from kinetic/ugv-random-walk/default.nix
rename to distros/kinetic/ugv-random-walk/default.nix
diff --git a/kinetic/um6/default.nix b/distros/kinetic/um6/default.nix
similarity index 100%
rename from kinetic/um6/default.nix
rename to distros/kinetic/um6/default.nix
diff --git a/kinetic/um7/default.nix b/distros/kinetic/um7/default.nix
similarity index 100%
rename from kinetic/um7/default.nix
rename to distros/kinetic/um7/default.nix
diff --git a/kinetic/underwater-sensor-msgs/default.nix b/distros/kinetic/underwater-sensor-msgs/default.nix
similarity index 100%
rename from kinetic/underwater-sensor-msgs/default.nix
rename to distros/kinetic/underwater-sensor-msgs/default.nix
diff --git a/kinetic/underwater-vehicle-dynamics/default.nix b/distros/kinetic/underwater-vehicle-dynamics/default.nix
similarity index 100%
rename from kinetic/underwater-vehicle-dynamics/default.nix
rename to distros/kinetic/underwater-vehicle-dynamics/default.nix
diff --git a/kinetic/unique-id/default.nix b/distros/kinetic/unique-id/default.nix
similarity index 100%
rename from kinetic/unique-id/default.nix
rename to distros/kinetic/unique-id/default.nix
diff --git a/kinetic/unique-identifier/default.nix b/distros/kinetic/unique-identifier/default.nix
similarity index 100%
rename from kinetic/unique-identifier/default.nix
rename to distros/kinetic/unique-identifier/default.nix
diff --git a/kinetic/universal-robot/default.nix b/distros/kinetic/universal-robot/default.nix
similarity index 100%
rename from kinetic/universal-robot/default.nix
rename to distros/kinetic/universal-robot/default.nix
diff --git a/kinetic/universal-robots/default.nix b/distros/kinetic/universal-robots/default.nix
similarity index 100%
rename from kinetic/universal-robots/default.nix
rename to distros/kinetic/universal-robots/default.nix
diff --git a/kinetic/ur-bringup/default.nix b/distros/kinetic/ur-bringup/default.nix
similarity index 100%
rename from kinetic/ur-bringup/default.nix
rename to distros/kinetic/ur-bringup/default.nix
diff --git a/kinetic/ur-description/default.nix b/distros/kinetic/ur-description/default.nix
similarity index 100%
rename from kinetic/ur-description/default.nix
rename to distros/kinetic/ur-description/default.nix
diff --git a/kinetic/ur-driver/default.nix b/distros/kinetic/ur-driver/default.nix
similarity index 100%
rename from kinetic/ur-driver/default.nix
rename to distros/kinetic/ur-driver/default.nix
diff --git a/kinetic/ur-e-description/default.nix b/distros/kinetic/ur-e-description/default.nix
similarity index 100%
rename from kinetic/ur-e-description/default.nix
rename to distros/kinetic/ur-e-description/default.nix
diff --git a/kinetic/ur-e-gazebo/default.nix b/distros/kinetic/ur-e-gazebo/default.nix
similarity index 100%
rename from kinetic/ur-e-gazebo/default.nix
rename to distros/kinetic/ur-e-gazebo/default.nix
diff --git a/kinetic/ur-gazebo/default.nix b/distros/kinetic/ur-gazebo/default.nix
similarity index 100%
rename from kinetic/ur-gazebo/default.nix
rename to distros/kinetic/ur-gazebo/default.nix
diff --git a/kinetic/ur-kinematics/default.nix b/distros/kinetic/ur-kinematics/default.nix
similarity index 100%
rename from kinetic/ur-kinematics/default.nix
rename to distros/kinetic/ur-kinematics/default.nix
diff --git a/kinetic/ur-msgs/default.nix b/distros/kinetic/ur-msgs/default.nix
similarity index 100%
rename from kinetic/ur-msgs/default.nix
rename to distros/kinetic/ur-msgs/default.nix
diff --git a/kinetic/ur10-e-moveit-config/default.nix b/distros/kinetic/ur10-e-moveit-config/default.nix
similarity index 100%
rename from kinetic/ur10-e-moveit-config/default.nix
rename to distros/kinetic/ur10-e-moveit-config/default.nix
diff --git a/kinetic/ur10-moveit-config/default.nix b/distros/kinetic/ur10-moveit-config/default.nix
similarity index 100%
rename from kinetic/ur10-moveit-config/default.nix
rename to distros/kinetic/ur10-moveit-config/default.nix
diff --git a/kinetic/ur3-e-moveit-config/default.nix b/distros/kinetic/ur3-e-moveit-config/default.nix
similarity index 100%
rename from kinetic/ur3-e-moveit-config/default.nix
rename to distros/kinetic/ur3-e-moveit-config/default.nix
diff --git a/kinetic/ur3-moveit-config/default.nix b/distros/kinetic/ur3-moveit-config/default.nix
similarity index 100%
rename from kinetic/ur3-moveit-config/default.nix
rename to distros/kinetic/ur3-moveit-config/default.nix
diff --git a/kinetic/ur5-e-moveit-config/default.nix b/distros/kinetic/ur5-e-moveit-config/default.nix
similarity index 100%
rename from kinetic/ur5-e-moveit-config/default.nix
rename to distros/kinetic/ur5-e-moveit-config/default.nix
diff --git a/kinetic/ur5-moveit-config/default.nix b/distros/kinetic/ur5-moveit-config/default.nix
similarity index 100%
rename from kinetic/ur5-moveit-config/default.nix
rename to distros/kinetic/ur5-moveit-config/default.nix
diff --git a/kinetic/urdf-geometry-parser/default.nix b/distros/kinetic/urdf-geometry-parser/default.nix
similarity index 100%
rename from kinetic/urdf-geometry-parser/default.nix
rename to distros/kinetic/urdf-geometry-parser/default.nix
diff --git a/kinetic/urdf-parser-plugin/default.nix b/distros/kinetic/urdf-parser-plugin/default.nix
similarity index 100%
rename from kinetic/urdf-parser-plugin/default.nix
rename to distros/kinetic/urdf-parser-plugin/default.nix
diff --git a/kinetic/urdf-sim-tutorial/default.nix b/distros/kinetic/urdf-sim-tutorial/default.nix
similarity index 100%
rename from kinetic/urdf-sim-tutorial/default.nix
rename to distros/kinetic/urdf-sim-tutorial/default.nix
diff --git a/kinetic/urdf-test/default.nix b/distros/kinetic/urdf-test/default.nix
similarity index 100%
rename from kinetic/urdf-test/default.nix
rename to distros/kinetic/urdf-test/default.nix
diff --git a/kinetic/urdf-tutorial/default.nix b/distros/kinetic/urdf-tutorial/default.nix
similarity index 100%
rename from kinetic/urdf-tutorial/default.nix
rename to distros/kinetic/urdf-tutorial/default.nix
diff --git a/kinetic/urdf/default.nix b/distros/kinetic/urdf/default.nix
similarity index 100%
rename from kinetic/urdf/default.nix
rename to distros/kinetic/urdf/default.nix
diff --git a/kinetic/urdfdom-py/default.nix b/distros/kinetic/urdfdom-py/default.nix
similarity index 100%
rename from kinetic/urdfdom-py/default.nix
rename to distros/kinetic/urdfdom-py/default.nix
diff --git a/kinetic/urg-c/default.nix b/distros/kinetic/urg-c/default.nix
similarity index 100%
rename from kinetic/urg-c/default.nix
rename to distros/kinetic/urg-c/default.nix
diff --git a/kinetic/urg-node/default.nix b/distros/kinetic/urg-node/default.nix
similarity index 100%
rename from kinetic/urg-node/default.nix
rename to distros/kinetic/urg-node/default.nix
diff --git a/kinetic/urg-stamped/default.nix b/distros/kinetic/urg-stamped/default.nix
similarity index 100%
rename from kinetic/urg-stamped/default.nix
rename to distros/kinetic/urg-stamped/default.nix
diff --git a/kinetic/usb-cam-controllers/default.nix b/distros/kinetic/usb-cam-controllers/default.nix
similarity index 100%
rename from kinetic/usb-cam-controllers/default.nix
rename to distros/kinetic/usb-cam-controllers/default.nix
diff --git a/kinetic/usb-cam-hardware-interface/default.nix b/distros/kinetic/usb-cam-hardware-interface/default.nix
similarity index 100%
rename from kinetic/usb-cam-hardware-interface/default.nix
rename to distros/kinetic/usb-cam-hardware-interface/default.nix
diff --git a/kinetic/usb-cam-hardware/default.nix b/distros/kinetic/usb-cam-hardware/default.nix
similarity index 100%
rename from kinetic/usb-cam-hardware/default.nix
rename to distros/kinetic/usb-cam-hardware/default.nix
diff --git a/kinetic/usb-cam/default.nix b/distros/kinetic/usb-cam/default.nix
similarity index 100%
rename from kinetic/usb-cam/default.nix
rename to distros/kinetic/usb-cam/default.nix
diff --git a/kinetic/usv-gazebo-plugins/default.nix b/distros/kinetic/usv-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/usv-gazebo-plugins/default.nix
rename to distros/kinetic/usv-gazebo-plugins/default.nix
diff --git a/kinetic/uuid-msgs/default.nix b/distros/kinetic/uuid-msgs/default.nix
similarity index 100%
rename from kinetic/uuid-msgs/default.nix
rename to distros/kinetic/uuid-msgs/default.nix
diff --git a/kinetic/uuv-assistants/default.nix b/distros/kinetic/uuv-assistants/default.nix
similarity index 100%
rename from kinetic/uuv-assistants/default.nix
rename to distros/kinetic/uuv-assistants/default.nix
diff --git a/kinetic/uuv-auv-control-allocator/default.nix b/distros/kinetic/uuv-auv-control-allocator/default.nix
similarity index 100%
rename from kinetic/uuv-auv-control-allocator/default.nix
rename to distros/kinetic/uuv-auv-control-allocator/default.nix
diff --git a/kinetic/uuv-control-cascaded-pid/default.nix b/distros/kinetic/uuv-control-cascaded-pid/default.nix
similarity index 100%
rename from kinetic/uuv-control-cascaded-pid/default.nix
rename to distros/kinetic/uuv-control-cascaded-pid/default.nix
diff --git a/kinetic/uuv-control-msgs/default.nix b/distros/kinetic/uuv-control-msgs/default.nix
similarity index 100%
rename from kinetic/uuv-control-msgs/default.nix
rename to distros/kinetic/uuv-control-msgs/default.nix
diff --git a/kinetic/uuv-control-utils/default.nix b/distros/kinetic/uuv-control-utils/default.nix
similarity index 100%
rename from kinetic/uuv-control-utils/default.nix
rename to distros/kinetic/uuv-control-utils/default.nix
diff --git a/kinetic/uuv-descriptions/default.nix b/distros/kinetic/uuv-descriptions/default.nix
similarity index 100%
rename from kinetic/uuv-descriptions/default.nix
rename to distros/kinetic/uuv-descriptions/default.nix
diff --git a/kinetic/uuv-gazebo-plugins/default.nix b/distros/kinetic/uuv-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/uuv-gazebo-plugins/default.nix
rename to distros/kinetic/uuv-gazebo-plugins/default.nix
diff --git a/kinetic/uuv-gazebo-ros-plugins-msgs/default.nix b/distros/kinetic/uuv-gazebo-ros-plugins-msgs/default.nix
similarity index 100%
rename from kinetic/uuv-gazebo-ros-plugins-msgs/default.nix
rename to distros/kinetic/uuv-gazebo-ros-plugins-msgs/default.nix
diff --git a/kinetic/uuv-gazebo-ros-plugins/default.nix b/distros/kinetic/uuv-gazebo-ros-plugins/default.nix
similarity index 100%
rename from kinetic/uuv-gazebo-ros-plugins/default.nix
rename to distros/kinetic/uuv-gazebo-ros-plugins/default.nix
diff --git a/kinetic/uuv-gazebo-worlds/default.nix b/distros/kinetic/uuv-gazebo-worlds/default.nix
similarity index 100%
rename from kinetic/uuv-gazebo-worlds/default.nix
rename to distros/kinetic/uuv-gazebo-worlds/default.nix
diff --git a/kinetic/uuv-gazebo/default.nix b/distros/kinetic/uuv-gazebo/default.nix
similarity index 100%
rename from kinetic/uuv-gazebo/default.nix
rename to distros/kinetic/uuv-gazebo/default.nix
diff --git a/kinetic/uuv-plume-msgs/default.nix b/distros/kinetic/uuv-plume-msgs/default.nix
similarity index 100%
rename from kinetic/uuv-plume-msgs/default.nix
rename to distros/kinetic/uuv-plume-msgs/default.nix
diff --git a/kinetic/uuv-plume-simulator/default.nix b/distros/kinetic/uuv-plume-simulator/default.nix
similarity index 100%
rename from kinetic/uuv-plume-simulator/default.nix
rename to distros/kinetic/uuv-plume-simulator/default.nix
diff --git a/kinetic/uuv-sensor-ros-plugins-msgs/default.nix b/distros/kinetic/uuv-sensor-ros-plugins-msgs/default.nix
similarity index 100%
rename from kinetic/uuv-sensor-ros-plugins-msgs/default.nix
rename to distros/kinetic/uuv-sensor-ros-plugins-msgs/default.nix
diff --git a/kinetic/uuv-sensor-ros-plugins/default.nix b/distros/kinetic/uuv-sensor-ros-plugins/default.nix
similarity index 100%
rename from kinetic/uuv-sensor-ros-plugins/default.nix
rename to distros/kinetic/uuv-sensor-ros-plugins/default.nix
diff --git a/kinetic/uuv-simulator/default.nix b/distros/kinetic/uuv-simulator/default.nix
similarity index 100%
rename from kinetic/uuv-simulator/default.nix
rename to distros/kinetic/uuv-simulator/default.nix
diff --git a/kinetic/uuv-teleop/default.nix b/distros/kinetic/uuv-teleop/default.nix
similarity index 100%
rename from kinetic/uuv-teleop/default.nix
rename to distros/kinetic/uuv-teleop/default.nix
diff --git a/kinetic/uuv-thruster-manager/default.nix b/distros/kinetic/uuv-thruster-manager/default.nix
similarity index 100%
rename from kinetic/uuv-thruster-manager/default.nix
rename to distros/kinetic/uuv-thruster-manager/default.nix
diff --git a/kinetic/uuv-trajectory-control/default.nix b/distros/kinetic/uuv-trajectory-control/default.nix
similarity index 100%
rename from kinetic/uuv-trajectory-control/default.nix
rename to distros/kinetic/uuv-trajectory-control/default.nix
diff --git a/kinetic/uuv-world-plugins/default.nix b/distros/kinetic/uuv-world-plugins/default.nix
similarity index 100%
rename from kinetic/uuv-world-plugins/default.nix
rename to distros/kinetic/uuv-world-plugins/default.nix
diff --git a/kinetic/uuv-world-ros-plugins-msgs/default.nix b/distros/kinetic/uuv-world-ros-plugins-msgs/default.nix
similarity index 100%
rename from kinetic/uuv-world-ros-plugins-msgs/default.nix
rename to distros/kinetic/uuv-world-ros-plugins-msgs/default.nix
diff --git a/kinetic/uuv-world-ros-plugins/default.nix b/distros/kinetic/uuv-world-ros-plugins/default.nix
similarity index 100%
rename from kinetic/uuv-world-ros-plugins/default.nix
rename to distros/kinetic/uuv-world-ros-plugins/default.nix
diff --git a/kinetic/uvc-camera/default.nix b/distros/kinetic/uvc-camera/default.nix
similarity index 100%
rename from kinetic/uvc-camera/default.nix
rename to distros/kinetic/uvc-camera/default.nix
diff --git a/kinetic/uwb-hardware-driver/default.nix b/distros/kinetic/uwb-hardware-driver/default.nix
similarity index 100%
rename from kinetic/uwb-hardware-driver/default.nix
rename to distros/kinetic/uwb-hardware-driver/default.nix
diff --git a/kinetic/uwsim-bullet/default.nix b/distros/kinetic/uwsim-bullet/default.nix
similarity index 100%
rename from kinetic/uwsim-bullet/default.nix
rename to distros/kinetic/uwsim-bullet/default.nix
diff --git a/kinetic/uwsim-osgbullet/default.nix b/distros/kinetic/uwsim-osgbullet/default.nix
similarity index 100%
rename from kinetic/uwsim-osgbullet/default.nix
rename to distros/kinetic/uwsim-osgbullet/default.nix
diff --git a/kinetic/uwsim-osgocean/default.nix b/distros/kinetic/uwsim-osgocean/default.nix
similarity index 100%
rename from kinetic/uwsim-osgocean/default.nix
rename to distros/kinetic/uwsim-osgocean/default.nix
diff --git a/kinetic/uwsim-osgworks/default.nix b/distros/kinetic/uwsim-osgworks/default.nix
similarity index 100%
rename from kinetic/uwsim-osgworks/default.nix
rename to distros/kinetic/uwsim-osgworks/default.nix
diff --git a/kinetic/variant-msgs/default.nix b/distros/kinetic/variant-msgs/default.nix
similarity index 100%
rename from kinetic/variant-msgs/default.nix
rename to distros/kinetic/variant-msgs/default.nix
diff --git a/kinetic/variant-topic-test/default.nix b/distros/kinetic/variant-topic-test/default.nix
similarity index 100%
rename from kinetic/variant-topic-test/default.nix
rename to distros/kinetic/variant-topic-test/default.nix
diff --git a/kinetic/variant-topic-tools/default.nix b/distros/kinetic/variant-topic-tools/default.nix
similarity index 100%
rename from kinetic/variant-topic-tools/default.nix
rename to distros/kinetic/variant-topic-tools/default.nix
diff --git a/kinetic/variant/default.nix b/distros/kinetic/variant/default.nix
similarity index 100%
rename from kinetic/variant/default.nix
rename to distros/kinetic/variant/default.nix
diff --git a/kinetic/velocity-controllers/default.nix b/distros/kinetic/velocity-controllers/default.nix
similarity index 100%
rename from kinetic/velocity-controllers/default.nix
rename to distros/kinetic/velocity-controllers/default.nix
diff --git a/kinetic/velodyne-description/default.nix b/distros/kinetic/velodyne-description/default.nix
similarity index 100%
rename from kinetic/velodyne-description/default.nix
rename to distros/kinetic/velodyne-description/default.nix
diff --git a/kinetic/velodyne-driver/default.nix b/distros/kinetic/velodyne-driver/default.nix
similarity index 100%
rename from kinetic/velodyne-driver/default.nix
rename to distros/kinetic/velodyne-driver/default.nix
diff --git a/kinetic/velodyne-gazebo-plugins/default.nix b/distros/kinetic/velodyne-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/velodyne-gazebo-plugins/default.nix
rename to distros/kinetic/velodyne-gazebo-plugins/default.nix
diff --git a/kinetic/velodyne-laserscan/default.nix b/distros/kinetic/velodyne-laserscan/default.nix
similarity index 100%
rename from kinetic/velodyne-laserscan/default.nix
rename to distros/kinetic/velodyne-laserscan/default.nix
diff --git a/kinetic/velodyne-msgs/default.nix b/distros/kinetic/velodyne-msgs/default.nix
similarity index 100%
rename from kinetic/velodyne-msgs/default.nix
rename to distros/kinetic/velodyne-msgs/default.nix
diff --git a/kinetic/velodyne-pointcloud/default.nix b/distros/kinetic/velodyne-pointcloud/default.nix
similarity index 100%
rename from kinetic/velodyne-pointcloud/default.nix
rename to distros/kinetic/velodyne-pointcloud/default.nix
diff --git a/kinetic/velodyne-simulator/default.nix b/distros/kinetic/velodyne-simulator/default.nix
similarity index 100%
rename from kinetic/velodyne-simulator/default.nix
rename to distros/kinetic/velodyne-simulator/default.nix
diff --git a/kinetic/velodyne/default.nix b/distros/kinetic/velodyne/default.nix
similarity index 100%
rename from kinetic/velodyne/default.nix
rename to distros/kinetic/velodyne/default.nix
diff --git a/kinetic/video-stream-opencv/default.nix b/distros/kinetic/video-stream-opencv/default.nix
similarity index 100%
rename from kinetic/video-stream-opencv/default.nix
rename to distros/kinetic/video-stream-opencv/default.nix
diff --git a/kinetic/view-controller-msgs/default.nix b/distros/kinetic/view-controller-msgs/default.nix
similarity index 100%
rename from kinetic/view-controller-msgs/default.nix
rename to distros/kinetic/view-controller-msgs/default.nix
diff --git a/kinetic/virtual-force-publisher/default.nix b/distros/kinetic/virtual-force-publisher/default.nix
similarity index 100%
rename from kinetic/virtual-force-publisher/default.nix
rename to distros/kinetic/virtual-force-publisher/default.nix
diff --git a/kinetic/vision-msgs/default.nix b/distros/kinetic/vision-msgs/default.nix
similarity index 100%
rename from kinetic/vision-msgs/default.nix
rename to distros/kinetic/vision-msgs/default.nix
diff --git a/kinetic/vision-opencv/default.nix b/distros/kinetic/vision-opencv/default.nix
similarity index 100%
rename from kinetic/vision-opencv/default.nix
rename to distros/kinetic/vision-opencv/default.nix
diff --git a/kinetic/vision-visp/default.nix b/distros/kinetic/vision-visp/default.nix
similarity index 100%
rename from kinetic/vision-visp/default.nix
rename to distros/kinetic/vision-visp/default.nix
diff --git a/kinetic/visp-auto-tracker/default.nix b/distros/kinetic/visp-auto-tracker/default.nix
similarity index 100%
rename from kinetic/visp-auto-tracker/default.nix
rename to distros/kinetic/visp-auto-tracker/default.nix
diff --git a/kinetic/visp-bridge/default.nix b/distros/kinetic/visp-bridge/default.nix
similarity index 100%
rename from kinetic/visp-bridge/default.nix
rename to distros/kinetic/visp-bridge/default.nix
diff --git a/kinetic/visp-camera-calibration/default.nix b/distros/kinetic/visp-camera-calibration/default.nix
similarity index 100%
rename from kinetic/visp-camera-calibration/default.nix
rename to distros/kinetic/visp-camera-calibration/default.nix
diff --git a/kinetic/visp-hand2eye-calibration/default.nix b/distros/kinetic/visp-hand2eye-calibration/default.nix
similarity index 100%
rename from kinetic/visp-hand2eye-calibration/default.nix
rename to distros/kinetic/visp-hand2eye-calibration/default.nix
diff --git a/kinetic/visp-tracker/default.nix b/distros/kinetic/visp-tracker/default.nix
similarity index 100%
rename from kinetic/visp-tracker/default.nix
rename to distros/kinetic/visp-tracker/default.nix
diff --git a/kinetic/visualization-marker-tutorials/default.nix b/distros/kinetic/visualization-marker-tutorials/default.nix
similarity index 100%
rename from kinetic/visualization-marker-tutorials/default.nix
rename to distros/kinetic/visualization-marker-tutorials/default.nix
diff --git a/kinetic/visualization-msgs/default.nix b/distros/kinetic/visualization-msgs/default.nix
similarity index 100%
rename from kinetic/visualization-msgs/default.nix
rename to distros/kinetic/visualization-msgs/default.nix
diff --git a/kinetic/visualization-osg/default.nix b/distros/kinetic/visualization-osg/default.nix
similarity index 100%
rename from kinetic/visualization-osg/default.nix
rename to distros/kinetic/visualization-osg/default.nix
diff --git a/kinetic/visualization-tutorials/default.nix b/distros/kinetic/visualization-tutorials/default.nix
similarity index 100%
rename from kinetic/visualization-tutorials/default.nix
rename to distros/kinetic/visualization-tutorials/default.nix
diff --git a/kinetic/viz/default.nix b/distros/kinetic/viz/default.nix
similarity index 100%
rename from kinetic/viz/default.nix
rename to distros/kinetic/viz/default.nix
diff --git a/kinetic/voice-text/default.nix b/distros/kinetic/voice-text/default.nix
similarity index 100%
rename from kinetic/voice-text/default.nix
rename to distros/kinetic/voice-text/default.nix
diff --git a/kinetic/voxel-grid/default.nix b/distros/kinetic/voxel-grid/default.nix
similarity index 100%
rename from kinetic/voxel-grid/default.nix
rename to distros/kinetic/voxel-grid/default.nix
diff --git a/kinetic/vrpn-client-ros/default.nix b/distros/kinetic/vrpn-client-ros/default.nix
similarity index 100%
rename from kinetic/vrpn-client-ros/default.nix
rename to distros/kinetic/vrpn-client-ros/default.nix
diff --git a/kinetic/vrpn/default.nix b/distros/kinetic/vrpn/default.nix
similarity index 100%
rename from kinetic/vrpn/default.nix
rename to distros/kinetic/vrpn/default.nix
diff --git a/kinetic/vrx-gazebo/default.nix b/distros/kinetic/vrx-gazebo/default.nix
similarity index 100%
rename from kinetic/vrx-gazebo/default.nix
rename to distros/kinetic/vrx-gazebo/default.nix
diff --git a/kinetic/vs060-gazebo/default.nix b/distros/kinetic/vs060-gazebo/default.nix
similarity index 100%
rename from kinetic/vs060-gazebo/default.nix
rename to distros/kinetic/vs060-gazebo/default.nix
diff --git a/kinetic/vs060-moveit-config/default.nix b/distros/kinetic/vs060-moveit-config/default.nix
similarity index 100%
rename from kinetic/vs060-moveit-config/default.nix
rename to distros/kinetic/vs060-moveit-config/default.nix
diff --git a/kinetic/vs060/default.nix b/distros/kinetic/vs060/default.nix
similarity index 100%
rename from kinetic/vs060/default.nix
rename to distros/kinetic/vs060/default.nix
diff --git a/kinetic/wamv-description/default.nix b/distros/kinetic/wamv-description/default.nix
similarity index 100%
rename from kinetic/wamv-description/default.nix
rename to distros/kinetic/wamv-description/default.nix
diff --git a/kinetic/wamv-gazebo/default.nix b/distros/kinetic/wamv-gazebo/default.nix
similarity index 100%
rename from kinetic/wamv-gazebo/default.nix
rename to distros/kinetic/wamv-gazebo/default.nix
diff --git a/kinetic/warehouse-ros/default.nix b/distros/kinetic/warehouse-ros/default.nix
similarity index 100%
rename from kinetic/warehouse-ros/default.nix
rename to distros/kinetic/warehouse-ros/default.nix
diff --git a/kinetic/warthog-control/default.nix b/distros/kinetic/warthog-control/default.nix
similarity index 100%
rename from kinetic/warthog-control/default.nix
rename to distros/kinetic/warthog-control/default.nix
diff --git a/kinetic/warthog-description/default.nix b/distros/kinetic/warthog-description/default.nix
similarity index 100%
rename from kinetic/warthog-description/default.nix
rename to distros/kinetic/warthog-description/default.nix
diff --git a/kinetic/warthog-desktop/default.nix b/distros/kinetic/warthog-desktop/default.nix
similarity index 100%
rename from kinetic/warthog-desktop/default.nix
rename to distros/kinetic/warthog-desktop/default.nix
diff --git a/kinetic/warthog-gazebo/default.nix b/distros/kinetic/warthog-gazebo/default.nix
similarity index 100%
rename from kinetic/warthog-gazebo/default.nix
rename to distros/kinetic/warthog-gazebo/default.nix
diff --git a/kinetic/warthog-msgs/default.nix b/distros/kinetic/warthog-msgs/default.nix
similarity index 100%
rename from kinetic/warthog-msgs/default.nix
rename to distros/kinetic/warthog-msgs/default.nix
diff --git a/kinetic/warthog-simulator/default.nix b/distros/kinetic/warthog-simulator/default.nix
similarity index 100%
rename from kinetic/warthog-simulator/default.nix
rename to distros/kinetic/warthog-simulator/default.nix
diff --git a/kinetic/warthog-viz/default.nix b/distros/kinetic/warthog-viz/default.nix
similarity index 100%
rename from kinetic/warthog-viz/default.nix
rename to distros/kinetic/warthog-viz/default.nix
diff --git a/kinetic/watson-ins/default.nix b/distros/kinetic/watson-ins/default.nix
similarity index 100%
rename from kinetic/watson-ins/default.nix
rename to distros/kinetic/watson-ins/default.nix
diff --git a/kinetic/wave-gazebo-plugins/default.nix b/distros/kinetic/wave-gazebo-plugins/default.nix
similarity index 100%
rename from kinetic/wave-gazebo-plugins/default.nix
rename to distros/kinetic/wave-gazebo-plugins/default.nix
diff --git a/kinetic/wave-gazebo/default.nix b/distros/kinetic/wave-gazebo/default.nix
similarity index 100%
rename from kinetic/wave-gazebo/default.nix
rename to distros/kinetic/wave-gazebo/default.nix
diff --git a/kinetic/waypoint-generator/default.nix b/distros/kinetic/waypoint-generator/default.nix
similarity index 100%
rename from kinetic/waypoint-generator/default.nix
rename to distros/kinetic/waypoint-generator/default.nix
diff --git a/kinetic/waypoint-meta/default.nix b/distros/kinetic/waypoint-meta/default.nix
similarity index 100%
rename from kinetic/waypoint-meta/default.nix
rename to distros/kinetic/waypoint-meta/default.nix
diff --git a/kinetic/waypoint-touring/default.nix b/distros/kinetic/waypoint-touring/default.nix
similarity index 100%
rename from kinetic/waypoint-touring/default.nix
rename to distros/kinetic/waypoint-touring/default.nix
diff --git a/kinetic/web-interface/default.nix b/distros/kinetic/web-interface/default.nix
similarity index 100%
rename from kinetic/web-interface/default.nix
rename to distros/kinetic/web-interface/default.nix
diff --git a/kinetic/web-msgs/default.nix b/distros/kinetic/web-msgs/default.nix
similarity index 100%
rename from kinetic/web-msgs/default.nix
rename to distros/kinetic/web-msgs/default.nix
diff --git a/kinetic/web-video-server/default.nix b/distros/kinetic/web-video-server/default.nix
similarity index 100%
rename from kinetic/web-video-server/default.nix
rename to distros/kinetic/web-video-server/default.nix
diff --git a/kinetic/webargs/default.nix b/distros/kinetic/webargs/default.nix
similarity index 100%
rename from kinetic/webargs/default.nix
rename to distros/kinetic/webargs/default.nix
diff --git a/kinetic/webkit-dependency/default.nix b/distros/kinetic/webkit-dependency/default.nix
similarity index 100%
rename from kinetic/webkit-dependency/default.nix
rename to distros/kinetic/webkit-dependency/default.nix
diff --git a/kinetic/webots-ros/default.nix b/distros/kinetic/webots-ros/default.nix
similarity index 100%
rename from kinetic/webots-ros/default.nix
rename to distros/kinetic/webots-ros/default.nix
diff --git a/kinetic/webrtc-ros/default.nix b/distros/kinetic/webrtc-ros/default.nix
similarity index 100%
rename from kinetic/webrtc-ros/default.nix
rename to distros/kinetic/webrtc-ros/default.nix
diff --git a/kinetic/webrtc/default.nix b/distros/kinetic/webrtc/default.nix
similarity index 100%
rename from kinetic/webrtc/default.nix
rename to distros/kinetic/webrtc/default.nix
diff --git a/kinetic/webtest/default.nix b/distros/kinetic/webtest/default.nix
similarity index 100%
rename from kinetic/webtest/default.nix
rename to distros/kinetic/webtest/default.nix
diff --git a/kinetic/webui/default.nix b/distros/kinetic/webui/default.nix
similarity index 100%
rename from kinetic/webui/default.nix
rename to distros/kinetic/webui/default.nix
diff --git a/kinetic/wfov-camera-msgs/default.nix b/distros/kinetic/wfov-camera-msgs/default.nix
similarity index 100%
rename from kinetic/wfov-camera-msgs/default.nix
rename to distros/kinetic/wfov-camera-msgs/default.nix
diff --git a/kinetic/wge100-camera-firmware/default.nix b/distros/kinetic/wge100-camera-firmware/default.nix
similarity index 100%
rename from kinetic/wge100-camera-firmware/default.nix
rename to distros/kinetic/wge100-camera-firmware/default.nix
diff --git a/kinetic/wge100-camera/default.nix b/distros/kinetic/wge100-camera/default.nix
similarity index 100%
rename from kinetic/wge100-camera/default.nix
rename to distros/kinetic/wge100-camera/default.nix
diff --git a/kinetic/wge100-driver/default.nix b/distros/kinetic/wge100-driver/default.nix
similarity index 100%
rename from kinetic/wge100-driver/default.nix
rename to distros/kinetic/wge100-driver/default.nix
diff --git a/kinetic/wifi-ddwrt/default.nix b/distros/kinetic/wifi-ddwrt/default.nix
similarity index 100%
rename from kinetic/wifi-ddwrt/default.nix
rename to distros/kinetic/wifi-ddwrt/default.nix
diff --git a/kinetic/willow-maps/default.nix b/distros/kinetic/willow-maps/default.nix
similarity index 100%
rename from kinetic/willow-maps/default.nix
rename to distros/kinetic/willow-maps/default.nix
diff --git a/kinetic/wireless-msgs/default.nix b/distros/kinetic/wireless-msgs/default.nix
similarity index 100%
rename from kinetic/wireless-msgs/default.nix
rename to distros/kinetic/wireless-msgs/default.nix
diff --git a/kinetic/wireless-watcher/default.nix b/distros/kinetic/wireless-watcher/default.nix
similarity index 100%
rename from kinetic/wireless-watcher/default.nix
rename to distros/kinetic/wireless-watcher/default.nix
diff --git a/kinetic/world-canvas-client-cpp/default.nix b/distros/kinetic/world-canvas-client-cpp/default.nix
similarity index 100%
rename from kinetic/world-canvas-client-cpp/default.nix
rename to distros/kinetic/world-canvas-client-cpp/default.nix
diff --git a/kinetic/world-canvas-client-examples/default.nix b/distros/kinetic/world-canvas-client-examples/default.nix
similarity index 100%
rename from kinetic/world-canvas-client-examples/default.nix
rename to distros/kinetic/world-canvas-client-examples/default.nix
diff --git a/kinetic/world-canvas-client-py/default.nix b/distros/kinetic/world-canvas-client-py/default.nix
similarity index 100%
rename from kinetic/world-canvas-client-py/default.nix
rename to distros/kinetic/world-canvas-client-py/default.nix
diff --git a/kinetic/world-canvas-msgs/default.nix b/distros/kinetic/world-canvas-msgs/default.nix
similarity index 100%
rename from kinetic/world-canvas-msgs/default.nix
rename to distros/kinetic/world-canvas-msgs/default.nix
diff --git a/kinetic/world-canvas-server/default.nix b/distros/kinetic/world-canvas-server/default.nix
similarity index 100%
rename from kinetic/world-canvas-server/default.nix
rename to distros/kinetic/world-canvas-server/default.nix
diff --git a/kinetic/world-canvas-utils/default.nix b/distros/kinetic/world-canvas-utils/default.nix
similarity index 100%
rename from kinetic/world-canvas-utils/default.nix
rename to distros/kinetic/world-canvas-utils/default.nix
diff --git a/kinetic/wts-driver/default.nix b/distros/kinetic/wts-driver/default.nix
similarity index 100%
rename from kinetic/wts-driver/default.nix
rename to distros/kinetic/wts-driver/default.nix
diff --git a/kinetic/wu-ros-tools/default.nix b/distros/kinetic/wu-ros-tools/default.nix
similarity index 100%
rename from kinetic/wu-ros-tools/default.nix
rename to distros/kinetic/wu-ros-tools/default.nix
diff --git a/kinetic/xacro/default.nix b/distros/kinetic/xacro/default.nix
similarity index 100%
rename from kinetic/xacro/default.nix
rename to distros/kinetic/xacro/default.nix
diff --git a/kinetic/xiaoqiang-bringup/default.nix b/distros/kinetic/xiaoqiang-bringup/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-bringup/default.nix
rename to distros/kinetic/xiaoqiang-bringup/default.nix
diff --git a/kinetic/xiaoqiang-controller/default.nix b/distros/kinetic/xiaoqiang-controller/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-controller/default.nix
rename to distros/kinetic/xiaoqiang-controller/default.nix
diff --git a/kinetic/xiaoqiang-depth-image-proc/default.nix b/distros/kinetic/xiaoqiang-depth-image-proc/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-depth-image-proc/default.nix
rename to distros/kinetic/xiaoqiang-depth-image-proc/default.nix
diff --git a/kinetic/xiaoqiang-description/default.nix b/distros/kinetic/xiaoqiang-description/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-description/default.nix
rename to distros/kinetic/xiaoqiang-description/default.nix
diff --git a/kinetic/xiaoqiang-driver/default.nix b/distros/kinetic/xiaoqiang-driver/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-driver/default.nix
rename to distros/kinetic/xiaoqiang-driver/default.nix
diff --git a/kinetic/xiaoqiang-freenect-camera/default.nix b/distros/kinetic/xiaoqiang-freenect-camera/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-freenect-camera/default.nix
rename to distros/kinetic/xiaoqiang-freenect-camera/default.nix
diff --git a/kinetic/xiaoqiang-freenect-launch/default.nix b/distros/kinetic/xiaoqiang-freenect-launch/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-freenect-launch/default.nix
rename to distros/kinetic/xiaoqiang-freenect-launch/default.nix
diff --git a/kinetic/xiaoqiang-freenect/default.nix b/distros/kinetic/xiaoqiang-freenect/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-freenect/default.nix
rename to distros/kinetic/xiaoqiang-freenect/default.nix
diff --git a/kinetic/xiaoqiang-monitor/default.nix b/distros/kinetic/xiaoqiang-monitor/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-monitor/default.nix
rename to distros/kinetic/xiaoqiang-monitor/default.nix
diff --git a/kinetic/xiaoqiang-msgs/default.nix b/distros/kinetic/xiaoqiang-msgs/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-msgs/default.nix
rename to distros/kinetic/xiaoqiang-msgs/default.nix
diff --git a/kinetic/xiaoqiang-navigation-example/default.nix b/distros/kinetic/xiaoqiang-navigation-example/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-navigation-example/default.nix
rename to distros/kinetic/xiaoqiang-navigation-example/default.nix
diff --git a/kinetic/xiaoqiang-navigation/default.nix b/distros/kinetic/xiaoqiang-navigation/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-navigation/default.nix
rename to distros/kinetic/xiaoqiang-navigation/default.nix
diff --git a/kinetic/xiaoqiang-server/default.nix b/distros/kinetic/xiaoqiang-server/default.nix
similarity index 100%
rename from kinetic/xiaoqiang-server/default.nix
rename to distros/kinetic/xiaoqiang-server/default.nix
diff --git a/kinetic/xiaoqiang/default.nix b/distros/kinetic/xiaoqiang/default.nix
similarity index 100%
rename from kinetic/xiaoqiang/default.nix
rename to distros/kinetic/xiaoqiang/default.nix
diff --git a/kinetic/xmlrpcpp/default.nix b/distros/kinetic/xmlrpcpp/default.nix
similarity index 100%
rename from kinetic/xmlrpcpp/default.nix
rename to distros/kinetic/xmlrpcpp/default.nix
diff --git a/kinetic/xpp-examples/default.nix b/distros/kinetic/xpp-examples/default.nix
similarity index 100%
rename from kinetic/xpp-examples/default.nix
rename to distros/kinetic/xpp-examples/default.nix
diff --git a/kinetic/xpp-hyq/default.nix b/distros/kinetic/xpp-hyq/default.nix
similarity index 100%
rename from kinetic/xpp-hyq/default.nix
rename to distros/kinetic/xpp-hyq/default.nix
diff --git a/kinetic/xpp-msgs/default.nix b/distros/kinetic/xpp-msgs/default.nix
similarity index 100%
rename from kinetic/xpp-msgs/default.nix
rename to distros/kinetic/xpp-msgs/default.nix
diff --git a/kinetic/xpp-quadrotor/default.nix b/distros/kinetic/xpp-quadrotor/default.nix
similarity index 100%
rename from kinetic/xpp-quadrotor/default.nix
rename to distros/kinetic/xpp-quadrotor/default.nix
diff --git a/kinetic/xpp-states/default.nix b/distros/kinetic/xpp-states/default.nix
similarity index 100%
rename from kinetic/xpp-states/default.nix
rename to distros/kinetic/xpp-states/default.nix
diff --git a/kinetic/xpp-vis/default.nix b/distros/kinetic/xpp-vis/default.nix
similarity index 100%
rename from kinetic/xpp-vis/default.nix
rename to distros/kinetic/xpp-vis/default.nix
diff --git a/kinetic/xpp/default.nix b/distros/kinetic/xpp/default.nix
similarity index 100%
rename from kinetic/xpp/default.nix
rename to distros/kinetic/xpp/default.nix
diff --git a/kinetic/xsens-driver/default.nix b/distros/kinetic/xsens-driver/default.nix
similarity index 100%
rename from kinetic/xsens-driver/default.nix
rename to distros/kinetic/xsens-driver/default.nix
diff --git a/kinetic/xv-11-laser-driver/default.nix b/distros/kinetic/xv-11-laser-driver/default.nix
similarity index 100%
rename from kinetic/xv-11-laser-driver/default.nix
rename to distros/kinetic/xv-11-laser-driver/default.nix
diff --git a/kinetic/yaml-cpp-0-3/default.nix b/distros/kinetic/yaml-cpp-0-3/default.nix
similarity index 100%
rename from kinetic/yaml-cpp-0-3/default.nix
rename to distros/kinetic/yaml-cpp-0-3/default.nix
diff --git a/kinetic/yocs-ar-marker-tracking/default.nix b/distros/kinetic/yocs-ar-marker-tracking/default.nix
similarity index 100%
rename from kinetic/yocs-ar-marker-tracking/default.nix
rename to distros/kinetic/yocs-ar-marker-tracking/default.nix
diff --git a/kinetic/yocs-ar-pair-approach/default.nix b/distros/kinetic/yocs-ar-pair-approach/default.nix
similarity index 100%
rename from kinetic/yocs-ar-pair-approach/default.nix
rename to distros/kinetic/yocs-ar-pair-approach/default.nix
diff --git a/kinetic/yocs-ar-pair-tracking/default.nix b/distros/kinetic/yocs-ar-pair-tracking/default.nix
similarity index 100%
rename from kinetic/yocs-ar-pair-tracking/default.nix
rename to distros/kinetic/yocs-ar-pair-tracking/default.nix
diff --git a/kinetic/yocs-cmd-vel-mux/default.nix b/distros/kinetic/yocs-cmd-vel-mux/default.nix
similarity index 100%
rename from kinetic/yocs-cmd-vel-mux/default.nix
rename to distros/kinetic/yocs-cmd-vel-mux/default.nix
diff --git a/kinetic/yocs-controllers/default.nix b/distros/kinetic/yocs-controllers/default.nix
similarity index 100%
rename from kinetic/yocs-controllers/default.nix
rename to distros/kinetic/yocs-controllers/default.nix
diff --git a/kinetic/yocs-diff-drive-pose-controller/default.nix b/distros/kinetic/yocs-diff-drive-pose-controller/default.nix
similarity index 100%
rename from kinetic/yocs-diff-drive-pose-controller/default.nix
rename to distros/kinetic/yocs-diff-drive-pose-controller/default.nix
diff --git a/kinetic/yocs-joyop/default.nix b/distros/kinetic/yocs-joyop/default.nix
similarity index 100%
rename from kinetic/yocs-joyop/default.nix
rename to distros/kinetic/yocs-joyop/default.nix
diff --git a/kinetic/yocs-keyop/default.nix b/distros/kinetic/yocs-keyop/default.nix
similarity index 100%
rename from kinetic/yocs-keyop/default.nix
rename to distros/kinetic/yocs-keyop/default.nix
diff --git a/kinetic/yocs-localization-manager/default.nix b/distros/kinetic/yocs-localization-manager/default.nix
similarity index 100%
rename from kinetic/yocs-localization-manager/default.nix
rename to distros/kinetic/yocs-localization-manager/default.nix
diff --git a/kinetic/yocs-math-toolkit/default.nix b/distros/kinetic/yocs-math-toolkit/default.nix
similarity index 100%
rename from kinetic/yocs-math-toolkit/default.nix
rename to distros/kinetic/yocs-math-toolkit/default.nix
diff --git a/kinetic/yocs-msgs/default.nix b/distros/kinetic/yocs-msgs/default.nix
similarity index 100%
rename from kinetic/yocs-msgs/default.nix
rename to distros/kinetic/yocs-msgs/default.nix
diff --git a/kinetic/yocs-navi-toolkit/default.nix b/distros/kinetic/yocs-navi-toolkit/default.nix
similarity index 100%
rename from kinetic/yocs-navi-toolkit/default.nix
rename to distros/kinetic/yocs-navi-toolkit/default.nix
diff --git a/kinetic/yocs-navigator/default.nix b/distros/kinetic/yocs-navigator/default.nix
similarity index 100%
rename from kinetic/yocs-navigator/default.nix
rename to distros/kinetic/yocs-navigator/default.nix
diff --git a/kinetic/yocs-rapps/default.nix b/distros/kinetic/yocs-rapps/default.nix
similarity index 100%
rename from kinetic/yocs-rapps/default.nix
rename to distros/kinetic/yocs-rapps/default.nix
diff --git a/kinetic/yocs-safety-controller/default.nix b/distros/kinetic/yocs-safety-controller/default.nix
similarity index 100%
rename from kinetic/yocs-safety-controller/default.nix
rename to distros/kinetic/yocs-safety-controller/default.nix
diff --git a/kinetic/yocs-velocity-smoother/default.nix b/distros/kinetic/yocs-velocity-smoother/default.nix
similarity index 100%
rename from kinetic/yocs-velocity-smoother/default.nix
rename to distros/kinetic/yocs-velocity-smoother/default.nix
diff --git a/kinetic/yocs-virtual-sensor/default.nix b/distros/kinetic/yocs-virtual-sensor/default.nix
similarity index 100%
rename from kinetic/yocs-virtual-sensor/default.nix
rename to distros/kinetic/yocs-virtual-sensor/default.nix
diff --git a/kinetic/yocs-waypoint-provider/default.nix b/distros/kinetic/yocs-waypoint-provider/default.nix
similarity index 100%
rename from kinetic/yocs-waypoint-provider/default.nix
rename to distros/kinetic/yocs-waypoint-provider/default.nix
diff --git a/kinetic/yocs-waypoints-navi/default.nix b/distros/kinetic/yocs-waypoints-navi/default.nix
similarity index 100%
rename from kinetic/yocs-waypoints-navi/default.nix
rename to distros/kinetic/yocs-waypoints-navi/default.nix
diff --git a/kinetic/yosemite-valley/default.nix b/distros/kinetic/yosemite-valley/default.nix
similarity index 100%
rename from kinetic/yosemite-valley/default.nix
rename to distros/kinetic/yosemite-valley/default.nix
diff --git a/kinetic/youbot-description/default.nix b/distros/kinetic/youbot-description/default.nix
similarity index 100%
rename from kinetic/youbot-description/default.nix
rename to distros/kinetic/youbot-description/default.nix
diff --git a/kinetic/youbot-driver/default.nix b/distros/kinetic/youbot-driver/default.nix
similarity index 100%
rename from kinetic/youbot-driver/default.nix
rename to distros/kinetic/youbot-driver/default.nix
diff --git a/kinetic/ypspur-ros/default.nix b/distros/kinetic/ypspur-ros/default.nix
similarity index 100%
rename from kinetic/ypspur-ros/default.nix
rename to distros/kinetic/ypspur-ros/default.nix
diff --git a/kinetic/ypspur/default.nix b/distros/kinetic/ypspur/default.nix
similarity index 100%
rename from kinetic/ypspur/default.nix
rename to distros/kinetic/ypspur/default.nix
diff --git a/kinetic/yujin-ocs/default.nix b/distros/kinetic/yujin-ocs/default.nix
similarity index 100%
rename from kinetic/yujin-ocs/default.nix
rename to distros/kinetic/yujin-ocs/default.nix
diff --git a/kinetic/zbar-ros/default.nix b/distros/kinetic/zbar-ros/default.nix
similarity index 100%
rename from kinetic/zbar-ros/default.nix
rename to distros/kinetic/zbar-ros/default.nix
diff --git a/kinetic/zeroconf-avahi-demos/default.nix b/distros/kinetic/zeroconf-avahi-demos/default.nix
similarity index 100%
rename from kinetic/zeroconf-avahi-demos/default.nix
rename to distros/kinetic/zeroconf-avahi-demos/default.nix
diff --git a/kinetic/zeroconf-avahi-suite/default.nix b/distros/kinetic/zeroconf-avahi-suite/default.nix
similarity index 100%
rename from kinetic/zeroconf-avahi-suite/default.nix
rename to distros/kinetic/zeroconf-avahi-suite/default.nix
diff --git a/kinetic/zeroconf-avahi/default.nix b/distros/kinetic/zeroconf-avahi/default.nix
similarity index 100%
rename from kinetic/zeroconf-avahi/default.nix
rename to distros/kinetic/zeroconf-avahi/default.nix
diff --git a/kinetic/zeroconf-jmdns-suite/default.nix b/distros/kinetic/zeroconf-jmdns-suite/default.nix
similarity index 100%
rename from kinetic/zeroconf-jmdns-suite/default.nix
rename to distros/kinetic/zeroconf-jmdns-suite/default.nix
diff --git a/kinetic/zeroconf-msgs/default.nix b/distros/kinetic/zeroconf-msgs/default.nix
similarity index 100%
rename from kinetic/zeroconf-msgs/default.nix
rename to distros/kinetic/zeroconf-msgs/default.nix
diff --git a/melodic/abb-driver/default.nix b/distros/melodic/abb-driver/default.nix
similarity index 100%
rename from melodic/abb-driver/default.nix
rename to distros/melodic/abb-driver/default.nix
diff --git a/melodic/abb-irb2400-moveit-config/default.nix b/distros/melodic/abb-irb2400-moveit-config/default.nix
similarity index 100%
rename from melodic/abb-irb2400-moveit-config/default.nix
rename to distros/melodic/abb-irb2400-moveit-config/default.nix
diff --git a/melodic/abb-irb2400-moveit-plugins/default.nix b/distros/melodic/abb-irb2400-moveit-plugins/default.nix
similarity index 100%
rename from melodic/abb-irb2400-moveit-plugins/default.nix
rename to distros/melodic/abb-irb2400-moveit-plugins/default.nix
diff --git a/melodic/abb-irb2400-support/default.nix b/distros/melodic/abb-irb2400-support/default.nix
similarity index 100%
rename from melodic/abb-irb2400-support/default.nix
rename to distros/melodic/abb-irb2400-support/default.nix
diff --git a/melodic/abb-irb4400-support/default.nix b/distros/melodic/abb-irb4400-support/default.nix
similarity index 100%
rename from melodic/abb-irb4400-support/default.nix
rename to distros/melodic/abb-irb4400-support/default.nix
diff --git a/melodic/abb-irb5400-support/default.nix b/distros/melodic/abb-irb5400-support/default.nix
similarity index 100%
rename from melodic/abb-irb5400-support/default.nix
rename to distros/melodic/abb-irb5400-support/default.nix
diff --git a/melodic/abb-irb6600-support/default.nix b/distros/melodic/abb-irb6600-support/default.nix
similarity index 100%
rename from melodic/abb-irb6600-support/default.nix
rename to distros/melodic/abb-irb6600-support/default.nix
diff --git a/melodic/abb-irb6640-moveit-config/default.nix b/distros/melodic/abb-irb6640-moveit-config/default.nix
similarity index 100%
rename from melodic/abb-irb6640-moveit-config/default.nix
rename to distros/melodic/abb-irb6640-moveit-config/default.nix
diff --git a/melodic/abb-irb6640-support/default.nix b/distros/melodic/abb-irb6640-support/default.nix
similarity index 100%
rename from melodic/abb-irb6640-support/default.nix
rename to distros/melodic/abb-irb6640-support/default.nix
diff --git a/melodic/abb-resources/default.nix b/distros/melodic/abb-resources/default.nix
similarity index 100%
rename from melodic/abb-resources/default.nix
rename to distros/melodic/abb-resources/default.nix
diff --git a/melodic/abb/default.nix b/distros/melodic/abb/default.nix
similarity index 100%
rename from melodic/abb/default.nix
rename to distros/melodic/abb/default.nix
diff --git a/melodic/abseil-cpp/default.nix b/distros/melodic/abseil-cpp/default.nix
similarity index 100%
rename from melodic/abseil-cpp/default.nix
rename to distros/melodic/abseil-cpp/default.nix
diff --git a/melodic/acado/default.nix b/distros/melodic/acado/default.nix
similarity index 100%
rename from melodic/acado/default.nix
rename to distros/melodic/acado/default.nix
diff --git a/melodic/access-point-control/default.nix b/distros/melodic/access-point-control/default.nix
similarity index 100%
rename from melodic/access-point-control/default.nix
rename to distros/melodic/access-point-control/default.nix
diff --git a/melodic/ackermann-msgs/default.nix b/distros/melodic/ackermann-msgs/default.nix
similarity index 100%
rename from melodic/ackermann-msgs/default.nix
rename to distros/melodic/ackermann-msgs/default.nix
diff --git a/melodic/ackermann-steering-controller/default.nix b/distros/melodic/ackermann-steering-controller/default.nix
similarity index 100%
rename from melodic/ackermann-steering-controller/default.nix
rename to distros/melodic/ackermann-steering-controller/default.nix
diff --git a/melodic/actionlib-lisp/default.nix b/distros/melodic/actionlib-lisp/default.nix
similarity index 100%
rename from melodic/actionlib-lisp/default.nix
rename to distros/melodic/actionlib-lisp/default.nix
diff --git a/melodic/actionlib-msgs/default.nix b/distros/melodic/actionlib-msgs/default.nix
similarity index 100%
rename from melodic/actionlib-msgs/default.nix
rename to distros/melodic/actionlib-msgs/default.nix
diff --git a/melodic/actionlib-tutorials/default.nix b/distros/melodic/actionlib-tutorials/default.nix
similarity index 100%
rename from melodic/actionlib-tutorials/default.nix
rename to distros/melodic/actionlib-tutorials/default.nix
diff --git a/melodic/actionlib/default.nix b/distros/melodic/actionlib/default.nix
similarity index 100%
rename from melodic/actionlib/default.nix
rename to distros/melodic/actionlib/default.nix
diff --git a/melodic/adi-driver/default.nix b/distros/melodic/adi-driver/default.nix
similarity index 100%
rename from melodic/adi-driver/default.nix
rename to distros/melodic/adi-driver/default.nix
diff --git a/melodic/agni-tf-tools/default.nix b/distros/melodic/agni-tf-tools/default.nix
similarity index 100%
rename from melodic/agni-tf-tools/default.nix
rename to distros/melodic/agni-tf-tools/default.nix
diff --git a/melodic/ainstein-radar-drivers/default.nix b/distros/melodic/ainstein-radar-drivers/default.nix
similarity index 100%
rename from melodic/ainstein-radar-drivers/default.nix
rename to distros/melodic/ainstein-radar-drivers/default.nix
diff --git a/melodic/ainstein-radar-filters/default.nix b/distros/melodic/ainstein-radar-filters/default.nix
similarity index 100%
rename from melodic/ainstein-radar-filters/default.nix
rename to distros/melodic/ainstein-radar-filters/default.nix
diff --git a/melodic/ainstein-radar-gazebo-plugins/default.nix b/distros/melodic/ainstein-radar-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/ainstein-radar-gazebo-plugins/default.nix
rename to distros/melodic/ainstein-radar-gazebo-plugins/default.nix
diff --git a/melodic/ainstein-radar-msgs/default.nix b/distros/melodic/ainstein-radar-msgs/default.nix
similarity index 100%
rename from melodic/ainstein-radar-msgs/default.nix
rename to distros/melodic/ainstein-radar-msgs/default.nix
diff --git a/melodic/ainstein-radar-rviz-plugins/default.nix b/distros/melodic/ainstein-radar-rviz-plugins/default.nix
similarity index 100%
rename from melodic/ainstein-radar-rviz-plugins/default.nix
rename to distros/melodic/ainstein-radar-rviz-plugins/default.nix
diff --git a/melodic/ainstein-radar-tools/default.nix b/distros/melodic/ainstein-radar-tools/default.nix
similarity index 100%
rename from melodic/ainstein-radar-tools/default.nix
rename to distros/melodic/ainstein-radar-tools/default.nix
diff --git a/melodic/ainstein-radar/default.nix b/distros/melodic/ainstein-radar/default.nix
similarity index 100%
rename from melodic/ainstein-radar/default.nix
rename to distros/melodic/ainstein-radar/default.nix
diff --git a/melodic/allocators/default.nix b/distros/melodic/allocators/default.nix
similarity index 100%
rename from melodic/allocators/default.nix
rename to distros/melodic/allocators/default.nix
diff --git a/melodic/amcl/default.nix b/distros/melodic/amcl/default.nix
similarity index 100%
rename from melodic/amcl/default.nix
rename to distros/melodic/amcl/default.nix
diff --git a/melodic/angles/default.nix b/distros/melodic/angles/default.nix
similarity index 100%
rename from melodic/angles/default.nix
rename to distros/melodic/angles/default.nix
diff --git a/melodic/app-manager/default.nix b/distros/melodic/app-manager/default.nix
similarity index 100%
rename from melodic/app-manager/default.nix
rename to distros/melodic/app-manager/default.nix
diff --git a/melodic/apriltag-ros/default.nix b/distros/melodic/apriltag-ros/default.nix
similarity index 100%
rename from melodic/apriltag-ros/default.nix
rename to distros/melodic/apriltag-ros/default.nix
diff --git a/melodic/apriltag/default.nix b/distros/melodic/apriltag/default.nix
similarity index 100%
rename from melodic/apriltag/default.nix
rename to distros/melodic/apriltag/default.nix
diff --git a/melodic/ar-track-alvar-msgs/default.nix b/distros/melodic/ar-track-alvar-msgs/default.nix
similarity index 100%
rename from melodic/ar-track-alvar-msgs/default.nix
rename to distros/melodic/ar-track-alvar-msgs/default.nix
diff --git a/melodic/ar-track-alvar/default.nix b/distros/melodic/ar-track-alvar/default.nix
similarity index 100%
rename from melodic/ar-track-alvar/default.nix
rename to distros/melodic/ar-track-alvar/default.nix
diff --git a/melodic/arbotix-controllers/default.nix b/distros/melodic/arbotix-controllers/default.nix
similarity index 100%
rename from melodic/arbotix-controllers/default.nix
rename to distros/melodic/arbotix-controllers/default.nix
diff --git a/melodic/arbotix-firmware/default.nix b/distros/melodic/arbotix-firmware/default.nix
similarity index 100%
rename from melodic/arbotix-firmware/default.nix
rename to distros/melodic/arbotix-firmware/default.nix
diff --git a/melodic/arbotix-msgs/default.nix b/distros/melodic/arbotix-msgs/default.nix
similarity index 100%
rename from melodic/arbotix-msgs/default.nix
rename to distros/melodic/arbotix-msgs/default.nix
diff --git a/melodic/arbotix-python/default.nix b/distros/melodic/arbotix-python/default.nix
similarity index 100%
rename from melodic/arbotix-python/default.nix
rename to distros/melodic/arbotix-python/default.nix
diff --git a/melodic/arbotix-sensors/default.nix b/distros/melodic/arbotix-sensors/default.nix
similarity index 100%
rename from melodic/arbotix-sensors/default.nix
rename to distros/melodic/arbotix-sensors/default.nix
diff --git a/melodic/arbotix/default.nix b/distros/melodic/arbotix/default.nix
similarity index 100%
rename from melodic/arbotix/default.nix
rename to distros/melodic/arbotix/default.nix
diff --git a/melodic/ariles-ros/default.nix b/distros/melodic/ariles-ros/default.nix
similarity index 100%
rename from melodic/ariles-ros/default.nix
rename to distros/melodic/ariles-ros/default.nix
diff --git a/melodic/aruco-detect/default.nix b/distros/melodic/aruco-detect/default.nix
similarity index 100%
rename from melodic/aruco-detect/default.nix
rename to distros/melodic/aruco-detect/default.nix
diff --git a/melodic/asmach-tutorials/default.nix b/distros/melodic/asmach-tutorials/default.nix
similarity index 100%
rename from melodic/asmach-tutorials/default.nix
rename to distros/melodic/asmach-tutorials/default.nix
diff --git a/melodic/asmach/default.nix b/distros/melodic/asmach/default.nix
similarity index 100%
rename from melodic/asmach/default.nix
rename to distros/melodic/asmach/default.nix
diff --git a/melodic/asr-msgs/default.nix b/distros/melodic/asr-msgs/default.nix
similarity index 100%
rename from melodic/asr-msgs/default.nix
rename to distros/melodic/asr-msgs/default.nix
diff --git a/melodic/assimp-devel/default.nix b/distros/melodic/assimp-devel/default.nix
similarity index 100%
rename from melodic/assimp-devel/default.nix
rename to distros/melodic/assimp-devel/default.nix
diff --git a/melodic/assisted-teleop/default.nix b/distros/melodic/assisted-teleop/default.nix
similarity index 100%
rename from melodic/assisted-teleop/default.nix
rename to distros/melodic/assisted-teleop/default.nix
diff --git a/melodic/astuff-sensor-msgs/default.nix b/distros/melodic/astuff-sensor-msgs/default.nix
similarity index 100%
rename from melodic/astuff-sensor-msgs/default.nix
rename to distros/melodic/astuff-sensor-msgs/default.nix
diff --git a/melodic/async-comm/default.nix b/distros/melodic/async-comm/default.nix
similarity index 100%
rename from melodic/async-comm/default.nix
rename to distros/melodic/async-comm/default.nix
diff --git a/melodic/async-web-server-cpp/default.nix b/distros/melodic/async-web-server-cpp/default.nix
similarity index 100%
rename from melodic/async-web-server-cpp/default.nix
rename to distros/melodic/async-web-server-cpp/default.nix
diff --git a/melodic/audibot-description/default.nix b/distros/melodic/audibot-description/default.nix
similarity index 100%
rename from melodic/audibot-description/default.nix
rename to distros/melodic/audibot-description/default.nix
diff --git a/melodic/audibot-gazebo/default.nix b/distros/melodic/audibot-gazebo/default.nix
similarity index 100%
rename from melodic/audibot-gazebo/default.nix
rename to distros/melodic/audibot-gazebo/default.nix
diff --git a/melodic/audibot/default.nix b/distros/melodic/audibot/default.nix
similarity index 100%
rename from melodic/audibot/default.nix
rename to distros/melodic/audibot/default.nix
diff --git a/melodic/audio-capture/default.nix b/distros/melodic/audio-capture/default.nix
similarity index 100%
rename from melodic/audio-capture/default.nix
rename to distros/melodic/audio-capture/default.nix
diff --git a/melodic/audio-common-msgs/default.nix b/distros/melodic/audio-common-msgs/default.nix
similarity index 100%
rename from melodic/audio-common-msgs/default.nix
rename to distros/melodic/audio-common-msgs/default.nix
diff --git a/melodic/audio-common/default.nix b/distros/melodic/audio-common/default.nix
similarity index 100%
rename from melodic/audio-common/default.nix
rename to distros/melodic/audio-common/default.nix
diff --git a/melodic/audio-play/default.nix b/distros/melodic/audio-play/default.nix
similarity index 100%
rename from melodic/audio-play/default.nix
rename to distros/melodic/audio-play/default.nix
diff --git a/melodic/automotive-autonomy-msgs/default.nix b/distros/melodic/automotive-autonomy-msgs/default.nix
similarity index 100%
rename from melodic/automotive-autonomy-msgs/default.nix
rename to distros/melodic/automotive-autonomy-msgs/default.nix
diff --git a/melodic/automotive-navigation-msgs/default.nix b/distros/melodic/automotive-navigation-msgs/default.nix
similarity index 100%
rename from melodic/automotive-navigation-msgs/default.nix
rename to distros/melodic/automotive-navigation-msgs/default.nix
diff --git a/melodic/automotive-platform-msgs/default.nix b/distros/melodic/automotive-platform-msgs/default.nix
similarity index 100%
rename from melodic/automotive-platform-msgs/default.nix
rename to distros/melodic/automotive-platform-msgs/default.nix
diff --git a/melodic/avt-vimba-camera/default.nix b/distros/melodic/avt-vimba-camera/default.nix
similarity index 100%
rename from melodic/avt-vimba-camera/default.nix
rename to distros/melodic/avt-vimba-camera/default.nix
diff --git a/melodic/aws-common/default.nix b/distros/melodic/aws-common/default.nix
similarity index 100%
rename from melodic/aws-common/default.nix
rename to distros/melodic/aws-common/default.nix
diff --git a/melodic/aws-ros1-common/default.nix b/distros/melodic/aws-ros1-common/default.nix
similarity index 100%
rename from melodic/aws-ros1-common/default.nix
rename to distros/melodic/aws-ros1-common/default.nix
diff --git a/melodic/backward-ros/default.nix b/distros/melodic/backward-ros/default.nix
similarity index 100%
rename from melodic/backward-ros/default.nix
rename to distros/melodic/backward-ros/default.nix
diff --git a/melodic/bagger/default.nix b/distros/melodic/bagger/default.nix
similarity index 100%
rename from melodic/bagger/default.nix
rename to distros/melodic/bagger/default.nix
diff --git a/melodic/baldor/default.nix b/distros/melodic/baldor/default.nix
similarity index 100%
rename from melodic/baldor/default.nix
rename to distros/melodic/baldor/default.nix
diff --git a/melodic/base-local-planner/default.nix b/distros/melodic/base-local-planner/default.nix
similarity index 100%
rename from melodic/base-local-planner/default.nix
rename to distros/melodic/base-local-planner/default.nix
diff --git a/melodic/bayesian-belief-networks/default.nix b/distros/melodic/bayesian-belief-networks/default.nix
similarity index 100%
rename from melodic/bayesian-belief-networks/default.nix
rename to distros/melodic/bayesian-belief-networks/default.nix
diff --git a/melodic/behaviortree-cpp-v3/default.nix b/distros/melodic/behaviortree-cpp-v3/default.nix
similarity index 100%
rename from melodic/behaviortree-cpp-v3/default.nix
rename to distros/melodic/behaviortree-cpp-v3/default.nix
diff --git a/melodic/behaviortree-cpp/default.nix b/distros/melodic/behaviortree-cpp/default.nix
similarity index 100%
rename from melodic/behaviortree-cpp/default.nix
rename to distros/melodic/behaviortree-cpp/default.nix
diff --git a/melodic/bfl/default.nix b/distros/melodic/bfl/default.nix
similarity index 100%
rename from melodic/bfl/default.nix
rename to distros/melodic/bfl/default.nix
diff --git a/melodic/blender-gazebo/default.nix b/distros/melodic/blender-gazebo/default.nix
similarity index 100%
rename from melodic/blender-gazebo/default.nix
rename to distros/melodic/blender-gazebo/default.nix
diff --git a/melodic/bond-core/default.nix b/distros/melodic/bond-core/default.nix
similarity index 100%
rename from melodic/bond-core/default.nix
rename to distros/melodic/bond-core/default.nix
diff --git a/melodic/bond/default.nix b/distros/melodic/bond/default.nix
similarity index 100%
rename from melodic/bond/default.nix
rename to distros/melodic/bond/default.nix
diff --git a/melodic/bondcpp/default.nix b/distros/melodic/bondcpp/default.nix
similarity index 100%
rename from melodic/bondcpp/default.nix
rename to distros/melodic/bondcpp/default.nix
diff --git a/melodic/bondpy/default.nix b/distros/melodic/bondpy/default.nix
similarity index 100%
rename from melodic/bondpy/default.nix
rename to distros/melodic/bondpy/default.nix
diff --git a/melodic/brics-actuator/default.nix b/distros/melodic/brics-actuator/default.nix
similarity index 100%
rename from melodic/brics-actuator/default.nix
rename to distros/melodic/brics-actuator/default.nix
diff --git a/melodic/calibration-estimation/default.nix b/distros/melodic/calibration-estimation/default.nix
similarity index 100%
rename from melodic/calibration-estimation/default.nix
rename to distros/melodic/calibration-estimation/default.nix
diff --git a/melodic/calibration-launch/default.nix b/distros/melodic/calibration-launch/default.nix
similarity index 100%
rename from melodic/calibration-launch/default.nix
rename to distros/melodic/calibration-launch/default.nix
diff --git a/melodic/calibration-msgs/default.nix b/distros/melodic/calibration-msgs/default.nix
similarity index 100%
rename from melodic/calibration-msgs/default.nix
rename to distros/melodic/calibration-msgs/default.nix
diff --git a/melodic/calibration-setup-helper/default.nix b/distros/melodic/calibration-setup-helper/default.nix
similarity index 100%
rename from melodic/calibration-setup-helper/default.nix
rename to distros/melodic/calibration-setup-helper/default.nix
diff --git a/melodic/calibration/default.nix b/distros/melodic/calibration/default.nix
similarity index 100%
rename from melodic/calibration/default.nix
rename to distros/melodic/calibration/default.nix
diff --git a/melodic/camera-calibration-parsers/default.nix b/distros/melodic/camera-calibration-parsers/default.nix
similarity index 100%
rename from melodic/camera-calibration-parsers/default.nix
rename to distros/melodic/camera-calibration-parsers/default.nix
diff --git a/melodic/camera-calibration/default.nix b/distros/melodic/camera-calibration/default.nix
similarity index 100%
rename from melodic/camera-calibration/default.nix
rename to distros/melodic/camera-calibration/default.nix
diff --git a/melodic/camera-info-manager-py/default.nix b/distros/melodic/camera-info-manager-py/default.nix
similarity index 100%
rename from melodic/camera-info-manager-py/default.nix
rename to distros/melodic/camera-info-manager-py/default.nix
diff --git a/melodic/camera-info-manager/default.nix b/distros/melodic/camera-info-manager/default.nix
similarity index 100%
rename from melodic/camera-info-manager/default.nix
rename to distros/melodic/camera-info-manager/default.nix
diff --git a/melodic/camera-umd/default.nix b/distros/melodic/camera-umd/default.nix
similarity index 100%
rename from melodic/camera-umd/default.nix
rename to distros/melodic/camera-umd/default.nix
diff --git a/melodic/can-msgs/default.nix b/distros/melodic/can-msgs/default.nix
similarity index 100%
rename from melodic/can-msgs/default.nix
rename to distros/melodic/can-msgs/default.nix
diff --git a/melodic/canopen-402/default.nix b/distros/melodic/canopen-402/default.nix
similarity index 100%
rename from melodic/canopen-402/default.nix
rename to distros/melodic/canopen-402/default.nix
diff --git a/melodic/canopen-chain-node/default.nix b/distros/melodic/canopen-chain-node/default.nix
similarity index 100%
rename from melodic/canopen-chain-node/default.nix
rename to distros/melodic/canopen-chain-node/default.nix
diff --git a/melodic/canopen-master/default.nix b/distros/melodic/canopen-master/default.nix
similarity index 100%
rename from melodic/canopen-master/default.nix
rename to distros/melodic/canopen-master/default.nix
diff --git a/melodic/canopen-motor-node/default.nix b/distros/melodic/canopen-motor-node/default.nix
similarity index 100%
rename from melodic/canopen-motor-node/default.nix
rename to distros/melodic/canopen-motor-node/default.nix
diff --git a/melodic/capabilities/default.nix b/distros/melodic/capabilities/default.nix
similarity index 100%
rename from melodic/capabilities/default.nix
rename to distros/melodic/capabilities/default.nix
diff --git a/melodic/carrot-planner/default.nix b/distros/melodic/carrot-planner/default.nix
similarity index 100%
rename from melodic/carrot-planner/default.nix
rename to distros/melodic/carrot-planner/default.nix
diff --git a/melodic/cartesian-msgs/default.nix b/distros/melodic/cartesian-msgs/default.nix
similarity index 100%
rename from melodic/cartesian-msgs/default.nix
rename to distros/melodic/cartesian-msgs/default.nix
diff --git a/melodic/cartographer-ros-msgs/default.nix b/distros/melodic/cartographer-ros-msgs/default.nix
similarity index 100%
rename from melodic/cartographer-ros-msgs/default.nix
rename to distros/melodic/cartographer-ros-msgs/default.nix
diff --git a/melodic/cartographer-ros/default.nix b/distros/melodic/cartographer-ros/default.nix
similarity index 100%
rename from melodic/cartographer-ros/default.nix
rename to distros/melodic/cartographer-ros/default.nix
diff --git a/melodic/cartographer-rviz/default.nix b/distros/melodic/cartographer-rviz/default.nix
similarity index 100%
rename from melodic/cartographer-rviz/default.nix
rename to distros/melodic/cartographer-rviz/default.nix
diff --git a/melodic/cartographer/default.nix b/distros/melodic/cartographer/default.nix
similarity index 100%
rename from melodic/cartographer/default.nix
rename to distros/melodic/cartographer/default.nix
diff --git a/melodic/catch-ros/default.nix b/distros/melodic/catch-ros/default.nix
similarity index 100%
rename from melodic/catch-ros/default.nix
rename to distros/melodic/catch-ros/default.nix
diff --git a/melodic/catkin-pip/default.nix b/distros/melodic/catkin-pip/default.nix
similarity index 100%
rename from melodic/catkin-pip/default.nix
rename to distros/melodic/catkin-pip/default.nix
diff --git a/melodic/catkin-virtualenv/default.nix b/distros/melodic/catkin-virtualenv/default.nix
similarity index 100%
rename from melodic/catkin-virtualenv/default.nix
rename to distros/melodic/catkin-virtualenv/default.nix
diff --git a/melodic/catkin/default.nix b/distros/melodic/catkin/default.nix
similarity index 100%
rename from melodic/catkin/default.nix
rename to distros/melodic/catkin/default.nix
diff --git a/melodic/checkerboard-detector/default.nix b/distros/melodic/checkerboard-detector/default.nix
similarity index 100%
rename from melodic/checkerboard-detector/default.nix
rename to distros/melodic/checkerboard-detector/default.nix
diff --git a/melodic/chomp-motion-planner/default.nix b/distros/melodic/chomp-motion-planner/default.nix
similarity index 100%
rename from melodic/chomp-motion-planner/default.nix
rename to distros/melodic/chomp-motion-planner/default.nix
diff --git a/melodic/cis-camera/default.nix b/distros/melodic/cis-camera/default.nix
similarity index 100%
rename from melodic/cis-camera/default.nix
rename to distros/melodic/cis-camera/default.nix
diff --git a/melodic/cl-tf/default.nix b/distros/melodic/cl-tf/default.nix
similarity index 100%
rename from melodic/cl-tf/default.nix
rename to distros/melodic/cl-tf/default.nix
diff --git a/melodic/cl-tf2/default.nix b/distros/melodic/cl-tf2/default.nix
similarity index 100%
rename from melodic/cl-tf2/default.nix
rename to distros/melodic/cl-tf2/default.nix
diff --git a/melodic/cl-transforms-stamped/default.nix b/distros/melodic/cl-transforms-stamped/default.nix
similarity index 100%
rename from melodic/cl-transforms-stamped/default.nix
rename to distros/melodic/cl-transforms-stamped/default.nix
diff --git a/melodic/cl-transforms/default.nix b/distros/melodic/cl-transforms/default.nix
similarity index 100%
rename from melodic/cl-transforms/default.nix
rename to distros/melodic/cl-transforms/default.nix
diff --git a/melodic/cl-urdf/default.nix b/distros/melodic/cl-urdf/default.nix
similarity index 100%
rename from melodic/cl-urdf/default.nix
rename to distros/melodic/cl-urdf/default.nix
diff --git a/melodic/cl-utils/default.nix b/distros/melodic/cl-utils/default.nix
similarity index 100%
rename from melodic/cl-utils/default.nix
rename to distros/melodic/cl-utils/default.nix
diff --git a/melodic/class-loader/default.nix b/distros/melodic/class-loader/default.nix
similarity index 100%
rename from melodic/class-loader/default.nix
rename to distros/melodic/class-loader/default.nix
diff --git a/melodic/clear-costmap-recovery/default.nix b/distros/melodic/clear-costmap-recovery/default.nix
similarity index 100%
rename from melodic/clear-costmap-recovery/default.nix
rename to distros/melodic/clear-costmap-recovery/default.nix
diff --git a/melodic/clock-relay/default.nix b/distros/melodic/clock-relay/default.nix
similarity index 100%
rename from melodic/clock-relay/default.nix
rename to distros/melodic/clock-relay/default.nix
diff --git a/melodic/cloudwatch-logger/default.nix b/distros/melodic/cloudwatch-logger/default.nix
similarity index 100%
rename from melodic/cloudwatch-logger/default.nix
rename to distros/melodic/cloudwatch-logger/default.nix
diff --git a/melodic/cloudwatch-logs-common/default.nix b/distros/melodic/cloudwatch-logs-common/default.nix
similarity index 100%
rename from melodic/cloudwatch-logs-common/default.nix
rename to distros/melodic/cloudwatch-logs-common/default.nix
diff --git a/melodic/cloudwatch-metrics-collector/default.nix b/distros/melodic/cloudwatch-metrics-collector/default.nix
similarity index 100%
rename from melodic/cloudwatch-metrics-collector/default.nix
rename to distros/melodic/cloudwatch-metrics-collector/default.nix
diff --git a/melodic/cloudwatch-metrics-common/default.nix b/distros/melodic/cloudwatch-metrics-common/default.nix
similarity index 100%
rename from melodic/cloudwatch-metrics-common/default.nix
rename to distros/melodic/cloudwatch-metrics-common/default.nix
diff --git a/melodic/cmake-modules/default.nix b/distros/melodic/cmake-modules/default.nix
similarity index 100%
rename from melodic/cmake-modules/default.nix
rename to distros/melodic/cmake-modules/default.nix
diff --git a/melodic/cnn-bridge/default.nix b/distros/melodic/cnn-bridge/default.nix
similarity index 100%
rename from melodic/cnn-bridge/default.nix
rename to distros/melodic/cnn-bridge/default.nix
diff --git a/melodic/cob-3d-mapping-msgs/default.nix b/distros/melodic/cob-3d-mapping-msgs/default.nix
similarity index 100%
rename from melodic/cob-3d-mapping-msgs/default.nix
rename to distros/melodic/cob-3d-mapping-msgs/default.nix
diff --git a/melodic/cob-actions/default.nix b/distros/melodic/cob-actions/default.nix
similarity index 100%
rename from melodic/cob-actions/default.nix
rename to distros/melodic/cob-actions/default.nix
diff --git a/melodic/cob-android-msgs/default.nix b/distros/melodic/cob-android-msgs/default.nix
similarity index 100%
rename from melodic/cob-android-msgs/default.nix
rename to distros/melodic/cob-android-msgs/default.nix
diff --git a/melodic/cob-android-resource-server/default.nix b/distros/melodic/cob-android-resource-server/default.nix
similarity index 100%
rename from melodic/cob-android-resource-server/default.nix
rename to distros/melodic/cob-android-resource-server/default.nix
diff --git a/melodic/cob-android-script-server/default.nix b/distros/melodic/cob-android-script-server/default.nix
similarity index 100%
rename from melodic/cob-android-script-server/default.nix
rename to distros/melodic/cob-android-script-server/default.nix
diff --git a/melodic/cob-android-settings/default.nix b/distros/melodic/cob-android-settings/default.nix
similarity index 100%
rename from melodic/cob-android-settings/default.nix
rename to distros/melodic/cob-android-settings/default.nix
diff --git a/melodic/cob-android/default.nix b/distros/melodic/cob-android/default.nix
similarity index 100%
rename from melodic/cob-android/default.nix
rename to distros/melodic/cob-android/default.nix
diff --git a/melodic/cob-base-controller-utils/default.nix b/distros/melodic/cob-base-controller-utils/default.nix
similarity index 100%
rename from melodic/cob-base-controller-utils/default.nix
rename to distros/melodic/cob-base-controller-utils/default.nix
diff --git a/melodic/cob-base-drive-chain/default.nix b/distros/melodic/cob-base-drive-chain/default.nix
similarity index 100%
rename from melodic/cob-base-drive-chain/default.nix
rename to distros/melodic/cob-base-drive-chain/default.nix
diff --git a/melodic/cob-base-velocity-smoother/default.nix b/distros/melodic/cob-base-velocity-smoother/default.nix
similarity index 100%
rename from melodic/cob-base-velocity-smoother/default.nix
rename to distros/melodic/cob-base-velocity-smoother/default.nix
diff --git a/melodic/cob-bms-driver/default.nix b/distros/melodic/cob-bms-driver/default.nix
similarity index 100%
rename from melodic/cob-bms-driver/default.nix
rename to distros/melodic/cob-bms-driver/default.nix
diff --git a/melodic/cob-calibration-data/default.nix b/distros/melodic/cob-calibration-data/default.nix
similarity index 100%
rename from melodic/cob-calibration-data/default.nix
rename to distros/melodic/cob-calibration-data/default.nix
diff --git a/melodic/cob-cam3d-throttle/default.nix b/distros/melodic/cob-cam3d-throttle/default.nix
similarity index 100%
rename from melodic/cob-cam3d-throttle/default.nix
rename to distros/melodic/cob-cam3d-throttle/default.nix
diff --git a/melodic/cob-camera-sensors/default.nix b/distros/melodic/cob-camera-sensors/default.nix
similarity index 100%
rename from melodic/cob-camera-sensors/default.nix
rename to distros/melodic/cob-camera-sensors/default.nix
diff --git a/melodic/cob-canopen-motor/default.nix b/distros/melodic/cob-canopen-motor/default.nix
similarity index 100%
rename from melodic/cob-canopen-motor/default.nix
rename to distros/melodic/cob-canopen-motor/default.nix
diff --git a/melodic/cob-cartesian-controller/default.nix b/distros/melodic/cob-cartesian-controller/default.nix
similarity index 100%
rename from melodic/cob-cartesian-controller/default.nix
rename to distros/melodic/cob-cartesian-controller/default.nix
diff --git a/melodic/cob-collision-monitor/default.nix b/distros/melodic/cob-collision-monitor/default.nix
similarity index 100%
rename from melodic/cob-collision-monitor/default.nix
rename to distros/melodic/cob-collision-monitor/default.nix
diff --git a/melodic/cob-collision-velocity-filter/default.nix b/distros/melodic/cob-collision-velocity-filter/default.nix
similarity index 100%
rename from melodic/cob-collision-velocity-filter/default.nix
rename to distros/melodic/cob-collision-velocity-filter/default.nix
diff --git a/melodic/cob-command-gui/default.nix b/distros/melodic/cob-command-gui/default.nix
similarity index 100%
rename from melodic/cob-command-gui/default.nix
rename to distros/melodic/cob-command-gui/default.nix
diff --git a/melodic/cob-command-tools/default.nix b/distros/melodic/cob-command-tools/default.nix
similarity index 100%
rename from melodic/cob-command-tools/default.nix
rename to distros/melodic/cob-command-tools/default.nix
diff --git a/melodic/cob-common/default.nix b/distros/melodic/cob-common/default.nix
similarity index 100%
rename from melodic/cob-common/default.nix
rename to distros/melodic/cob-common/default.nix
diff --git a/melodic/cob-control-mode-adapter/default.nix b/distros/melodic/cob-control-mode-adapter/default.nix
similarity index 100%
rename from melodic/cob-control-mode-adapter/default.nix
rename to distros/melodic/cob-control-mode-adapter/default.nix
diff --git a/melodic/cob-control-msgs/default.nix b/distros/melodic/cob-control-msgs/default.nix
similarity index 100%
rename from melodic/cob-control-msgs/default.nix
rename to distros/melodic/cob-control-msgs/default.nix
diff --git a/melodic/cob-control/default.nix b/distros/melodic/cob-control/default.nix
similarity index 100%
rename from melodic/cob-control/default.nix
rename to distros/melodic/cob-control/default.nix
diff --git a/melodic/cob-dashboard/default.nix b/distros/melodic/cob-dashboard/default.nix
similarity index 100%
rename from melodic/cob-dashboard/default.nix
rename to distros/melodic/cob-dashboard/default.nix
diff --git a/melodic/cob-default-env-config/default.nix b/distros/melodic/cob-default-env-config/default.nix
similarity index 100%
rename from melodic/cob-default-env-config/default.nix
rename to distros/melodic/cob-default-env-config/default.nix
diff --git a/melodic/cob-default-robot-behavior/default.nix b/distros/melodic/cob-default-robot-behavior/default.nix
similarity index 100%
rename from melodic/cob-default-robot-behavior/default.nix
rename to distros/melodic/cob-default-robot-behavior/default.nix
diff --git a/melodic/cob-default-robot-config/default.nix b/distros/melodic/cob-default-robot-config/default.nix
similarity index 100%
rename from melodic/cob-default-robot-config/default.nix
rename to distros/melodic/cob-default-robot-config/default.nix
diff --git a/melodic/cob-description/default.nix b/distros/melodic/cob-description/default.nix
similarity index 100%
rename from melodic/cob-description/default.nix
rename to distros/melodic/cob-description/default.nix
diff --git a/melodic/cob-docker-control/default.nix b/distros/melodic/cob-docker-control/default.nix
similarity index 100%
rename from melodic/cob-docker-control/default.nix
rename to distros/melodic/cob-docker-control/default.nix
diff --git a/melodic/cob-driver/default.nix b/distros/melodic/cob-driver/default.nix
similarity index 100%
rename from melodic/cob-driver/default.nix
rename to distros/melodic/cob-driver/default.nix
diff --git a/melodic/cob-elmo-homing/default.nix b/distros/melodic/cob-elmo-homing/default.nix
similarity index 100%
rename from melodic/cob-elmo-homing/default.nix
rename to distros/melodic/cob-elmo-homing/default.nix
diff --git a/melodic/cob-environments/default.nix b/distros/melodic/cob-environments/default.nix
similarity index 100%
rename from melodic/cob-environments/default.nix
rename to distros/melodic/cob-environments/default.nix
diff --git a/melodic/cob-extern/default.nix b/distros/melodic/cob-extern/default.nix
similarity index 100%
rename from melodic/cob-extern/default.nix
rename to distros/melodic/cob-extern/default.nix
diff --git a/melodic/cob-footprint-observer/default.nix b/distros/melodic/cob-footprint-observer/default.nix
similarity index 100%
rename from melodic/cob-footprint-observer/default.nix
rename to distros/melodic/cob-footprint-observer/default.nix
diff --git a/melodic/cob-frame-tracker/default.nix b/distros/melodic/cob-frame-tracker/default.nix
similarity index 100%
rename from melodic/cob-frame-tracker/default.nix
rename to distros/melodic/cob-frame-tracker/default.nix
diff --git a/melodic/cob-gazebo-objects/default.nix b/distros/melodic/cob-gazebo-objects/default.nix
similarity index 100%
rename from melodic/cob-gazebo-objects/default.nix
rename to distros/melodic/cob-gazebo-objects/default.nix
diff --git a/melodic/cob-gazebo-plugins/default.nix b/distros/melodic/cob-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/cob-gazebo-plugins/default.nix
rename to distros/melodic/cob-gazebo-plugins/default.nix
diff --git a/melodic/cob-gazebo-ros-control/default.nix b/distros/melodic/cob-gazebo-ros-control/default.nix
similarity index 100%
rename from melodic/cob-gazebo-ros-control/default.nix
rename to distros/melodic/cob-gazebo-ros-control/default.nix
diff --git a/melodic/cob-gazebo-tools/default.nix b/distros/melodic/cob-gazebo-tools/default.nix
similarity index 100%
rename from melodic/cob-gazebo-tools/default.nix
rename to distros/melodic/cob-gazebo-tools/default.nix
diff --git a/melodic/cob-gazebo-worlds/default.nix b/distros/melodic/cob-gazebo-worlds/default.nix
similarity index 100%
rename from melodic/cob-gazebo-worlds/default.nix
rename to distros/melodic/cob-gazebo-worlds/default.nix
diff --git a/melodic/cob-generic-can/default.nix b/distros/melodic/cob-generic-can/default.nix
similarity index 100%
rename from melodic/cob-generic-can/default.nix
rename to distros/melodic/cob-generic-can/default.nix
diff --git a/melodic/cob-grasp-generation/default.nix b/distros/melodic/cob-grasp-generation/default.nix
similarity index 100%
rename from melodic/cob-grasp-generation/default.nix
rename to distros/melodic/cob-grasp-generation/default.nix
diff --git a/melodic/cob-hand-bridge/default.nix b/distros/melodic/cob-hand-bridge/default.nix
similarity index 100%
rename from melodic/cob-hand-bridge/default.nix
rename to distros/melodic/cob-hand-bridge/default.nix
diff --git a/melodic/cob-hand/default.nix b/distros/melodic/cob-hand/default.nix
similarity index 100%
rename from melodic/cob-hand/default.nix
rename to distros/melodic/cob-hand/default.nix
diff --git a/melodic/cob-hardware-config/default.nix b/distros/melodic/cob-hardware-config/default.nix
similarity index 100%
rename from melodic/cob-hardware-config/default.nix
rename to distros/melodic/cob-hardware-config/default.nix
diff --git a/melodic/cob-hardware-emulation/default.nix b/distros/melodic/cob-hardware-emulation/default.nix
similarity index 100%
rename from melodic/cob-hardware-emulation/default.nix
rename to distros/melodic/cob-hardware-emulation/default.nix
diff --git a/melodic/cob-helper-tools/default.nix b/distros/melodic/cob-helper-tools/default.nix
similarity index 100%
rename from melodic/cob-helper-tools/default.nix
rename to distros/melodic/cob-helper-tools/default.nix
diff --git a/melodic/cob-image-flip/default.nix b/distros/melodic/cob-image-flip/default.nix
similarity index 100%
rename from melodic/cob-image-flip/default.nix
rename to distros/melodic/cob-image-flip/default.nix
diff --git a/melodic/cob-interactive-teleop/default.nix b/distros/melodic/cob-interactive-teleop/default.nix
similarity index 100%
rename from melodic/cob-interactive-teleop/default.nix
rename to distros/melodic/cob-interactive-teleop/default.nix
diff --git a/melodic/cob-light/default.nix b/distros/melodic/cob-light/default.nix
similarity index 100%
rename from melodic/cob-light/default.nix
rename to distros/melodic/cob-light/default.nix
diff --git a/melodic/cob-linear-nav/default.nix b/distros/melodic/cob-linear-nav/default.nix
similarity index 100%
rename from melodic/cob-linear-nav/default.nix
rename to distros/melodic/cob-linear-nav/default.nix
diff --git a/melodic/cob-lookat-action/default.nix b/distros/melodic/cob-lookat-action/default.nix
similarity index 100%
rename from melodic/cob-lookat-action/default.nix
rename to distros/melodic/cob-lookat-action/default.nix
diff --git a/melodic/cob-manipulation/default.nix b/distros/melodic/cob-manipulation/default.nix
similarity index 100%
rename from melodic/cob-manipulation/default.nix
rename to distros/melodic/cob-manipulation/default.nix
diff --git a/melodic/cob-map-accessibility-analysis/default.nix b/distros/melodic/cob-map-accessibility-analysis/default.nix
similarity index 100%
rename from melodic/cob-map-accessibility-analysis/default.nix
rename to distros/melodic/cob-map-accessibility-analysis/default.nix
diff --git a/melodic/cob-mapping-slam/default.nix b/distros/melodic/cob-mapping-slam/default.nix
similarity index 100%
rename from melodic/cob-mapping-slam/default.nix
rename to distros/melodic/cob-mapping-slam/default.nix
diff --git a/melodic/cob-mimic/default.nix b/distros/melodic/cob-mimic/default.nix
similarity index 100%
rename from melodic/cob-mimic/default.nix
rename to distros/melodic/cob-mimic/default.nix
diff --git a/melodic/cob-model-identifier/default.nix b/distros/melodic/cob-model-identifier/default.nix
similarity index 100%
rename from melodic/cob-model-identifier/default.nix
rename to distros/melodic/cob-model-identifier/default.nix
diff --git a/melodic/cob-monitoring/default.nix b/distros/melodic/cob-monitoring/default.nix
similarity index 100%
rename from melodic/cob-monitoring/default.nix
rename to distros/melodic/cob-monitoring/default.nix
diff --git a/melodic/cob-moveit-bringup/default.nix b/distros/melodic/cob-moveit-bringup/default.nix
similarity index 100%
rename from melodic/cob-moveit-bringup/default.nix
rename to distros/melodic/cob-moveit-bringup/default.nix
diff --git a/melodic/cob-moveit-config/default.nix b/distros/melodic/cob-moveit-config/default.nix
similarity index 100%
rename from melodic/cob-moveit-config/default.nix
rename to distros/melodic/cob-moveit-config/default.nix
diff --git a/melodic/cob-moveit-interface/default.nix b/distros/melodic/cob-moveit-interface/default.nix
similarity index 100%
rename from melodic/cob-moveit-interface/default.nix
rename to distros/melodic/cob-moveit-interface/default.nix
diff --git a/melodic/cob-msgs/default.nix b/distros/melodic/cob-msgs/default.nix
similarity index 100%
rename from melodic/cob-msgs/default.nix
rename to distros/melodic/cob-msgs/default.nix
diff --git a/melodic/cob-navigation-config/default.nix b/distros/melodic/cob-navigation-config/default.nix
similarity index 100%
rename from melodic/cob-navigation-config/default.nix
rename to distros/melodic/cob-navigation-config/default.nix
diff --git a/melodic/cob-navigation-global/default.nix b/distros/melodic/cob-navigation-global/default.nix
similarity index 100%
rename from melodic/cob-navigation-global/default.nix
rename to distros/melodic/cob-navigation-global/default.nix
diff --git a/melodic/cob-navigation-local/default.nix b/distros/melodic/cob-navigation-local/default.nix
similarity index 100%
rename from melodic/cob-navigation-local/default.nix
rename to distros/melodic/cob-navigation-local/default.nix
diff --git a/melodic/cob-navigation-slam/default.nix b/distros/melodic/cob-navigation-slam/default.nix
similarity index 100%
rename from melodic/cob-navigation-slam/default.nix
rename to distros/melodic/cob-navigation-slam/default.nix
diff --git a/melodic/cob-navigation/default.nix b/distros/melodic/cob-navigation/default.nix
similarity index 100%
rename from melodic/cob-navigation/default.nix
rename to distros/melodic/cob-navigation/default.nix
diff --git a/melodic/cob-object-detection-msgs/default.nix b/distros/melodic/cob-object-detection-msgs/default.nix
similarity index 100%
rename from melodic/cob-object-detection-msgs/default.nix
rename to distros/melodic/cob-object-detection-msgs/default.nix
diff --git a/melodic/cob-object-detection-visualizer/default.nix b/distros/melodic/cob-object-detection-visualizer/default.nix
similarity index 100%
rename from melodic/cob-object-detection-visualizer/default.nix
rename to distros/melodic/cob-object-detection-visualizer/default.nix
diff --git a/melodic/cob-omni-drive-controller/default.nix b/distros/melodic/cob-omni-drive-controller/default.nix
similarity index 100%
rename from melodic/cob-omni-drive-controller/default.nix
rename to distros/melodic/cob-omni-drive-controller/default.nix
diff --git a/melodic/cob-perception-common/default.nix b/distros/melodic/cob-perception-common/default.nix
similarity index 100%
rename from melodic/cob-perception-common/default.nix
rename to distros/melodic/cob-perception-common/default.nix
diff --git a/melodic/cob-perception-msgs/default.nix b/distros/melodic/cob-perception-msgs/default.nix
similarity index 100%
rename from melodic/cob-perception-msgs/default.nix
rename to distros/melodic/cob-perception-msgs/default.nix
diff --git a/melodic/cob-phidget-em-state/default.nix b/distros/melodic/cob-phidget-em-state/default.nix
similarity index 100%
rename from melodic/cob-phidget-em-state/default.nix
rename to distros/melodic/cob-phidget-em-state/default.nix
diff --git a/melodic/cob-phidget-power-state/default.nix b/distros/melodic/cob-phidget-power-state/default.nix
similarity index 100%
rename from melodic/cob-phidget-power-state/default.nix
rename to distros/melodic/cob-phidget-power-state/default.nix
diff --git a/melodic/cob-phidgets/default.nix b/distros/melodic/cob-phidgets/default.nix
similarity index 100%
rename from melodic/cob-phidgets/default.nix
rename to distros/melodic/cob-phidgets/default.nix
diff --git a/melodic/cob-reflector-referencing/default.nix b/distros/melodic/cob-reflector-referencing/default.nix
similarity index 100%
rename from melodic/cob-reflector-referencing/default.nix
rename to distros/melodic/cob-reflector-referencing/default.nix
diff --git a/melodic/cob-relayboard/default.nix b/distros/melodic/cob-relayboard/default.nix
similarity index 100%
rename from melodic/cob-relayboard/default.nix
rename to distros/melodic/cob-relayboard/default.nix
diff --git a/melodic/cob-safety-controller/default.nix b/distros/melodic/cob-safety-controller/default.nix
similarity index 100%
rename from melodic/cob-safety-controller/default.nix
rename to distros/melodic/cob-safety-controller/default.nix
diff --git a/melodic/cob-scan-unifier/default.nix b/distros/melodic/cob-scan-unifier/default.nix
similarity index 100%
rename from melodic/cob-scan-unifier/default.nix
rename to distros/melodic/cob-scan-unifier/default.nix
diff --git a/melodic/cob-script-server/default.nix b/distros/melodic/cob-script-server/default.nix
similarity index 100%
rename from melodic/cob-script-server/default.nix
rename to distros/melodic/cob-script-server/default.nix
diff --git a/melodic/cob-sick-lms1xx/default.nix b/distros/melodic/cob-sick-lms1xx/default.nix
similarity index 100%
rename from melodic/cob-sick-lms1xx/default.nix
rename to distros/melodic/cob-sick-lms1xx/default.nix
diff --git a/melodic/cob-sick-s300/default.nix b/distros/melodic/cob-sick-s300/default.nix
similarity index 100%
rename from melodic/cob-sick-s300/default.nix
rename to distros/melodic/cob-sick-s300/default.nix
diff --git a/melodic/cob-sound/default.nix b/distros/melodic/cob-sound/default.nix
similarity index 100%
rename from melodic/cob-sound/default.nix
rename to distros/melodic/cob-sound/default.nix
diff --git a/melodic/cob-srvs/default.nix b/distros/melodic/cob-srvs/default.nix
similarity index 100%
rename from melodic/cob-srvs/default.nix
rename to distros/melodic/cob-srvs/default.nix
diff --git a/melodic/cob-substitute/default.nix b/distros/melodic/cob-substitute/default.nix
similarity index 100%
rename from melodic/cob-substitute/default.nix
rename to distros/melodic/cob-substitute/default.nix
diff --git a/melodic/cob-supported-robots/default.nix b/distros/melodic/cob-supported-robots/default.nix
similarity index 100%
rename from melodic/cob-supported-robots/default.nix
rename to distros/melodic/cob-supported-robots/default.nix
diff --git a/melodic/cob-teleop/default.nix b/distros/melodic/cob-teleop/default.nix
similarity index 100%
rename from melodic/cob-teleop/default.nix
rename to distros/melodic/cob-teleop/default.nix
diff --git a/melodic/cob-trajectory-controller/default.nix b/distros/melodic/cob-trajectory-controller/default.nix
similarity index 100%
rename from melodic/cob-trajectory-controller/default.nix
rename to distros/melodic/cob-trajectory-controller/default.nix
diff --git a/melodic/cob-tricycle-controller/default.nix b/distros/melodic/cob-tricycle-controller/default.nix
similarity index 100%
rename from melodic/cob-tricycle-controller/default.nix
rename to distros/melodic/cob-tricycle-controller/default.nix
diff --git a/melodic/cob-twist-controller/default.nix b/distros/melodic/cob-twist-controller/default.nix
similarity index 100%
rename from melodic/cob-twist-controller/default.nix
rename to distros/melodic/cob-twist-controller/default.nix
diff --git a/melodic/cob-undercarriage-ctrl/default.nix b/distros/melodic/cob-undercarriage-ctrl/default.nix
similarity index 100%
rename from melodic/cob-undercarriage-ctrl/default.nix
rename to distros/melodic/cob-undercarriage-ctrl/default.nix
diff --git a/melodic/cob-utilities/default.nix b/distros/melodic/cob-utilities/default.nix
similarity index 100%
rename from melodic/cob-utilities/default.nix
rename to distros/melodic/cob-utilities/default.nix
diff --git a/melodic/cob-vision-utils/default.nix b/distros/melodic/cob-vision-utils/default.nix
similarity index 100%
rename from melodic/cob-vision-utils/default.nix
rename to distros/melodic/cob-vision-utils/default.nix
diff --git a/melodic/cob-voltage-control/default.nix b/distros/melodic/cob-voltage-control/default.nix
similarity index 100%
rename from melodic/cob-voltage-control/default.nix
rename to distros/melodic/cob-voltage-control/default.nix
diff --git a/melodic/code-coverage/default.nix b/distros/melodic/code-coverage/default.nix
similarity index 100%
rename from melodic/code-coverage/default.nix
rename to distros/melodic/code-coverage/default.nix
diff --git a/melodic/codec-image-transport/default.nix b/distros/melodic/codec-image-transport/default.nix
similarity index 100%
rename from melodic/codec-image-transport/default.nix
rename to distros/melodic/codec-image-transport/default.nix
diff --git a/melodic/combined-robot-hw-tests/default.nix b/distros/melodic/combined-robot-hw-tests/default.nix
similarity index 100%
rename from melodic/combined-robot-hw-tests/default.nix
rename to distros/melodic/combined-robot-hw-tests/default.nix
diff --git a/melodic/combined-robot-hw/default.nix b/distros/melodic/combined-robot-hw/default.nix
similarity index 100%
rename from melodic/combined-robot-hw/default.nix
rename to distros/melodic/combined-robot-hw/default.nix
diff --git a/melodic/common-msgs/default.nix b/distros/melodic/common-msgs/default.nix
similarity index 100%
rename from melodic/common-msgs/default.nix
rename to distros/melodic/common-msgs/default.nix
diff --git a/melodic/common-tutorials/default.nix b/distros/melodic/common-tutorials/default.nix
similarity index 100%
rename from melodic/common-tutorials/default.nix
rename to distros/melodic/common-tutorials/default.nix
diff --git a/melodic/compressed-depth-image-transport/default.nix b/distros/melodic/compressed-depth-image-transport/default.nix
similarity index 100%
rename from melodic/compressed-depth-image-transport/default.nix
rename to distros/melodic/compressed-depth-image-transport/default.nix
diff --git a/melodic/compressed-image-transport/default.nix b/distros/melodic/compressed-image-transport/default.nix
similarity index 100%
rename from melodic/compressed-image-transport/default.nix
rename to distros/melodic/compressed-image-transport/default.nix
diff --git a/melodic/concert-msgs/default.nix b/distros/melodic/concert-msgs/default.nix
similarity index 100%
rename from melodic/concert-msgs/default.nix
rename to distros/melodic/concert-msgs/default.nix
diff --git a/melodic/concert-service-msgs/default.nix b/distros/melodic/concert-service-msgs/default.nix
similarity index 100%
rename from melodic/concert-service-msgs/default.nix
rename to distros/melodic/concert-service-msgs/default.nix
diff --git a/melodic/concert-workflow-engine-msgs/default.nix b/distros/melodic/concert-workflow-engine-msgs/default.nix
similarity index 100%
rename from melodic/concert-workflow-engine-msgs/default.nix
rename to distros/melodic/concert-workflow-engine-msgs/default.nix
diff --git a/melodic/control-msgs/default.nix b/distros/melodic/control-msgs/default.nix
similarity index 100%
rename from melodic/control-msgs/default.nix
rename to distros/melodic/control-msgs/default.nix
diff --git a/melodic/control-toolbox/default.nix b/distros/melodic/control-toolbox/default.nix
similarity index 100%
rename from melodic/control-toolbox/default.nix
rename to distros/melodic/control-toolbox/default.nix
diff --git a/melodic/controller-interface/default.nix b/distros/melodic/controller-interface/default.nix
similarity index 100%
rename from melodic/controller-interface/default.nix
rename to distros/melodic/controller-interface/default.nix
diff --git a/melodic/controller-manager-msgs/default.nix b/distros/melodic/controller-manager-msgs/default.nix
similarity index 100%
rename from melodic/controller-manager-msgs/default.nix
rename to distros/melodic/controller-manager-msgs/default.nix
diff --git a/melodic/controller-manager-tests/default.nix b/distros/melodic/controller-manager-tests/default.nix
similarity index 100%
rename from melodic/controller-manager-tests/default.nix
rename to distros/melodic/controller-manager-tests/default.nix
diff --git a/melodic/controller-manager/default.nix b/distros/melodic/controller-manager/default.nix
similarity index 100%
rename from melodic/controller-manager/default.nix
rename to distros/melodic/controller-manager/default.nix
diff --git a/melodic/convex-decomposition/default.nix b/distros/melodic/convex-decomposition/default.nix
similarity index 100%
rename from melodic/convex-decomposition/default.nix
rename to distros/melodic/convex-decomposition/default.nix
diff --git a/melodic/costmap-2d/default.nix b/distros/melodic/costmap-2d/default.nix
similarity index 100%
rename from melodic/costmap-2d/default.nix
rename to distros/melodic/costmap-2d/default.nix
diff --git a/melodic/costmap-converter/default.nix b/distros/melodic/costmap-converter/default.nix
similarity index 100%
rename from melodic/costmap-converter/default.nix
rename to distros/melodic/costmap-converter/default.nix
diff --git a/melodic/costmap-cspace-msgs/default.nix b/distros/melodic/costmap-cspace-msgs/default.nix
similarity index 100%
rename from melodic/costmap-cspace-msgs/default.nix
rename to distros/melodic/costmap-cspace-msgs/default.nix
diff --git a/melodic/costmap-cspace/default.nix b/distros/melodic/costmap-cspace/default.nix
similarity index 100%
rename from melodic/costmap-cspace/default.nix
rename to distros/melodic/costmap-cspace/default.nix
diff --git a/melodic/costmap-queue/default.nix b/distros/melodic/costmap-queue/default.nix
similarity index 100%
rename from melodic/costmap-queue/default.nix
rename to distros/melodic/costmap-queue/default.nix
diff --git a/melodic/cpp-common/default.nix b/distros/melodic/cpp-common/default.nix
similarity index 100%
rename from melodic/cpp-common/default.nix
rename to distros/melodic/cpp-common/default.nix
diff --git a/melodic/cpr-multimaster-tools/default.nix b/distros/melodic/cpr-multimaster-tools/default.nix
similarity index 100%
rename from melodic/cpr-multimaster-tools/default.nix
rename to distros/melodic/cpr-multimaster-tools/default.nix
diff --git a/melodic/criutils/default.nix b/distros/melodic/criutils/default.nix
similarity index 100%
rename from melodic/criutils/default.nix
rename to distros/melodic/criutils/default.nix
diff --git a/melodic/cv-bridge/default.nix b/distros/melodic/cv-bridge/default.nix
similarity index 100%
rename from melodic/cv-bridge/default.nix
rename to distros/melodic/cv-bridge/default.nix
diff --git a/melodic/cv-camera/default.nix b/distros/melodic/cv-camera/default.nix
similarity index 100%
rename from melodic/cv-camera/default.nix
rename to distros/melodic/cv-camera/default.nix
diff --git a/melodic/dataflow-lite/default.nix b/distros/melodic/dataflow-lite/default.nix
similarity index 100%
rename from melodic/dataflow-lite/default.nix
rename to distros/melodic/dataflow-lite/default.nix
diff --git a/melodic/dataspeed-can-msg-filters/default.nix b/distros/melodic/dataspeed-can-msg-filters/default.nix
similarity index 100%
rename from melodic/dataspeed-can-msg-filters/default.nix
rename to distros/melodic/dataspeed-can-msg-filters/default.nix
diff --git a/melodic/dataspeed-can-tools/default.nix b/distros/melodic/dataspeed-can-tools/default.nix
similarity index 100%
rename from melodic/dataspeed-can-tools/default.nix
rename to distros/melodic/dataspeed-can-tools/default.nix
diff --git a/melodic/dataspeed-can-usb/default.nix b/distros/melodic/dataspeed-can-usb/default.nix
similarity index 100%
rename from melodic/dataspeed-can-usb/default.nix
rename to distros/melodic/dataspeed-can-usb/default.nix
diff --git a/melodic/dataspeed-can/default.nix b/distros/melodic/dataspeed-can/default.nix
similarity index 100%
rename from melodic/dataspeed-can/default.nix
rename to distros/melodic/dataspeed-can/default.nix
diff --git a/melodic/dataspeed-pds-can/default.nix b/distros/melodic/dataspeed-pds-can/default.nix
similarity index 100%
rename from melodic/dataspeed-pds-can/default.nix
rename to distros/melodic/dataspeed-pds-can/default.nix
diff --git a/melodic/dataspeed-pds-msgs/default.nix b/distros/melodic/dataspeed-pds-msgs/default.nix
similarity index 100%
rename from melodic/dataspeed-pds-msgs/default.nix
rename to distros/melodic/dataspeed-pds-msgs/default.nix
diff --git a/melodic/dataspeed-pds-rqt/default.nix b/distros/melodic/dataspeed-pds-rqt/default.nix
similarity index 100%
rename from melodic/dataspeed-pds-rqt/default.nix
rename to distros/melodic/dataspeed-pds-rqt/default.nix
diff --git a/melodic/dataspeed-pds-scripts/default.nix b/distros/melodic/dataspeed-pds-scripts/default.nix
similarity index 100%
rename from melodic/dataspeed-pds-scripts/default.nix
rename to distros/melodic/dataspeed-pds-scripts/default.nix
diff --git a/melodic/dataspeed-pds/default.nix b/distros/melodic/dataspeed-pds/default.nix
similarity index 100%
rename from melodic/dataspeed-pds/default.nix
rename to distros/melodic/dataspeed-pds/default.nix
diff --git a/melodic/dataspeed-ulc-can/default.nix b/distros/melodic/dataspeed-ulc-can/default.nix
similarity index 100%
rename from melodic/dataspeed-ulc-can/default.nix
rename to distros/melodic/dataspeed-ulc-can/default.nix
diff --git a/melodic/dataspeed-ulc-msgs/default.nix b/distros/melodic/dataspeed-ulc-msgs/default.nix
similarity index 100%
rename from melodic/dataspeed-ulc-msgs/default.nix
rename to distros/melodic/dataspeed-ulc-msgs/default.nix
diff --git a/melodic/dataspeed-ulc/default.nix b/distros/melodic/dataspeed-ulc/default.nix
similarity index 100%
rename from melodic/dataspeed-ulc/default.nix
rename to distros/melodic/dataspeed-ulc/default.nix
diff --git a/melodic/dbw-fca-can/default.nix b/distros/melodic/dbw-fca-can/default.nix
similarity index 100%
rename from melodic/dbw-fca-can/default.nix
rename to distros/melodic/dbw-fca-can/default.nix
diff --git a/melodic/dbw-fca-description/default.nix b/distros/melodic/dbw-fca-description/default.nix
similarity index 100%
rename from melodic/dbw-fca-description/default.nix
rename to distros/melodic/dbw-fca-description/default.nix
diff --git a/melodic/dbw-fca-joystick-demo/default.nix b/distros/melodic/dbw-fca-joystick-demo/default.nix
similarity index 100%
rename from melodic/dbw-fca-joystick-demo/default.nix
rename to distros/melodic/dbw-fca-joystick-demo/default.nix
diff --git a/melodic/dbw-fca-msgs/default.nix b/distros/melodic/dbw-fca-msgs/default.nix
similarity index 100%
rename from melodic/dbw-fca-msgs/default.nix
rename to distros/melodic/dbw-fca-msgs/default.nix
diff --git a/melodic/dbw-fca/default.nix b/distros/melodic/dbw-fca/default.nix
similarity index 100%
rename from melodic/dbw-fca/default.nix
rename to distros/melodic/dbw-fca/default.nix
diff --git a/melodic/dbw-mkz-can/default.nix b/distros/melodic/dbw-mkz-can/default.nix
similarity index 100%
rename from melodic/dbw-mkz-can/default.nix
rename to distros/melodic/dbw-mkz-can/default.nix
diff --git a/melodic/dbw-mkz-description/default.nix b/distros/melodic/dbw-mkz-description/default.nix
similarity index 100%
rename from melodic/dbw-mkz-description/default.nix
rename to distros/melodic/dbw-mkz-description/default.nix
diff --git a/melodic/dbw-mkz-joystick-demo/default.nix b/distros/melodic/dbw-mkz-joystick-demo/default.nix
similarity index 100%
rename from melodic/dbw-mkz-joystick-demo/default.nix
rename to distros/melodic/dbw-mkz-joystick-demo/default.nix
diff --git a/melodic/dbw-mkz-msgs/default.nix b/distros/melodic/dbw-mkz-msgs/default.nix
similarity index 100%
rename from melodic/dbw-mkz-msgs/default.nix
rename to distros/melodic/dbw-mkz-msgs/default.nix
diff --git a/melodic/dbw-mkz-twist-controller/default.nix b/distros/melodic/dbw-mkz-twist-controller/default.nix
similarity index 100%
rename from melodic/dbw-mkz-twist-controller/default.nix
rename to distros/melodic/dbw-mkz-twist-controller/default.nix
diff --git a/melodic/dbw-mkz/default.nix b/distros/melodic/dbw-mkz/default.nix
similarity index 100%
rename from melodic/dbw-mkz/default.nix
rename to distros/melodic/dbw-mkz/default.nix
diff --git a/melodic/dccomms-ros-msgs/default.nix b/distros/melodic/dccomms-ros-msgs/default.nix
similarity index 100%
rename from melodic/dccomms-ros-msgs/default.nix
rename to distros/melodic/dccomms-ros-msgs/default.nix
diff --git a/melodic/dccomms-ros/default.nix b/distros/melodic/dccomms-ros/default.nix
similarity index 100%
rename from melodic/dccomms-ros/default.nix
rename to distros/melodic/dccomms-ros/default.nix
diff --git a/melodic/ddwrt-access-point/default.nix b/distros/melodic/ddwrt-access-point/default.nix
similarity index 100%
rename from melodic/ddwrt-access-point/default.nix
rename to distros/melodic/ddwrt-access-point/default.nix
diff --git a/melodic/ddynamic-reconfigure-python/default.nix b/distros/melodic/ddynamic-reconfigure-python/default.nix
similarity index 100%
rename from melodic/ddynamic-reconfigure-python/default.nix
rename to distros/melodic/ddynamic-reconfigure-python/default.nix
diff --git a/melodic/ddynamic-reconfigure/default.nix b/distros/melodic/ddynamic-reconfigure/default.nix
similarity index 100%
rename from melodic/ddynamic-reconfigure/default.nix
rename to distros/melodic/ddynamic-reconfigure/default.nix
diff --git a/melodic/default-cfg-fkie/default.nix b/distros/melodic/default-cfg-fkie/default.nix
similarity index 100%
rename from melodic/default-cfg-fkie/default.nix
rename to distros/melodic/default-cfg-fkie/default.nix
diff --git a/melodic/delphi-esr-msgs/default.nix b/distros/melodic/delphi-esr-msgs/default.nix
similarity index 100%
rename from melodic/delphi-esr-msgs/default.nix
rename to distros/melodic/delphi-esr-msgs/default.nix
diff --git a/melodic/delphi-mrr-msgs/default.nix b/distros/melodic/delphi-mrr-msgs/default.nix
similarity index 100%
rename from melodic/delphi-mrr-msgs/default.nix
rename to distros/melodic/delphi-mrr-msgs/default.nix
diff --git a/melodic/delphi-srr-msgs/default.nix b/distros/melodic/delphi-srr-msgs/default.nix
similarity index 100%
rename from melodic/delphi-srr-msgs/default.nix
rename to distros/melodic/delphi-srr-msgs/default.nix
diff --git a/melodic/depth-image-proc/default.nix b/distros/melodic/depth-image-proc/default.nix
similarity index 100%
rename from melodic/depth-image-proc/default.nix
rename to distros/melodic/depth-image-proc/default.nix
diff --git a/melodic/depthcloud-encoder/default.nix b/distros/melodic/depthcloud-encoder/default.nix
similarity index 100%
rename from melodic/depthcloud-encoder/default.nix
rename to distros/melodic/depthcloud-encoder/default.nix
diff --git a/melodic/depthimage-to-laserscan/default.nix b/distros/melodic/depthimage-to-laserscan/default.nix
similarity index 100%
rename from melodic/depthimage-to-laserscan/default.nix
rename to distros/melodic/depthimage-to-laserscan/default.nix
diff --git a/melodic/derived-object-msgs/default.nix b/distros/melodic/derived-object-msgs/default.nix
similarity index 100%
rename from melodic/derived-object-msgs/default.nix
rename to distros/melodic/derived-object-msgs/default.nix
diff --git a/melodic/desistek-saga-control/default.nix b/distros/melodic/desistek-saga-control/default.nix
similarity index 100%
rename from melodic/desistek-saga-control/default.nix
rename to distros/melodic/desistek-saga-control/default.nix
diff --git a/melodic/desistek-saga-description/default.nix b/distros/melodic/desistek-saga-description/default.nix
similarity index 100%
rename from melodic/desistek-saga-description/default.nix
rename to distros/melodic/desistek-saga-description/default.nix
diff --git a/melodic/desistek-saga-gazebo/default.nix b/distros/melodic/desistek-saga-gazebo/default.nix
similarity index 100%
rename from melodic/desistek-saga-gazebo/default.nix
rename to distros/melodic/desistek-saga-gazebo/default.nix
diff --git a/melodic/desktop-full/default.nix b/distros/melodic/desktop-full/default.nix
similarity index 100%
rename from melodic/desktop-full/default.nix
rename to distros/melodic/desktop-full/default.nix
diff --git a/melodic/desktop/default.nix b/distros/melodic/desktop/default.nix
similarity index 100%
rename from melodic/desktop/default.nix
rename to distros/melodic/desktop/default.nix
diff --git a/melodic/diagnostic-aggregator/default.nix b/distros/melodic/diagnostic-aggregator/default.nix
similarity index 100%
rename from melodic/diagnostic-aggregator/default.nix
rename to distros/melodic/diagnostic-aggregator/default.nix
diff --git a/melodic/diagnostic-analysis/default.nix b/distros/melodic/diagnostic-analysis/default.nix
similarity index 100%
rename from melodic/diagnostic-analysis/default.nix
rename to distros/melodic/diagnostic-analysis/default.nix
diff --git a/melodic/diagnostic-common-diagnostics/default.nix b/distros/melodic/diagnostic-common-diagnostics/default.nix
similarity index 100%
rename from melodic/diagnostic-common-diagnostics/default.nix
rename to distros/melodic/diagnostic-common-diagnostics/default.nix
diff --git a/melodic/diagnostic-msgs/default.nix b/distros/melodic/diagnostic-msgs/default.nix
similarity index 100%
rename from melodic/diagnostic-msgs/default.nix
rename to distros/melodic/diagnostic-msgs/default.nix
diff --git a/melodic/diagnostic-updater/default.nix b/distros/melodic/diagnostic-updater/default.nix
similarity index 100%
rename from melodic/diagnostic-updater/default.nix
rename to distros/melodic/diagnostic-updater/default.nix
diff --git a/melodic/diagnostics/default.nix b/distros/melodic/diagnostics/default.nix
similarity index 100%
rename from melodic/diagnostics/default.nix
rename to distros/melodic/diagnostics/default.nix
diff --git a/melodic/diff-drive-controller/default.nix b/distros/melodic/diff-drive-controller/default.nix
similarity index 100%
rename from melodic/diff-drive-controller/default.nix
rename to distros/melodic/diff-drive-controller/default.nix
diff --git a/melodic/distance-map-core/default.nix b/distros/melodic/distance-map-core/default.nix
similarity index 100%
rename from melodic/distance-map-core/default.nix
rename to distros/melodic/distance-map-core/default.nix
diff --git a/melodic/distance-map-deadreck/default.nix b/distros/melodic/distance-map-deadreck/default.nix
similarity index 100%
rename from melodic/distance-map-deadreck/default.nix
rename to distros/melodic/distance-map-deadreck/default.nix
diff --git a/melodic/distance-map-msgs/default.nix b/distros/melodic/distance-map-msgs/default.nix
similarity index 100%
rename from melodic/distance-map-msgs/default.nix
rename to distros/melodic/distance-map-msgs/default.nix
diff --git a/melodic/distance-map-node/default.nix b/distros/melodic/distance-map-node/default.nix
similarity index 100%
rename from melodic/distance-map-node/default.nix
rename to distros/melodic/distance-map-node/default.nix
diff --git a/melodic/distance-map-opencv/default.nix b/distros/melodic/distance-map-opencv/default.nix
similarity index 100%
rename from melodic/distance-map-opencv/default.nix
rename to distros/melodic/distance-map-opencv/default.nix
diff --git a/melodic/distance-map-rviz/default.nix b/distros/melodic/distance-map-rviz/default.nix
similarity index 100%
rename from melodic/distance-map-rviz/default.nix
rename to distros/melodic/distance-map-rviz/default.nix
diff --git a/melodic/distance-map-tools/default.nix b/distros/melodic/distance-map-tools/default.nix
similarity index 100%
rename from melodic/distance-map-tools/default.nix
rename to distros/melodic/distance-map-tools/default.nix
diff --git a/melodic/distance-map/default.nix b/distros/melodic/distance-map/default.nix
similarity index 100%
rename from melodic/distance-map/default.nix
rename to distros/melodic/distance-map/default.nix
diff --git a/melodic/dlux-global-planner/default.nix b/distros/melodic/dlux-global-planner/default.nix
similarity index 100%
rename from melodic/dlux-global-planner/default.nix
rename to distros/melodic/dlux-global-planner/default.nix
diff --git a/melodic/dlux-plugins/default.nix b/distros/melodic/dlux-plugins/default.nix
similarity index 100%
rename from melodic/dlux-plugins/default.nix
rename to distros/melodic/dlux-plugins/default.nix
diff --git a/melodic/dockeros/default.nix b/distros/melodic/dockeros/default.nix
similarity index 100%
rename from melodic/dockeros/default.nix
rename to distros/melodic/dockeros/default.nix
diff --git a/melodic/downward/default.nix b/distros/melodic/downward/default.nix
similarity index 100%
rename from melodic/downward/default.nix
rename to distros/melodic/downward/default.nix
diff --git a/melodic/driver-base/default.nix b/distros/melodic/driver-base/default.nix
similarity index 100%
rename from melodic/driver-base/default.nix
rename to distros/melodic/driver-base/default.nix
diff --git a/melodic/driver-common/default.nix b/distros/melodic/driver-common/default.nix
similarity index 100%
rename from melodic/driver-common/default.nix
rename to distros/melodic/driver-common/default.nix
diff --git a/melodic/dwa-local-planner/default.nix b/distros/melodic/dwa-local-planner/default.nix
similarity index 100%
rename from melodic/dwa-local-planner/default.nix
rename to distros/melodic/dwa-local-planner/default.nix
diff --git a/melodic/dwb-critics/default.nix b/distros/melodic/dwb-critics/default.nix
similarity index 100%
rename from melodic/dwb-critics/default.nix
rename to distros/melodic/dwb-critics/default.nix
diff --git a/melodic/dwb-local-planner/default.nix b/distros/melodic/dwb-local-planner/default.nix
similarity index 100%
rename from melodic/dwb-local-planner/default.nix
rename to distros/melodic/dwb-local-planner/default.nix
diff --git a/melodic/dwb-msgs/default.nix b/distros/melodic/dwb-msgs/default.nix
similarity index 100%
rename from melodic/dwb-msgs/default.nix
rename to distros/melodic/dwb-msgs/default.nix
diff --git a/melodic/dwb-plugins/default.nix b/distros/melodic/dwb-plugins/default.nix
similarity index 100%
rename from melodic/dwb-plugins/default.nix
rename to distros/melodic/dwb-plugins/default.nix
diff --git a/melodic/dynamic-edt-3d/default.nix b/distros/melodic/dynamic-edt-3d/default.nix
similarity index 100%
rename from melodic/dynamic-edt-3d/default.nix
rename to distros/melodic/dynamic-edt-3d/default.nix
diff --git a/melodic/dynamic-reconfigure/default.nix b/distros/melodic/dynamic-reconfigure/default.nix
similarity index 100%
rename from melodic/dynamic-reconfigure/default.nix
rename to distros/melodic/dynamic-reconfigure/default.nix
diff --git a/melodic/dynamic-robot-state-publisher/default.nix b/distros/melodic/dynamic-robot-state-publisher/default.nix
similarity index 100%
rename from melodic/dynamic-robot-state-publisher/default.nix
rename to distros/melodic/dynamic-robot-state-publisher/default.nix
diff --git a/melodic/dynamic-tf-publisher/default.nix b/distros/melodic/dynamic-tf-publisher/default.nix
similarity index 100%
rename from melodic/dynamic-tf-publisher/default.nix
rename to distros/melodic/dynamic-tf-publisher/default.nix
diff --git a/melodic/dynamixel-sdk/default.nix b/distros/melodic/dynamixel-sdk/default.nix
similarity index 100%
rename from melodic/dynamixel-sdk/default.nix
rename to distros/melodic/dynamixel-sdk/default.nix
diff --git a/melodic/dynamixel-workbench-controllers/default.nix b/distros/melodic/dynamixel-workbench-controllers/default.nix
similarity index 100%
rename from melodic/dynamixel-workbench-controllers/default.nix
rename to distros/melodic/dynamixel-workbench-controllers/default.nix
diff --git a/melodic/dynamixel-workbench-msgs/default.nix b/distros/melodic/dynamixel-workbench-msgs/default.nix
similarity index 100%
rename from melodic/dynamixel-workbench-msgs/default.nix
rename to distros/melodic/dynamixel-workbench-msgs/default.nix
diff --git a/melodic/dynamixel-workbench-operators/default.nix b/distros/melodic/dynamixel-workbench-operators/default.nix
similarity index 100%
rename from melodic/dynamixel-workbench-operators/default.nix
rename to distros/melodic/dynamixel-workbench-operators/default.nix
diff --git a/melodic/dynamixel-workbench-single-manager-gui/default.nix b/distros/melodic/dynamixel-workbench-single-manager-gui/default.nix
similarity index 100%
rename from melodic/dynamixel-workbench-single-manager-gui/default.nix
rename to distros/melodic/dynamixel-workbench-single-manager-gui/default.nix
diff --git a/melodic/dynamixel-workbench-single-manager/default.nix b/distros/melodic/dynamixel-workbench-single-manager/default.nix
similarity index 100%
rename from melodic/dynamixel-workbench-single-manager/default.nix
rename to distros/melodic/dynamixel-workbench-single-manager/default.nix
diff --git a/melodic/dynamixel-workbench-toolbox/default.nix b/distros/melodic/dynamixel-workbench-toolbox/default.nix
similarity index 100%
rename from melodic/dynamixel-workbench-toolbox/default.nix
rename to distros/melodic/dynamixel-workbench-toolbox/default.nix
diff --git a/melodic/dynamixel-workbench/default.nix b/distros/melodic/dynamixel-workbench/default.nix
similarity index 100%
rename from melodic/dynamixel-workbench/default.nix
rename to distros/melodic/dynamixel-workbench/default.nix
diff --git a/melodic/easy-markers/default.nix b/distros/melodic/easy-markers/default.nix
similarity index 100%
rename from melodic/easy-markers/default.nix
rename to distros/melodic/easy-markers/default.nix
diff --git a/melodic/eca-a9-control/default.nix b/distros/melodic/eca-a9-control/default.nix
similarity index 100%
rename from melodic/eca-a9-control/default.nix
rename to distros/melodic/eca-a9-control/default.nix
diff --git a/melodic/eca-a9-description/default.nix b/distros/melodic/eca-a9-description/default.nix
similarity index 100%
rename from melodic/eca-a9-description/default.nix
rename to distros/melodic/eca-a9-description/default.nix
diff --git a/melodic/eca-a9-gazebo/default.nix b/distros/melodic/eca-a9-gazebo/default.nix
similarity index 100%
rename from melodic/eca-a9-gazebo/default.nix
rename to distros/melodic/eca-a9-gazebo/default.nix
diff --git a/melodic/ecl-build/default.nix b/distros/melodic/ecl-build/default.nix
similarity index 100%
rename from melodic/ecl-build/default.nix
rename to distros/melodic/ecl-build/default.nix
diff --git a/melodic/ecl-command-line/default.nix b/distros/melodic/ecl-command-line/default.nix
similarity index 100%
rename from melodic/ecl-command-line/default.nix
rename to distros/melodic/ecl-command-line/default.nix
diff --git a/melodic/ecl-concepts/default.nix b/distros/melodic/ecl-concepts/default.nix
similarity index 100%
rename from melodic/ecl-concepts/default.nix
rename to distros/melodic/ecl-concepts/default.nix
diff --git a/melodic/ecl-config/default.nix b/distros/melodic/ecl-config/default.nix
similarity index 100%
rename from melodic/ecl-config/default.nix
rename to distros/melodic/ecl-config/default.nix
diff --git a/melodic/ecl-console/default.nix b/distros/melodic/ecl-console/default.nix
similarity index 100%
rename from melodic/ecl-console/default.nix
rename to distros/melodic/ecl-console/default.nix
diff --git a/melodic/ecl-containers/default.nix b/distros/melodic/ecl-containers/default.nix
similarity index 100%
rename from melodic/ecl-containers/default.nix
rename to distros/melodic/ecl-containers/default.nix
diff --git a/melodic/ecl-converters-lite/default.nix b/distros/melodic/ecl-converters-lite/default.nix
similarity index 100%
rename from melodic/ecl-converters-lite/default.nix
rename to distros/melodic/ecl-converters-lite/default.nix
diff --git a/melodic/ecl-converters/default.nix b/distros/melodic/ecl-converters/default.nix
similarity index 100%
rename from melodic/ecl-converters/default.nix
rename to distros/melodic/ecl-converters/default.nix
diff --git a/melodic/ecl-core-apps/default.nix b/distros/melodic/ecl-core-apps/default.nix
similarity index 100%
rename from melodic/ecl-core-apps/default.nix
rename to distros/melodic/ecl-core-apps/default.nix
diff --git a/melodic/ecl-core/default.nix b/distros/melodic/ecl-core/default.nix
similarity index 100%
rename from melodic/ecl-core/default.nix
rename to distros/melodic/ecl-core/default.nix
diff --git a/melodic/ecl-devices/default.nix b/distros/melodic/ecl-devices/default.nix
similarity index 100%
rename from melodic/ecl-devices/default.nix
rename to distros/melodic/ecl-devices/default.nix
diff --git a/melodic/ecl-eigen/default.nix b/distros/melodic/ecl-eigen/default.nix
similarity index 100%
rename from melodic/ecl-eigen/default.nix
rename to distros/melodic/ecl-eigen/default.nix
diff --git a/melodic/ecl-errors/default.nix b/distros/melodic/ecl-errors/default.nix
similarity index 100%
rename from melodic/ecl-errors/default.nix
rename to distros/melodic/ecl-errors/default.nix
diff --git a/melodic/ecl-exceptions/default.nix b/distros/melodic/ecl-exceptions/default.nix
similarity index 100%
rename from melodic/ecl-exceptions/default.nix
rename to distros/melodic/ecl-exceptions/default.nix
diff --git a/melodic/ecl-filesystem/default.nix b/distros/melodic/ecl-filesystem/default.nix
similarity index 100%
rename from melodic/ecl-filesystem/default.nix
rename to distros/melodic/ecl-filesystem/default.nix
diff --git a/melodic/ecl-formatters/default.nix b/distros/melodic/ecl-formatters/default.nix
similarity index 100%
rename from melodic/ecl-formatters/default.nix
rename to distros/melodic/ecl-formatters/default.nix
diff --git a/melodic/ecl-geometry/default.nix b/distros/melodic/ecl-geometry/default.nix
similarity index 100%
rename from melodic/ecl-geometry/default.nix
rename to distros/melodic/ecl-geometry/default.nix
diff --git a/melodic/ecl-io/default.nix b/distros/melodic/ecl-io/default.nix
similarity index 100%
rename from melodic/ecl-io/default.nix
rename to distros/melodic/ecl-io/default.nix
diff --git a/melodic/ecl-ipc/default.nix b/distros/melodic/ecl-ipc/default.nix
similarity index 100%
rename from melodic/ecl-ipc/default.nix
rename to distros/melodic/ecl-ipc/default.nix
diff --git a/melodic/ecl-license/default.nix b/distros/melodic/ecl-license/default.nix
similarity index 100%
rename from melodic/ecl-license/default.nix
rename to distros/melodic/ecl-license/default.nix
diff --git a/melodic/ecl-linear-algebra/default.nix b/distros/melodic/ecl-linear-algebra/default.nix
similarity index 100%
rename from melodic/ecl-linear-algebra/default.nix
rename to distros/melodic/ecl-linear-algebra/default.nix
diff --git a/melodic/ecl-lite/default.nix b/distros/melodic/ecl-lite/default.nix
similarity index 100%
rename from melodic/ecl-lite/default.nix
rename to distros/melodic/ecl-lite/default.nix
diff --git a/melodic/ecl-manipulation/default.nix b/distros/melodic/ecl-manipulation/default.nix
similarity index 100%
rename from melodic/ecl-manipulation/default.nix
rename to distros/melodic/ecl-manipulation/default.nix
diff --git a/melodic/ecl-manipulators/default.nix b/distros/melodic/ecl-manipulators/default.nix
similarity index 100%
rename from melodic/ecl-manipulators/default.nix
rename to distros/melodic/ecl-manipulators/default.nix
diff --git a/melodic/ecl-math/default.nix b/distros/melodic/ecl-math/default.nix
similarity index 100%
rename from melodic/ecl-math/default.nix
rename to distros/melodic/ecl-math/default.nix
diff --git a/melodic/ecl-mobile-robot/default.nix b/distros/melodic/ecl-mobile-robot/default.nix
similarity index 100%
rename from melodic/ecl-mobile-robot/default.nix
rename to distros/melodic/ecl-mobile-robot/default.nix
diff --git a/melodic/ecl-mpl/default.nix b/distros/melodic/ecl-mpl/default.nix
similarity index 100%
rename from melodic/ecl-mpl/default.nix
rename to distros/melodic/ecl-mpl/default.nix
diff --git a/melodic/ecl-navigation/default.nix b/distros/melodic/ecl-navigation/default.nix
similarity index 100%
rename from melodic/ecl-navigation/default.nix
rename to distros/melodic/ecl-navigation/default.nix
diff --git a/melodic/ecl-sigslots-lite/default.nix b/distros/melodic/ecl-sigslots-lite/default.nix
similarity index 100%
rename from melodic/ecl-sigslots-lite/default.nix
rename to distros/melodic/ecl-sigslots-lite/default.nix
diff --git a/melodic/ecl-sigslots/default.nix b/distros/melodic/ecl-sigslots/default.nix
similarity index 100%
rename from melodic/ecl-sigslots/default.nix
rename to distros/melodic/ecl-sigslots/default.nix
diff --git a/melodic/ecl-statistics/default.nix b/distros/melodic/ecl-statistics/default.nix
similarity index 100%
rename from melodic/ecl-statistics/default.nix
rename to distros/melodic/ecl-statistics/default.nix
diff --git a/melodic/ecl-streams/default.nix b/distros/melodic/ecl-streams/default.nix
similarity index 100%
rename from melodic/ecl-streams/default.nix
rename to distros/melodic/ecl-streams/default.nix
diff --git a/melodic/ecl-threads/default.nix b/distros/melodic/ecl-threads/default.nix
similarity index 100%
rename from melodic/ecl-threads/default.nix
rename to distros/melodic/ecl-threads/default.nix
diff --git a/melodic/ecl-time-lite/default.nix b/distros/melodic/ecl-time-lite/default.nix
similarity index 100%
rename from melodic/ecl-time-lite/default.nix
rename to distros/melodic/ecl-time-lite/default.nix
diff --git a/melodic/ecl-time/default.nix b/distros/melodic/ecl-time/default.nix
similarity index 100%
rename from melodic/ecl-time/default.nix
rename to distros/melodic/ecl-time/default.nix
diff --git a/melodic/ecl-tools/default.nix b/distros/melodic/ecl-tools/default.nix
similarity index 100%
rename from melodic/ecl-tools/default.nix
rename to distros/melodic/ecl-tools/default.nix
diff --git a/melodic/ecl-type-traits/default.nix b/distros/melodic/ecl-type-traits/default.nix
similarity index 100%
rename from melodic/ecl-type-traits/default.nix
rename to distros/melodic/ecl-type-traits/default.nix
diff --git a/melodic/ecl-utilities/default.nix b/distros/melodic/ecl-utilities/default.nix
similarity index 100%
rename from melodic/ecl-utilities/default.nix
rename to distros/melodic/ecl-utilities/default.nix
diff --git a/melodic/ecl/default.nix b/distros/melodic/ecl/default.nix
similarity index 100%
rename from melodic/ecl/default.nix
rename to distros/melodic/ecl/default.nix
diff --git a/melodic/effort-controllers/default.nix b/distros/melodic/effort-controllers/default.nix
similarity index 100%
rename from melodic/effort-controllers/default.nix
rename to distros/melodic/effort-controllers/default.nix
diff --git a/melodic/eigen-conversions/default.nix b/distros/melodic/eigen-conversions/default.nix
similarity index 100%
rename from melodic/eigen-conversions/default.nix
rename to distros/melodic/eigen-conversions/default.nix
diff --git a/melodic/eigen-stl-containers/default.nix b/distros/melodic/eigen-stl-containers/default.nix
similarity index 100%
rename from melodic/eigen-stl-containers/default.nix
rename to distros/melodic/eigen-stl-containers/default.nix
diff --git a/melodic/eigenpy/default.nix b/distros/melodic/eigenpy/default.nix
similarity index 100%
rename from melodic/eigenpy/default.nix
rename to distros/melodic/eigenpy/default.nix
diff --git a/melodic/eml/default.nix b/distros/melodic/eml/default.nix
similarity index 100%
rename from melodic/eml/default.nix
rename to distros/melodic/eml/default.nix
diff --git a/melodic/ethercat-grant/default.nix b/distros/melodic/ethercat-grant/default.nix
similarity index 100%
rename from melodic/ethercat-grant/default.nix
rename to distros/melodic/ethercat-grant/default.nix
diff --git a/melodic/ethercat-hardware/default.nix b/distros/melodic/ethercat-hardware/default.nix
similarity index 100%
rename from melodic/ethercat-hardware/default.nix
rename to distros/melodic/ethercat-hardware/default.nix
diff --git a/melodic/ethercat-trigger-controllers/default.nix b/distros/melodic/ethercat-trigger-controllers/default.nix
similarity index 100%
rename from melodic/ethercat-trigger-controllers/default.nix
rename to distros/melodic/ethercat-trigger-controllers/default.nix
diff --git a/melodic/eus-assimp/default.nix b/distros/melodic/eus-assimp/default.nix
similarity index 100%
rename from melodic/eus-assimp/default.nix
rename to distros/melodic/eus-assimp/default.nix
diff --git a/melodic/euslisp/default.nix b/distros/melodic/euslisp/default.nix
similarity index 100%
rename from melodic/euslisp/default.nix
rename to distros/melodic/euslisp/default.nix
diff --git a/melodic/eusurdf/default.nix b/distros/melodic/eusurdf/default.nix
similarity index 100%
rename from melodic/eusurdf/default.nix
rename to distros/melodic/eusurdf/default.nix
diff --git a/melodic/executive-smach-visualization/default.nix b/distros/melodic/executive-smach-visualization/default.nix
similarity index 100%
rename from melodic/executive-smach-visualization/default.nix
rename to distros/melodic/executive-smach-visualization/default.nix
diff --git a/melodic/executive-smach/default.nix b/distros/melodic/executive-smach/default.nix
similarity index 100%
rename from melodic/executive-smach/default.nix
rename to distros/melodic/executive-smach/default.nix
diff --git a/melodic/exotica-aico-solver/default.nix b/distros/melodic/exotica-aico-solver/default.nix
similarity index 100%
rename from melodic/exotica-aico-solver/default.nix
rename to distros/melodic/exotica-aico-solver/default.nix
diff --git a/melodic/exotica-collision-scene-fcl-latest/default.nix b/distros/melodic/exotica-collision-scene-fcl-latest/default.nix
similarity index 100%
rename from melodic/exotica-collision-scene-fcl-latest/default.nix
rename to distros/melodic/exotica-collision-scene-fcl-latest/default.nix
diff --git a/melodic/exotica-core-task-maps/default.nix b/distros/melodic/exotica-core-task-maps/default.nix
similarity index 100%
rename from melodic/exotica-core-task-maps/default.nix
rename to distros/melodic/exotica-core-task-maps/default.nix
diff --git a/melodic/exotica-core/default.nix b/distros/melodic/exotica-core/default.nix
similarity index 100%
rename from melodic/exotica-core/default.nix
rename to distros/melodic/exotica-core/default.nix
diff --git a/melodic/exotica-examples/default.nix b/distros/melodic/exotica-examples/default.nix
similarity index 100%
rename from melodic/exotica-examples/default.nix
rename to distros/melodic/exotica-examples/default.nix
diff --git a/melodic/exotica-ik-solver/default.nix b/distros/melodic/exotica-ik-solver/default.nix
similarity index 100%
rename from melodic/exotica-ik-solver/default.nix
rename to distros/melodic/exotica-ik-solver/default.nix
diff --git a/melodic/exotica-levenberg-marquardt-solver/default.nix b/distros/melodic/exotica-levenberg-marquardt-solver/default.nix
similarity index 100%
rename from melodic/exotica-levenberg-marquardt-solver/default.nix
rename to distros/melodic/exotica-levenberg-marquardt-solver/default.nix
diff --git a/melodic/exotica-ompl-solver/default.nix b/distros/melodic/exotica-ompl-solver/default.nix
similarity index 100%
rename from melodic/exotica-ompl-solver/default.nix
rename to distros/melodic/exotica-ompl-solver/default.nix
diff --git a/melodic/exotica-time-indexed-rrt-connect-solver/default.nix b/distros/melodic/exotica-time-indexed-rrt-connect-solver/default.nix
similarity index 100%
rename from melodic/exotica-time-indexed-rrt-connect-solver/default.nix
rename to distros/melodic/exotica-time-indexed-rrt-connect-solver/default.nix
diff --git a/melodic/exotica-val-description/default.nix b/distros/melodic/exotica-val-description/default.nix
similarity index 100%
rename from melodic/exotica-val-description/default.nix
rename to distros/melodic/exotica-val-description/default.nix
diff --git a/melodic/exotica/default.nix b/distros/melodic/exotica/default.nix
similarity index 100%
rename from melodic/exotica/default.nix
rename to distros/melodic/exotica/default.nix
diff --git a/melodic/face-detector/default.nix b/distros/melodic/face-detector/default.nix
similarity index 100%
rename from melodic/face-detector/default.nix
rename to distros/melodic/face-detector/default.nix
diff --git a/melodic/fake-joint-driver/default.nix b/distros/melodic/fake-joint-driver/default.nix
similarity index 100%
rename from melodic/fake-joint-driver/default.nix
rename to distros/melodic/fake-joint-driver/default.nix
diff --git a/melodic/fake-joint-launch/default.nix b/distros/melodic/fake-joint-launch/default.nix
similarity index 100%
rename from melodic/fake-joint-launch/default.nix
rename to distros/melodic/fake-joint-launch/default.nix
diff --git a/melodic/fake-joint/default.nix b/distros/melodic/fake-joint/default.nix
similarity index 100%
rename from melodic/fake-joint/default.nix
rename to distros/melodic/fake-joint/default.nix
diff --git a/melodic/fake-localization/default.nix b/distros/melodic/fake-localization/default.nix
similarity index 100%
rename from melodic/fake-localization/default.nix
rename to distros/melodic/fake-localization/default.nix
diff --git a/melodic/fetch-auto-dock-msgs/default.nix b/distros/melodic/fetch-auto-dock-msgs/default.nix
similarity index 100%
rename from melodic/fetch-auto-dock-msgs/default.nix
rename to distros/melodic/fetch-auto-dock-msgs/default.nix
diff --git a/melodic/fetch-bringup/default.nix b/distros/melodic/fetch-bringup/default.nix
similarity index 100%
rename from melodic/fetch-bringup/default.nix
rename to distros/melodic/fetch-bringup/default.nix
diff --git a/melodic/fetch-calibration/default.nix b/distros/melodic/fetch-calibration/default.nix
similarity index 100%
rename from melodic/fetch-calibration/default.nix
rename to distros/melodic/fetch-calibration/default.nix
diff --git a/melodic/fetch-depth-layer/default.nix b/distros/melodic/fetch-depth-layer/default.nix
similarity index 100%
rename from melodic/fetch-depth-layer/default.nix
rename to distros/melodic/fetch-depth-layer/default.nix
diff --git a/melodic/fetch-description/default.nix b/distros/melodic/fetch-description/default.nix
similarity index 100%
rename from melodic/fetch-description/default.nix
rename to distros/melodic/fetch-description/default.nix
diff --git a/melodic/fetch-driver-msgs/default.nix b/distros/melodic/fetch-driver-msgs/default.nix
similarity index 100%
rename from melodic/fetch-driver-msgs/default.nix
rename to distros/melodic/fetch-driver-msgs/default.nix
diff --git a/melodic/fetch-drivers/default.nix b/distros/melodic/fetch-drivers/default.nix
similarity index 100%
rename from melodic/fetch-drivers/default.nix
rename to distros/melodic/fetch-drivers/default.nix
diff --git a/melodic/fetch-gazebo-demo/default.nix b/distros/melodic/fetch-gazebo-demo/default.nix
similarity index 100%
rename from melodic/fetch-gazebo-demo/default.nix
rename to distros/melodic/fetch-gazebo-demo/default.nix
diff --git a/melodic/fetch-gazebo/default.nix b/distros/melodic/fetch-gazebo/default.nix
similarity index 100%
rename from melodic/fetch-gazebo/default.nix
rename to distros/melodic/fetch-gazebo/default.nix
diff --git a/melodic/fetch-ikfast-plugin/default.nix b/distros/melodic/fetch-ikfast-plugin/default.nix
similarity index 100%
rename from melodic/fetch-ikfast-plugin/default.nix
rename to distros/melodic/fetch-ikfast-plugin/default.nix
diff --git a/melodic/fetch-maps/default.nix b/distros/melodic/fetch-maps/default.nix
similarity index 100%
rename from melodic/fetch-maps/default.nix
rename to distros/melodic/fetch-maps/default.nix
diff --git a/melodic/fetch-moveit-config/default.nix b/distros/melodic/fetch-moveit-config/default.nix
similarity index 100%
rename from melodic/fetch-moveit-config/default.nix
rename to distros/melodic/fetch-moveit-config/default.nix
diff --git a/melodic/fetch-navigation/default.nix b/distros/melodic/fetch-navigation/default.nix
similarity index 100%
rename from melodic/fetch-navigation/default.nix
rename to distros/melodic/fetch-navigation/default.nix
diff --git a/melodic/fetch-open-auto-dock/default.nix b/distros/melodic/fetch-open-auto-dock/default.nix
similarity index 100%
rename from melodic/fetch-open-auto-dock/default.nix
rename to distros/melodic/fetch-open-auto-dock/default.nix
diff --git a/melodic/fetch-ros/default.nix b/distros/melodic/fetch-ros/default.nix
similarity index 100%
rename from melodic/fetch-ros/default.nix
rename to distros/melodic/fetch-ros/default.nix
diff --git a/melodic/fetch-simple-linear-controller/default.nix b/distros/melodic/fetch-simple-linear-controller/default.nix
similarity index 100%
rename from melodic/fetch-simple-linear-controller/default.nix
rename to distros/melodic/fetch-simple-linear-controller/default.nix
diff --git a/melodic/fetch-simulation/default.nix b/distros/melodic/fetch-simulation/default.nix
similarity index 100%
rename from melodic/fetch-simulation/default.nix
rename to distros/melodic/fetch-simulation/default.nix
diff --git a/melodic/fetch-teleop/default.nix b/distros/melodic/fetch-teleop/default.nix
similarity index 100%
rename from melodic/fetch-teleop/default.nix
rename to distros/melodic/fetch-teleop/default.nix
diff --git a/melodic/fetchit-challenge/default.nix b/distros/melodic/fetchit-challenge/default.nix
similarity index 100%
rename from melodic/fetchit-challenge/default.nix
rename to distros/melodic/fetchit-challenge/default.nix
diff --git a/melodic/ff/default.nix b/distros/melodic/ff/default.nix
similarity index 100%
rename from melodic/ff/default.nix
rename to distros/melodic/ff/default.nix
diff --git a/melodic/ffha/default.nix b/distros/melodic/ffha/default.nix
similarity index 100%
rename from melodic/ffha/default.nix
rename to distros/melodic/ffha/default.nix
diff --git a/melodic/fiducial-msgs/default.nix b/distros/melodic/fiducial-msgs/default.nix
similarity index 100%
rename from melodic/fiducial-msgs/default.nix
rename to distros/melodic/fiducial-msgs/default.nix
diff --git a/melodic/fiducial-slam/default.nix b/distros/melodic/fiducial-slam/default.nix
similarity index 100%
rename from melodic/fiducial-slam/default.nix
rename to distros/melodic/fiducial-slam/default.nix
diff --git a/melodic/fiducials/default.nix b/distros/melodic/fiducials/default.nix
similarity index 100%
rename from melodic/fiducials/default.nix
rename to distros/melodic/fiducials/default.nix
diff --git a/melodic/file-management/default.nix b/distros/melodic/file-management/default.nix
similarity index 100%
rename from melodic/file-management/default.nix
rename to distros/melodic/file-management/default.nix
diff --git a/melodic/filters/default.nix b/distros/melodic/filters/default.nix
similarity index 100%
rename from melodic/filters/default.nix
rename to distros/melodic/filters/default.nix
diff --git a/melodic/find-object-2d/default.nix b/distros/melodic/find-object-2d/default.nix
similarity index 100%
rename from melodic/find-object-2d/default.nix
rename to distros/melodic/find-object-2d/default.nix
diff --git a/melodic/fingertip-pressure/default.nix b/distros/melodic/fingertip-pressure/default.nix
similarity index 100%
rename from melodic/fingertip-pressure/default.nix
rename to distros/melodic/fingertip-pressure/default.nix
diff --git a/melodic/fkie-message-filters/default.nix b/distros/melodic/fkie-message-filters/default.nix
similarity index 100%
rename from melodic/fkie-message-filters/default.nix
rename to distros/melodic/fkie-message-filters/default.nix
diff --git a/melodic/fkie-potree-rviz-plugin/default.nix b/distros/melodic/fkie-potree-rviz-plugin/default.nix
similarity index 100%
rename from melodic/fkie-potree-rviz-plugin/default.nix
rename to distros/melodic/fkie-potree-rviz-plugin/default.nix
diff --git a/melodic/flatbuffers/default.nix b/distros/melodic/flatbuffers/default.nix
similarity index 100%
rename from melodic/flatbuffers/default.nix
rename to distros/melodic/flatbuffers/default.nix
diff --git a/melodic/flexbe-behavior-engine/default.nix b/distros/melodic/flexbe-behavior-engine/default.nix
similarity index 100%
rename from melodic/flexbe-behavior-engine/default.nix
rename to distros/melodic/flexbe-behavior-engine/default.nix
diff --git a/melodic/flexbe-core/default.nix b/distros/melodic/flexbe-core/default.nix
similarity index 100%
rename from melodic/flexbe-core/default.nix
rename to distros/melodic/flexbe-core/default.nix
diff --git a/melodic/flexbe-input/default.nix b/distros/melodic/flexbe-input/default.nix
similarity index 100%
rename from melodic/flexbe-input/default.nix
rename to distros/melodic/flexbe-input/default.nix
diff --git a/melodic/flexbe-mirror/default.nix b/distros/melodic/flexbe-mirror/default.nix
similarity index 100%
rename from melodic/flexbe-mirror/default.nix
rename to distros/melodic/flexbe-mirror/default.nix
diff --git a/melodic/flexbe-msgs/default.nix b/distros/melodic/flexbe-msgs/default.nix
similarity index 100%
rename from melodic/flexbe-msgs/default.nix
rename to distros/melodic/flexbe-msgs/default.nix
diff --git a/melodic/flexbe-onboard/default.nix b/distros/melodic/flexbe-onboard/default.nix
similarity index 100%
rename from melodic/flexbe-onboard/default.nix
rename to distros/melodic/flexbe-onboard/default.nix
diff --git a/melodic/flexbe-states/default.nix b/distros/melodic/flexbe-states/default.nix
similarity index 100%
rename from melodic/flexbe-states/default.nix
rename to distros/melodic/flexbe-states/default.nix
diff --git a/melodic/flexbe-testing/default.nix b/distros/melodic/flexbe-testing/default.nix
similarity index 100%
rename from melodic/flexbe-testing/default.nix
rename to distros/melodic/flexbe-testing/default.nix
diff --git a/melodic/flexbe-widget/default.nix b/distros/melodic/flexbe-widget/default.nix
similarity index 100%
rename from melodic/flexbe-widget/default.nix
rename to distros/melodic/flexbe-widget/default.nix
diff --git a/melodic/flir-boson-usb/default.nix b/distros/melodic/flir-boson-usb/default.nix
similarity index 100%
rename from melodic/flir-boson-usb/default.nix
rename to distros/melodic/flir-boson-usb/default.nix
diff --git a/melodic/fmi-adapter-examples/default.nix b/distros/melodic/fmi-adapter-examples/default.nix
similarity index 100%
rename from melodic/fmi-adapter-examples/default.nix
rename to distros/melodic/fmi-adapter-examples/default.nix
diff --git a/melodic/fmi-adapter/default.nix b/distros/melodic/fmi-adapter/default.nix
similarity index 100%
rename from melodic/fmi-adapter/default.nix
rename to distros/melodic/fmi-adapter/default.nix
diff --git a/melodic/force-torque-sensor-controller/default.nix b/distros/melodic/force-torque-sensor-controller/default.nix
similarity index 100%
rename from melodic/force-torque-sensor-controller/default.nix
rename to distros/melodic/force-torque-sensor-controller/default.nix
diff --git a/melodic/forward-command-controller/default.nix b/distros/melodic/forward-command-controller/default.nix
similarity index 100%
rename from melodic/forward-command-controller/default.nix
rename to distros/melodic/forward-command-controller/default.nix
diff --git a/melodic/four-wheel-steering-controller/default.nix b/distros/melodic/four-wheel-steering-controller/default.nix
similarity index 100%
rename from melodic/four-wheel-steering-controller/default.nix
rename to distros/melodic/four-wheel-steering-controller/default.nix
diff --git a/melodic/four-wheel-steering-msgs/default.nix b/distros/melodic/four-wheel-steering-msgs/default.nix
similarity index 100%
rename from melodic/four-wheel-steering-msgs/default.nix
rename to distros/melodic/four-wheel-steering-msgs/default.nix
diff --git a/melodic/franka-control/default.nix b/distros/melodic/franka-control/default.nix
similarity index 100%
rename from melodic/franka-control/default.nix
rename to distros/melodic/franka-control/default.nix
diff --git a/melodic/franka-description/default.nix b/distros/melodic/franka-description/default.nix
similarity index 100%
rename from melodic/franka-description/default.nix
rename to distros/melodic/franka-description/default.nix
diff --git a/melodic/franka-example-controllers/default.nix b/distros/melodic/franka-example-controllers/default.nix
similarity index 100%
rename from melodic/franka-example-controllers/default.nix
rename to distros/melodic/franka-example-controllers/default.nix
diff --git a/melodic/franka-gripper/default.nix b/distros/melodic/franka-gripper/default.nix
similarity index 100%
rename from melodic/franka-gripper/default.nix
rename to distros/melodic/franka-gripper/default.nix
diff --git a/melodic/franka-hw/default.nix b/distros/melodic/franka-hw/default.nix
similarity index 100%
rename from melodic/franka-hw/default.nix
rename to distros/melodic/franka-hw/default.nix
diff --git a/melodic/franka-msgs/default.nix b/distros/melodic/franka-msgs/default.nix
similarity index 100%
rename from melodic/franka-msgs/default.nix
rename to distros/melodic/franka-msgs/default.nix
diff --git a/melodic/franka-ros/default.nix b/distros/melodic/franka-ros/default.nix
similarity index 100%
rename from melodic/franka-ros/default.nix
rename to distros/melodic/franka-ros/default.nix
diff --git a/melodic/franka-visualization/default.nix b/distros/melodic/franka-visualization/default.nix
similarity index 100%
rename from melodic/franka-visualization/default.nix
rename to distros/melodic/franka-visualization/default.nix
diff --git a/melodic/freight-bringup/default.nix b/distros/melodic/freight-bringup/default.nix
similarity index 100%
rename from melodic/freight-bringup/default.nix
rename to distros/melodic/freight-bringup/default.nix
diff --git a/melodic/fsrobo-r-bringup/default.nix b/distros/melodic/fsrobo-r-bringup/default.nix
similarity index 100%
rename from melodic/fsrobo-r-bringup/default.nix
rename to distros/melodic/fsrobo-r-bringup/default.nix
diff --git a/melodic/fsrobo-r-description/default.nix b/distros/melodic/fsrobo-r-description/default.nix
similarity index 100%
rename from melodic/fsrobo-r-description/default.nix
rename to distros/melodic/fsrobo-r-description/default.nix
diff --git a/melodic/fsrobo-r-driver/default.nix b/distros/melodic/fsrobo-r-driver/default.nix
similarity index 100%
rename from melodic/fsrobo-r-driver/default.nix
rename to distros/melodic/fsrobo-r-driver/default.nix
diff --git a/melodic/fsrobo-r-moveit-config/default.nix b/distros/melodic/fsrobo-r-moveit-config/default.nix
similarity index 100%
rename from melodic/fsrobo-r-moveit-config/default.nix
rename to distros/melodic/fsrobo-r-moveit-config/default.nix
diff --git a/melodic/fsrobo-r-msgs/default.nix b/distros/melodic/fsrobo-r-msgs/default.nix
similarity index 100%
rename from melodic/fsrobo-r-msgs/default.nix
rename to distros/melodic/fsrobo-r-msgs/default.nix
diff --git a/melodic/fsrobo-r-trajectory-filters/default.nix b/distros/melodic/fsrobo-r-trajectory-filters/default.nix
similarity index 100%
rename from melodic/fsrobo-r-trajectory-filters/default.nix
rename to distros/melodic/fsrobo-r-trajectory-filters/default.nix
diff --git a/melodic/fsrobo-r/default.nix b/distros/melodic/fsrobo-r/default.nix
similarity index 100%
rename from melodic/fsrobo-r/default.nix
rename to distros/melodic/fsrobo-r/default.nix
diff --git a/melodic/gateway-msgs/default.nix b/distros/melodic/gateway-msgs/default.nix
similarity index 100%
rename from melodic/gateway-msgs/default.nix
rename to distros/melodic/gateway-msgs/default.nix
diff --git a/melodic/gazebo-dev/default.nix b/distros/melodic/gazebo-dev/default.nix
similarity index 100%
rename from melodic/gazebo-dev/default.nix
rename to distros/melodic/gazebo-dev/default.nix
diff --git a/melodic/gazebo-msgs/default.nix b/distros/melodic/gazebo-msgs/default.nix
similarity index 100%
rename from melodic/gazebo-msgs/default.nix
rename to distros/melodic/gazebo-msgs/default.nix
diff --git a/melodic/gazebo-plugins/default.nix b/distros/melodic/gazebo-plugins/default.nix
similarity index 100%
rename from melodic/gazebo-plugins/default.nix
rename to distros/melodic/gazebo-plugins/default.nix
diff --git a/melodic/gazebo-ros-control/default.nix b/distros/melodic/gazebo-ros-control/default.nix
similarity index 100%
rename from melodic/gazebo-ros-control/default.nix
rename to distros/melodic/gazebo-ros-control/default.nix
diff --git a/melodic/gazebo-ros-pkgs/default.nix b/distros/melodic/gazebo-ros-pkgs/default.nix
similarity index 100%
rename from melodic/gazebo-ros-pkgs/default.nix
rename to distros/melodic/gazebo-ros-pkgs/default.nix
diff --git a/melodic/gazebo-ros/default.nix b/distros/melodic/gazebo-ros/default.nix
similarity index 100%
rename from melodic/gazebo-ros/default.nix
rename to distros/melodic/gazebo-ros/default.nix
diff --git a/melodic/gencpp/default.nix b/distros/melodic/gencpp/default.nix
similarity index 100%
rename from melodic/gencpp/default.nix
rename to distros/melodic/gencpp/default.nix
diff --git a/melodic/generated.nix b/distros/melodic/generated.nix
similarity index 100%
rename from melodic/generated.nix
rename to distros/melodic/generated.nix
diff --git a/melodic/generic-throttle/default.nix b/distros/melodic/generic-throttle/default.nix
similarity index 100%
rename from melodic/generic-throttle/default.nix
rename to distros/melodic/generic-throttle/default.nix
diff --git a/melodic/geneus/default.nix b/distros/melodic/geneus/default.nix
similarity index 100%
rename from melodic/geneus/default.nix
rename to distros/melodic/geneus/default.nix
diff --git a/melodic/genlisp/default.nix b/distros/melodic/genlisp/default.nix
similarity index 100%
rename from melodic/genlisp/default.nix
rename to distros/melodic/genlisp/default.nix
diff --git a/melodic/genmsg/default.nix b/distros/melodic/genmsg/default.nix
similarity index 100%
rename from melodic/genmsg/default.nix
rename to distros/melodic/genmsg/default.nix
diff --git a/melodic/gennodejs/default.nix b/distros/melodic/gennodejs/default.nix
similarity index 100%
rename from melodic/gennodejs/default.nix
rename to distros/melodic/gennodejs/default.nix
diff --git a/melodic/genpy/default.nix b/distros/melodic/genpy/default.nix
similarity index 100%
rename from melodic/genpy/default.nix
rename to distros/melodic/genpy/default.nix
diff --git a/melodic/geodesy/default.nix b/distros/melodic/geodesy/default.nix
similarity index 100%
rename from melodic/geodesy/default.nix
rename to distros/melodic/geodesy/default.nix
diff --git a/melodic/geographic-info/default.nix b/distros/melodic/geographic-info/default.nix
similarity index 100%
rename from melodic/geographic-info/default.nix
rename to distros/melodic/geographic-info/default.nix
diff --git a/melodic/geographic-msgs/default.nix b/distros/melodic/geographic-msgs/default.nix
similarity index 100%
rename from melodic/geographic-msgs/default.nix
rename to distros/melodic/geographic-msgs/default.nix
diff --git a/melodic/geometric-shapes/default.nix b/distros/melodic/geometric-shapes/default.nix
similarity index 100%
rename from melodic/geometric-shapes/default.nix
rename to distros/melodic/geometric-shapes/default.nix
diff --git a/melodic/geometry-msgs/default.nix b/distros/melodic/geometry-msgs/default.nix
similarity index 100%
rename from melodic/geometry-msgs/default.nix
rename to distros/melodic/geometry-msgs/default.nix
diff --git a/melodic/geometry-tutorials/default.nix b/distros/melodic/geometry-tutorials/default.nix
similarity index 100%
rename from melodic/geometry-tutorials/default.nix
rename to distros/melodic/geometry-tutorials/default.nix
diff --git a/melodic/geometry/default.nix b/distros/melodic/geometry/default.nix
similarity index 100%
rename from melodic/geometry/default.nix
rename to distros/melodic/geometry/default.nix
diff --git a/melodic/geometry2/default.nix b/distros/melodic/geometry2/default.nix
similarity index 100%
rename from melodic/geometry2/default.nix
rename to distros/melodic/geometry2/default.nix
diff --git a/melodic/gl-dependency/default.nix b/distros/melodic/gl-dependency/default.nix
similarity index 100%
rename from melodic/gl-dependency/default.nix
rename to distros/melodic/gl-dependency/default.nix
diff --git a/melodic/global-planner-tests/default.nix b/distros/melodic/global-planner-tests/default.nix
similarity index 100%
rename from melodic/global-planner-tests/default.nix
rename to distros/melodic/global-planner-tests/default.nix
diff --git a/melodic/global-planner/default.nix b/distros/melodic/global-planner/default.nix
similarity index 100%
rename from melodic/global-planner/default.nix
rename to distros/melodic/global-planner/default.nix
diff --git a/melodic/gmapping/default.nix b/distros/melodic/gmapping/default.nix
similarity index 100%
rename from melodic/gmapping/default.nix
rename to distros/melodic/gmapping/default.nix
diff --git a/melodic/goal-passer/default.nix b/distros/melodic/goal-passer/default.nix
similarity index 100%
rename from melodic/goal-passer/default.nix
rename to distros/melodic/goal-passer/default.nix
diff --git a/melodic/gps-common/default.nix b/distros/melodic/gps-common/default.nix
similarity index 100%
rename from melodic/gps-common/default.nix
rename to distros/melodic/gps-common/default.nix
diff --git a/melodic/gps-umd/default.nix b/distros/melodic/gps-umd/default.nix
similarity index 100%
rename from melodic/gps-umd/default.nix
rename to distros/melodic/gps-umd/default.nix
diff --git a/melodic/gpsd-client/default.nix b/distros/melodic/gpsd-client/default.nix
similarity index 100%
rename from melodic/gpsd-client/default.nix
rename to distros/melodic/gpsd-client/default.nix
diff --git a/melodic/graft/default.nix b/distros/melodic/graft/default.nix
similarity index 100%
rename from melodic/graft/default.nix
rename to distros/melodic/graft/default.nix
diff --git a/melodic/graph-msgs/default.nix b/distros/melodic/graph-msgs/default.nix
similarity index 100%
rename from melodic/graph-msgs/default.nix
rename to distros/melodic/graph-msgs/default.nix
diff --git a/melodic/grasping-msgs/default.nix b/distros/melodic/grasping-msgs/default.nix
similarity index 100%
rename from melodic/grasping-msgs/default.nix
rename to distros/melodic/grasping-msgs/default.nix
diff --git a/melodic/grid-map-core/default.nix b/distros/melodic/grid-map-core/default.nix
similarity index 100%
rename from melodic/grid-map-core/default.nix
rename to distros/melodic/grid-map-core/default.nix
diff --git a/melodic/grid-map-costmap-2d/default.nix b/distros/melodic/grid-map-costmap-2d/default.nix
similarity index 100%
rename from melodic/grid-map-costmap-2d/default.nix
rename to distros/melodic/grid-map-costmap-2d/default.nix
diff --git a/melodic/grid-map-cv/default.nix b/distros/melodic/grid-map-cv/default.nix
similarity index 100%
rename from melodic/grid-map-cv/default.nix
rename to distros/melodic/grid-map-cv/default.nix
diff --git a/melodic/grid-map-demos/default.nix b/distros/melodic/grid-map-demos/default.nix
similarity index 100%
rename from melodic/grid-map-demos/default.nix
rename to distros/melodic/grid-map-demos/default.nix
diff --git a/melodic/grid-map-filters/default.nix b/distros/melodic/grid-map-filters/default.nix
similarity index 100%
rename from melodic/grid-map-filters/default.nix
rename to distros/melodic/grid-map-filters/default.nix
diff --git a/melodic/grid-map-loader/default.nix b/distros/melodic/grid-map-loader/default.nix
similarity index 100%
rename from melodic/grid-map-loader/default.nix
rename to distros/melodic/grid-map-loader/default.nix
diff --git a/melodic/grid-map-msgs/default.nix b/distros/melodic/grid-map-msgs/default.nix
similarity index 100%
rename from melodic/grid-map-msgs/default.nix
rename to distros/melodic/grid-map-msgs/default.nix
diff --git a/melodic/grid-map-octomap/default.nix b/distros/melodic/grid-map-octomap/default.nix
similarity index 100%
rename from melodic/grid-map-octomap/default.nix
rename to distros/melodic/grid-map-octomap/default.nix
diff --git a/melodic/grid-map-pcl/default.nix b/distros/melodic/grid-map-pcl/default.nix
similarity index 100%
rename from melodic/grid-map-pcl/default.nix
rename to distros/melodic/grid-map-pcl/default.nix
diff --git a/melodic/grid-map-ros/default.nix b/distros/melodic/grid-map-ros/default.nix
similarity index 100%
rename from melodic/grid-map-ros/default.nix
rename to distros/melodic/grid-map-ros/default.nix
diff --git a/melodic/grid-map-rviz-plugin/default.nix b/distros/melodic/grid-map-rviz-plugin/default.nix
similarity index 100%
rename from melodic/grid-map-rviz-plugin/default.nix
rename to distros/melodic/grid-map-rviz-plugin/default.nix
diff --git a/melodic/grid-map-sdf/default.nix b/distros/melodic/grid-map-sdf/default.nix
similarity index 100%
rename from melodic/grid-map-sdf/default.nix
rename to distros/melodic/grid-map-sdf/default.nix
diff --git a/melodic/grid-map-visualization/default.nix b/distros/melodic/grid-map-visualization/default.nix
similarity index 100%
rename from melodic/grid-map-visualization/default.nix
rename to distros/melodic/grid-map-visualization/default.nix
diff --git a/melodic/grid-map/default.nix b/distros/melodic/grid-map/default.nix
similarity index 100%
rename from melodic/grid-map/default.nix
rename to distros/melodic/grid-map/default.nix
diff --git a/melodic/gripper-action-controller/default.nix b/distros/melodic/gripper-action-controller/default.nix
similarity index 100%
rename from melodic/gripper-action-controller/default.nix
rename to distros/melodic/gripper-action-controller/default.nix
diff --git a/melodic/grpc/default.nix b/distros/melodic/grpc/default.nix
similarity index 100%
rename from melodic/grpc/default.nix
rename to distros/melodic/grpc/default.nix
diff --git a/melodic/gscam/default.nix b/distros/melodic/gscam/default.nix
similarity index 100%
rename from melodic/gscam/default.nix
rename to distros/melodic/gscam/default.nix
diff --git a/melodic/h264-encoder-core/default.nix b/distros/melodic/h264-encoder-core/default.nix
similarity index 100%
rename from melodic/h264-encoder-core/default.nix
rename to distros/melodic/h264-encoder-core/default.nix
diff --git a/melodic/h264-video-encoder/default.nix b/distros/melodic/h264-video-encoder/default.nix
similarity index 100%
rename from melodic/h264-video-encoder/default.nix
rename to distros/melodic/h264-video-encoder/default.nix
diff --git a/melodic/handeye/default.nix b/distros/melodic/handeye/default.nix
similarity index 100%
rename from melodic/handeye/default.nix
rename to distros/melodic/handeye/default.nix
diff --git a/melodic/hardware-interface/default.nix b/distros/melodic/hardware-interface/default.nix
similarity index 100%
rename from melodic/hardware-interface/default.nix
rename to distros/melodic/hardware-interface/default.nix
diff --git a/melodic/haros-catkin/default.nix b/distros/melodic/haros-catkin/default.nix
similarity index 100%
rename from melodic/haros-catkin/default.nix
rename to distros/melodic/haros-catkin/default.nix
diff --git a/melodic/health-metric-collector/default.nix b/distros/melodic/health-metric-collector/default.nix
similarity index 100%
rename from melodic/health-metric-collector/default.nix
rename to distros/melodic/health-metric-collector/default.nix
diff --git a/melodic/hebi-cpp-api/default.nix b/distros/melodic/hebi-cpp-api/default.nix
similarity index 100%
rename from melodic/hebi-cpp-api/default.nix
rename to distros/melodic/hebi-cpp-api/default.nix
diff --git a/melodic/hebi-description/default.nix b/distros/melodic/hebi-description/default.nix
similarity index 100%
rename from melodic/hebi-description/default.nix
rename to distros/melodic/hebi-description/default.nix
diff --git a/melodic/hector-components-description/default.nix b/distros/melodic/hector-components-description/default.nix
similarity index 100%
rename from melodic/hector-components-description/default.nix
rename to distros/melodic/hector-components-description/default.nix
diff --git a/melodic/hector-compressed-map-transport/default.nix b/distros/melodic/hector-compressed-map-transport/default.nix
similarity index 100%
rename from melodic/hector-compressed-map-transport/default.nix
rename to distros/melodic/hector-compressed-map-transport/default.nix
diff --git a/melodic/hector-gazebo-plugins/default.nix b/distros/melodic/hector-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/hector-gazebo-plugins/default.nix
rename to distros/melodic/hector-gazebo-plugins/default.nix
diff --git a/melodic/hector-gazebo-thermal-camera/default.nix b/distros/melodic/hector-gazebo-thermal-camera/default.nix
similarity index 100%
rename from melodic/hector-gazebo-thermal-camera/default.nix
rename to distros/melodic/hector-gazebo-thermal-camera/default.nix
diff --git a/melodic/hector-gazebo-worlds/default.nix b/distros/melodic/hector-gazebo-worlds/default.nix
similarity index 100%
rename from melodic/hector-gazebo-worlds/default.nix
rename to distros/melodic/hector-gazebo-worlds/default.nix
diff --git a/melodic/hector-gazebo/default.nix b/distros/melodic/hector-gazebo/default.nix
similarity index 100%
rename from melodic/hector-gazebo/default.nix
rename to distros/melodic/hector-gazebo/default.nix
diff --git a/melodic/hector-geotiff-plugins/default.nix b/distros/melodic/hector-geotiff-plugins/default.nix
similarity index 100%
rename from melodic/hector-geotiff-plugins/default.nix
rename to distros/melodic/hector-geotiff-plugins/default.nix
diff --git a/melodic/hector-geotiff/default.nix b/distros/melodic/hector-geotiff/default.nix
similarity index 100%
rename from melodic/hector-geotiff/default.nix
rename to distros/melodic/hector-geotiff/default.nix
diff --git a/melodic/hector-imu-attitude-to-tf/default.nix b/distros/melodic/hector-imu-attitude-to-tf/default.nix
similarity index 100%
rename from melodic/hector-imu-attitude-to-tf/default.nix
rename to distros/melodic/hector-imu-attitude-to-tf/default.nix
diff --git a/melodic/hector-imu-tools/default.nix b/distros/melodic/hector-imu-tools/default.nix
similarity index 100%
rename from melodic/hector-imu-tools/default.nix
rename to distros/melodic/hector-imu-tools/default.nix
diff --git a/melodic/hector-map-server/default.nix b/distros/melodic/hector-map-server/default.nix
similarity index 100%
rename from melodic/hector-map-server/default.nix
rename to distros/melodic/hector-map-server/default.nix
diff --git a/melodic/hector-map-tools/default.nix b/distros/melodic/hector-map-tools/default.nix
similarity index 100%
rename from melodic/hector-map-tools/default.nix
rename to distros/melodic/hector-map-tools/default.nix
diff --git a/melodic/hector-mapping/default.nix b/distros/melodic/hector-mapping/default.nix
similarity index 100%
rename from melodic/hector-mapping/default.nix
rename to distros/melodic/hector-mapping/default.nix
diff --git a/melodic/hector-marker-drawing/default.nix b/distros/melodic/hector-marker-drawing/default.nix
similarity index 100%
rename from melodic/hector-marker-drawing/default.nix
rename to distros/melodic/hector-marker-drawing/default.nix
diff --git a/melodic/hector-models/default.nix b/distros/melodic/hector-models/default.nix
similarity index 100%
rename from melodic/hector-models/default.nix
rename to distros/melodic/hector-models/default.nix
diff --git a/melodic/hector-nav-msgs/default.nix b/distros/melodic/hector-nav-msgs/default.nix
similarity index 100%
rename from melodic/hector-nav-msgs/default.nix
rename to distros/melodic/hector-nav-msgs/default.nix
diff --git a/melodic/hector-sensors-description/default.nix b/distros/melodic/hector-sensors-description/default.nix
similarity index 100%
rename from melodic/hector-sensors-description/default.nix
rename to distros/melodic/hector-sensors-description/default.nix
diff --git a/melodic/hector-sensors-gazebo/default.nix b/distros/melodic/hector-sensors-gazebo/default.nix
similarity index 100%
rename from melodic/hector-sensors-gazebo/default.nix
rename to distros/melodic/hector-sensors-gazebo/default.nix
diff --git a/melodic/hector-slam-launch/default.nix b/distros/melodic/hector-slam-launch/default.nix
similarity index 100%
rename from melodic/hector-slam-launch/default.nix
rename to distros/melodic/hector-slam-launch/default.nix
diff --git a/melodic/hector-slam/default.nix b/distros/melodic/hector-slam/default.nix
similarity index 100%
rename from melodic/hector-slam/default.nix
rename to distros/melodic/hector-slam/default.nix
diff --git a/melodic/hector-trajectory-server/default.nix b/distros/melodic/hector-trajectory-server/default.nix
similarity index 100%
rename from melodic/hector-trajectory-server/default.nix
rename to distros/melodic/hector-trajectory-server/default.nix
diff --git a/melodic/hector-xacro-tools/default.nix b/distros/melodic/hector-xacro-tools/default.nix
similarity index 100%
rename from melodic/hector-xacro-tools/default.nix
rename to distros/melodic/hector-xacro-tools/default.nix
diff --git a/melodic/hls-lfcd-lds-driver/default.nix b/distros/melodic/hls-lfcd-lds-driver/default.nix
similarity index 100%
rename from melodic/hls-lfcd-lds-driver/default.nix
rename to distros/melodic/hls-lfcd-lds-driver/default.nix
diff --git a/melodic/hostapd-access-point/default.nix b/distros/melodic/hostapd-access-point/default.nix
similarity index 100%
rename from melodic/hostapd-access-point/default.nix
rename to distros/melodic/hostapd-access-point/default.nix
diff --git a/melodic/hpp-fcl/default.nix b/distros/melodic/hpp-fcl/default.nix
similarity index 100%
rename from melodic/hpp-fcl/default.nix
rename to distros/melodic/hpp-fcl/default.nix
diff --git a/melodic/husky-base/default.nix b/distros/melodic/husky-base/default.nix
similarity index 100%
rename from melodic/husky-base/default.nix
rename to distros/melodic/husky-base/default.nix
diff --git a/melodic/husky-bringup/default.nix b/distros/melodic/husky-bringup/default.nix
similarity index 100%
rename from melodic/husky-bringup/default.nix
rename to distros/melodic/husky-bringup/default.nix
diff --git a/melodic/husky-control/default.nix b/distros/melodic/husky-control/default.nix
similarity index 100%
rename from melodic/husky-control/default.nix
rename to distros/melodic/husky-control/default.nix
diff --git a/melodic/husky-description/default.nix b/distros/melodic/husky-description/default.nix
similarity index 100%
rename from melodic/husky-description/default.nix
rename to distros/melodic/husky-description/default.nix
diff --git a/melodic/husky-desktop/default.nix b/distros/melodic/husky-desktop/default.nix
similarity index 100%
rename from melodic/husky-desktop/default.nix
rename to distros/melodic/husky-desktop/default.nix
diff --git a/melodic/husky-gazebo/default.nix b/distros/melodic/husky-gazebo/default.nix
similarity index 100%
rename from melodic/husky-gazebo/default.nix
rename to distros/melodic/husky-gazebo/default.nix
diff --git a/melodic/husky-msgs/default.nix b/distros/melodic/husky-msgs/default.nix
similarity index 100%
rename from melodic/husky-msgs/default.nix
rename to distros/melodic/husky-msgs/default.nix
diff --git a/melodic/husky-navigation/default.nix b/distros/melodic/husky-navigation/default.nix
similarity index 100%
rename from melodic/husky-navigation/default.nix
rename to distros/melodic/husky-navigation/default.nix
diff --git a/melodic/husky-robot/default.nix b/distros/melodic/husky-robot/default.nix
similarity index 100%
rename from melodic/husky-robot/default.nix
rename to distros/melodic/husky-robot/default.nix
diff --git a/melodic/husky-simulator/default.nix b/distros/melodic/husky-simulator/default.nix
similarity index 100%
rename from melodic/husky-simulator/default.nix
rename to distros/melodic/husky-simulator/default.nix
diff --git a/melodic/husky-viz/default.nix b/distros/melodic/husky-viz/default.nix
similarity index 100%
rename from melodic/husky-viz/default.nix
rename to distros/melodic/husky-viz/default.nix
diff --git a/melodic/ibeo-core/default.nix b/distros/melodic/ibeo-core/default.nix
similarity index 100%
rename from melodic/ibeo-core/default.nix
rename to distros/melodic/ibeo-core/default.nix
diff --git a/melodic/ibeo-lux/default.nix b/distros/melodic/ibeo-lux/default.nix
similarity index 100%
rename from melodic/ibeo-lux/default.nix
rename to distros/melodic/ibeo-lux/default.nix
diff --git a/melodic/ibeo-msgs/default.nix b/distros/melodic/ibeo-msgs/default.nix
similarity index 100%
rename from melodic/ibeo-msgs/default.nix
rename to distros/melodic/ibeo-msgs/default.nix
diff --git a/melodic/ieee80211-channels/default.nix b/distros/melodic/ieee80211-channels/default.nix
similarity index 100%
rename from melodic/ieee80211-channels/default.nix
rename to distros/melodic/ieee80211-channels/default.nix
diff --git a/melodic/igvc-self-drive-description/default.nix b/distros/melodic/igvc-self-drive-description/default.nix
similarity index 100%
rename from melodic/igvc-self-drive-description/default.nix
rename to distros/melodic/igvc-self-drive-description/default.nix
diff --git a/melodic/igvc-self-drive-gazebo-plugins/default.nix b/distros/melodic/igvc-self-drive-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/igvc-self-drive-gazebo-plugins/default.nix
rename to distros/melodic/igvc-self-drive-gazebo-plugins/default.nix
diff --git a/melodic/igvc-self-drive-gazebo/default.nix b/distros/melodic/igvc-self-drive-gazebo/default.nix
similarity index 100%
rename from melodic/igvc-self-drive-gazebo/default.nix
rename to distros/melodic/igvc-self-drive-gazebo/default.nix
diff --git a/melodic/igvc-self-drive-sim/default.nix b/distros/melodic/igvc-self-drive-sim/default.nix
similarity index 100%
rename from melodic/igvc-self-drive-sim/default.nix
rename to distros/melodic/igvc-self-drive-sim/default.nix
diff --git a/melodic/iirob-filters/default.nix b/distros/melodic/iirob-filters/default.nix
similarity index 100%
rename from melodic/iirob-filters/default.nix
rename to distros/melodic/iirob-filters/default.nix
diff --git a/melodic/image-cb-detector/default.nix b/distros/melodic/image-cb-detector/default.nix
similarity index 100%
rename from melodic/image-cb-detector/default.nix
rename to distros/melodic/image-cb-detector/default.nix
diff --git a/melodic/image-common/default.nix b/distros/melodic/image-common/default.nix
similarity index 100%
rename from melodic/image-common/default.nix
rename to distros/melodic/image-common/default.nix
diff --git a/melodic/image-geometry/default.nix b/distros/melodic/image-geometry/default.nix
similarity index 100%
rename from melodic/image-geometry/default.nix
rename to distros/melodic/image-geometry/default.nix
diff --git a/melodic/image-pipeline/default.nix b/distros/melodic/image-pipeline/default.nix
similarity index 100%
rename from melodic/image-pipeline/default.nix
rename to distros/melodic/image-pipeline/default.nix
diff --git a/melodic/image-proc/default.nix b/distros/melodic/image-proc/default.nix
similarity index 100%
rename from melodic/image-proc/default.nix
rename to distros/melodic/image-proc/default.nix
diff --git a/melodic/image-publisher/default.nix b/distros/melodic/image-publisher/default.nix
similarity index 100%
rename from melodic/image-publisher/default.nix
rename to distros/melodic/image-publisher/default.nix
diff --git a/melodic/image-rotate/default.nix b/distros/melodic/image-rotate/default.nix
similarity index 100%
rename from melodic/image-rotate/default.nix
rename to distros/melodic/image-rotate/default.nix
diff --git a/melodic/image-transport-plugins/default.nix b/distros/melodic/image-transport-plugins/default.nix
similarity index 100%
rename from melodic/image-transport-plugins/default.nix
rename to distros/melodic/image-transport-plugins/default.nix
diff --git a/melodic/image-transport/default.nix b/distros/melodic/image-transport/default.nix
similarity index 100%
rename from melodic/image-transport/default.nix
rename to distros/melodic/image-transport/default.nix
diff --git a/melodic/image-view/default.nix b/distros/melodic/image-view/default.nix
similarity index 100%
rename from melodic/image-view/default.nix
rename to distros/melodic/image-view/default.nix
diff --git a/melodic/image-view2/default.nix b/distros/melodic/image-view2/default.nix
similarity index 100%
rename from melodic/image-view2/default.nix
rename to distros/melodic/image-view2/default.nix
diff --git a/melodic/imagesift/default.nix b/distros/melodic/imagesift/default.nix
similarity index 100%
rename from melodic/imagesift/default.nix
rename to distros/melodic/imagesift/default.nix
diff --git a/melodic/imagezero-image-transport/default.nix b/distros/melodic/imagezero-image-transport/default.nix
similarity index 100%
rename from melodic/imagezero-image-transport/default.nix
rename to distros/melodic/imagezero-image-transport/default.nix
diff --git a/melodic/imagezero-ros/default.nix b/distros/melodic/imagezero-ros/default.nix
similarity index 100%
rename from melodic/imagezero-ros/default.nix
rename to distros/melodic/imagezero-ros/default.nix
diff --git a/melodic/imagezero/default.nix b/distros/melodic/imagezero/default.nix
similarity index 100%
rename from melodic/imagezero/default.nix
rename to distros/melodic/imagezero/default.nix
diff --git a/melodic/imu-complementary-filter/default.nix b/distros/melodic/imu-complementary-filter/default.nix
similarity index 100%
rename from melodic/imu-complementary-filter/default.nix
rename to distros/melodic/imu-complementary-filter/default.nix
diff --git a/melodic/imu-filter-madgwick/default.nix b/distros/melodic/imu-filter-madgwick/default.nix
similarity index 100%
rename from melodic/imu-filter-madgwick/default.nix
rename to distros/melodic/imu-filter-madgwick/default.nix
diff --git a/melodic/imu-pipeline/default.nix b/distros/melodic/imu-pipeline/default.nix
similarity index 100%
rename from melodic/imu-pipeline/default.nix
rename to distros/melodic/imu-pipeline/default.nix
diff --git a/melodic/imu-processors/default.nix b/distros/melodic/imu-processors/default.nix
similarity index 100%
rename from melodic/imu-processors/default.nix
rename to distros/melodic/imu-processors/default.nix
diff --git a/melodic/imu-sensor-controller/default.nix b/distros/melodic/imu-sensor-controller/default.nix
similarity index 100%
rename from melodic/imu-sensor-controller/default.nix
rename to distros/melodic/imu-sensor-controller/default.nix
diff --git a/melodic/imu-tools/default.nix b/distros/melodic/imu-tools/default.nix
similarity index 100%
rename from melodic/imu-tools/default.nix
rename to distros/melodic/imu-tools/default.nix
diff --git a/melodic/imu-transformer/default.nix b/distros/melodic/imu-transformer/default.nix
similarity index 100%
rename from melodic/imu-transformer/default.nix
rename to distros/melodic/imu-transformer/default.nix
diff --git a/melodic/industrial-core/default.nix b/distros/melodic/industrial-core/default.nix
similarity index 100%
rename from melodic/industrial-core/default.nix
rename to distros/melodic/industrial-core/default.nix
diff --git a/melodic/industrial-deprecated/default.nix b/distros/melodic/industrial-deprecated/default.nix
similarity index 100%
rename from melodic/industrial-deprecated/default.nix
rename to distros/melodic/industrial-deprecated/default.nix
diff --git a/melodic/industrial-msgs/default.nix b/distros/melodic/industrial-msgs/default.nix
similarity index 100%
rename from melodic/industrial-msgs/default.nix
rename to distros/melodic/industrial-msgs/default.nix
diff --git a/melodic/industrial-robot-client/default.nix b/distros/melodic/industrial-robot-client/default.nix
similarity index 100%
rename from melodic/industrial-robot-client/default.nix
rename to distros/melodic/industrial-robot-client/default.nix
diff --git a/melodic/industrial-robot-simulator/default.nix b/distros/melodic/industrial-robot-simulator/default.nix
similarity index 100%
rename from melodic/industrial-robot-simulator/default.nix
rename to distros/melodic/industrial-robot-simulator/default.nix
diff --git a/melodic/industrial-robot-status-controller/default.nix b/distros/melodic/industrial-robot-status-controller/default.nix
similarity index 100%
rename from melodic/industrial-robot-status-controller/default.nix
rename to distros/melodic/industrial-robot-status-controller/default.nix
diff --git a/melodic/industrial-robot-status-interface/default.nix b/distros/melodic/industrial-robot-status-interface/default.nix
similarity index 100%
rename from melodic/industrial-robot-status-interface/default.nix
rename to distros/melodic/industrial-robot-status-interface/default.nix
diff --git a/melodic/industrial-trajectory-filters/default.nix b/distros/melodic/industrial-trajectory-filters/default.nix
similarity index 100%
rename from melodic/industrial-trajectory-filters/default.nix
rename to distros/melodic/industrial-trajectory-filters/default.nix
diff --git a/melodic/industrial-utils/default.nix b/distros/melodic/industrial-utils/default.nix
similarity index 100%
rename from melodic/industrial-utils/default.nix
rename to distros/melodic/industrial-utils/default.nix
diff --git a/melodic/interactive-marker-proxy/default.nix b/distros/melodic/interactive-marker-proxy/default.nix
similarity index 100%
rename from melodic/interactive-marker-proxy/default.nix
rename to distros/melodic/interactive-marker-proxy/default.nix
diff --git a/melodic/interactive-marker-tutorials/default.nix b/distros/melodic/interactive-marker-tutorials/default.nix
similarity index 100%
rename from melodic/interactive-marker-tutorials/default.nix
rename to distros/melodic/interactive-marker-tutorials/default.nix
diff --git a/melodic/interactive-marker-twist-server/default.nix b/distros/melodic/interactive-marker-twist-server/default.nix
similarity index 100%
rename from melodic/interactive-marker-twist-server/default.nix
rename to distros/melodic/interactive-marker-twist-server/default.nix
diff --git a/melodic/interactive-markers/default.nix b/distros/melodic/interactive-markers/default.nix
similarity index 100%
rename from melodic/interactive-markers/default.nix
rename to distros/melodic/interactive-markers/default.nix
diff --git a/melodic/interval-intersection/default.nix b/distros/melodic/interval-intersection/default.nix
similarity index 100%
rename from melodic/interval-intersection/default.nix
rename to distros/melodic/interval-intersection/default.nix
diff --git a/melodic/ipa-3d-fov-visualization/default.nix b/distros/melodic/ipa-3d-fov-visualization/default.nix
similarity index 100%
rename from melodic/ipa-3d-fov-visualization/default.nix
rename to distros/melodic/ipa-3d-fov-visualization/default.nix
diff --git a/melodic/ipr-extern/default.nix b/distros/melodic/ipr-extern/default.nix
similarity index 100%
rename from melodic/ipr-extern/default.nix
rename to distros/melodic/ipr-extern/default.nix
diff --git a/melodic/ivcon/default.nix b/distros/melodic/ivcon/default.nix
similarity index 100%
rename from melodic/ivcon/default.nix
rename to distros/melodic/ivcon/default.nix
diff --git a/melodic/jackal-control/default.nix b/distros/melodic/jackal-control/default.nix
similarity index 100%
rename from melodic/jackal-control/default.nix
rename to distros/melodic/jackal-control/default.nix
diff --git a/melodic/jackal-description/default.nix b/distros/melodic/jackal-description/default.nix
similarity index 100%
rename from melodic/jackal-description/default.nix
rename to distros/melodic/jackal-description/default.nix
diff --git a/melodic/jackal-desktop/default.nix b/distros/melodic/jackal-desktop/default.nix
similarity index 100%
rename from melodic/jackal-desktop/default.nix
rename to distros/melodic/jackal-desktop/default.nix
diff --git a/melodic/jackal-gazebo/default.nix b/distros/melodic/jackal-gazebo/default.nix
similarity index 100%
rename from melodic/jackal-gazebo/default.nix
rename to distros/melodic/jackal-gazebo/default.nix
diff --git a/melodic/jackal-msgs/default.nix b/distros/melodic/jackal-msgs/default.nix
similarity index 100%
rename from melodic/jackal-msgs/default.nix
rename to distros/melodic/jackal-msgs/default.nix
diff --git a/melodic/jackal-navigation/default.nix b/distros/melodic/jackal-navigation/default.nix
similarity index 100%
rename from melodic/jackal-navigation/default.nix
rename to distros/melodic/jackal-navigation/default.nix
diff --git a/melodic/jackal-simulator/default.nix b/distros/melodic/jackal-simulator/default.nix
similarity index 100%
rename from melodic/jackal-simulator/default.nix
rename to distros/melodic/jackal-simulator/default.nix
diff --git a/melodic/jackal-tutorials/default.nix b/distros/melodic/jackal-tutorials/default.nix
similarity index 100%
rename from melodic/jackal-tutorials/default.nix
rename to distros/melodic/jackal-tutorials/default.nix
diff --git a/melodic/jackal-viz/default.nix b/distros/melodic/jackal-viz/default.nix
similarity index 100%
rename from melodic/jackal-viz/default.nix
rename to distros/melodic/jackal-viz/default.nix
diff --git a/melodic/joint-limits-interface/default.nix b/distros/melodic/joint-limits-interface/default.nix
similarity index 100%
rename from melodic/joint-limits-interface/default.nix
rename to distros/melodic/joint-limits-interface/default.nix
diff --git a/melodic/joint-state-controller/default.nix b/distros/melodic/joint-state-controller/default.nix
similarity index 100%
rename from melodic/joint-state-controller/default.nix
rename to distros/melodic/joint-state-controller/default.nix
diff --git a/melodic/joint-state-publisher/default.nix b/distros/melodic/joint-state-publisher/default.nix
similarity index 100%
rename from melodic/joint-state-publisher/default.nix
rename to distros/melodic/joint-state-publisher/default.nix
diff --git a/melodic/joint-states-settler/default.nix b/distros/melodic/joint-states-settler/default.nix
similarity index 100%
rename from melodic/joint-states-settler/default.nix
rename to distros/melodic/joint-states-settler/default.nix
diff --git a/melodic/joint-trajectory-action-tools/default.nix b/distros/melodic/joint-trajectory-action-tools/default.nix
similarity index 100%
rename from melodic/joint-trajectory-action-tools/default.nix
rename to distros/melodic/joint-trajectory-action-tools/default.nix
diff --git a/melodic/joint-trajectory-action/default.nix b/distros/melodic/joint-trajectory-action/default.nix
similarity index 100%
rename from melodic/joint-trajectory-action/default.nix
rename to distros/melodic/joint-trajectory-action/default.nix
diff --git a/melodic/joint-trajectory-controller/default.nix b/distros/melodic/joint-trajectory-controller/default.nix
similarity index 100%
rename from melodic/joint-trajectory-controller/default.nix
rename to distros/melodic/joint-trajectory-controller/default.nix
diff --git a/melodic/joint-trajectory-generator/default.nix b/distros/melodic/joint-trajectory-generator/default.nix
similarity index 100%
rename from melodic/joint-trajectory-generator/default.nix
rename to distros/melodic/joint-trajectory-generator/default.nix
diff --git a/melodic/jointstick/default.nix b/distros/melodic/jointstick/default.nix
similarity index 100%
rename from melodic/jointstick/default.nix
rename to distros/melodic/jointstick/default.nix
diff --git a/melodic/joy-listener/default.nix b/distros/melodic/joy-listener/default.nix
similarity index 100%
rename from melodic/joy-listener/default.nix
rename to distros/melodic/joy-listener/default.nix
diff --git a/melodic/joy-teleop/default.nix b/distros/melodic/joy-teleop/default.nix
similarity index 100%
rename from melodic/joy-teleop/default.nix
rename to distros/melodic/joy-teleop/default.nix
diff --git a/melodic/joy/default.nix b/distros/melodic/joy/default.nix
similarity index 100%
rename from melodic/joy/default.nix
rename to distros/melodic/joy/default.nix
diff --git a/melodic/joystick-drivers/default.nix b/distros/melodic/joystick-drivers/default.nix
similarity index 100%
rename from melodic/joystick-drivers/default.nix
rename to distros/melodic/joystick-drivers/default.nix
diff --git a/melodic/joystick-interrupt/default.nix b/distros/melodic/joystick-interrupt/default.nix
similarity index 100%
rename from melodic/joystick-interrupt/default.nix
rename to distros/melodic/joystick-interrupt/default.nix
diff --git a/melodic/jpeg-streamer/default.nix b/distros/melodic/jpeg-streamer/default.nix
similarity index 100%
rename from melodic/jpeg-streamer/default.nix
rename to distros/melodic/jpeg-streamer/default.nix
diff --git a/melodic/jsk-3rdparty/default.nix b/distros/melodic/jsk-3rdparty/default.nix
similarity index 100%
rename from melodic/jsk-3rdparty/default.nix
rename to distros/melodic/jsk-3rdparty/default.nix
diff --git a/melodic/jsk-common-msgs/default.nix b/distros/melodic/jsk-common-msgs/default.nix
similarity index 100%
rename from melodic/jsk-common-msgs/default.nix
rename to distros/melodic/jsk-common-msgs/default.nix
diff --git a/melodic/jsk-common/default.nix b/distros/melodic/jsk-common/default.nix
similarity index 100%
rename from melodic/jsk-common/default.nix
rename to distros/melodic/jsk-common/default.nix
diff --git a/melodic/jsk-footstep-msgs/default.nix b/distros/melodic/jsk-footstep-msgs/default.nix
similarity index 100%
rename from melodic/jsk-footstep-msgs/default.nix
rename to distros/melodic/jsk-footstep-msgs/default.nix
diff --git a/melodic/jsk-gui-msgs/default.nix b/distros/melodic/jsk-gui-msgs/default.nix
similarity index 100%
rename from melodic/jsk-gui-msgs/default.nix
rename to distros/melodic/jsk-gui-msgs/default.nix
diff --git a/melodic/jsk-hark-msgs/default.nix b/distros/melodic/jsk-hark-msgs/default.nix
similarity index 100%
rename from melodic/jsk-hark-msgs/default.nix
rename to distros/melodic/jsk-hark-msgs/default.nix
diff --git a/melodic/jsk-interactive-marker/default.nix b/distros/melodic/jsk-interactive-marker/default.nix
similarity index 100%
rename from melodic/jsk-interactive-marker/default.nix
rename to distros/melodic/jsk-interactive-marker/default.nix
diff --git a/melodic/jsk-interactive-test/default.nix b/distros/melodic/jsk-interactive-test/default.nix
similarity index 100%
rename from melodic/jsk-interactive-test/default.nix
rename to distros/melodic/jsk-interactive-test/default.nix
diff --git a/melodic/jsk-interactive/default.nix b/distros/melodic/jsk-interactive/default.nix
similarity index 100%
rename from melodic/jsk-interactive/default.nix
rename to distros/melodic/jsk-interactive/default.nix
diff --git a/melodic/jsk-model-tools/default.nix b/distros/melodic/jsk-model-tools/default.nix
similarity index 100%
rename from melodic/jsk-model-tools/default.nix
rename to distros/melodic/jsk-model-tools/default.nix
diff --git a/melodic/jsk-network-tools/default.nix b/distros/melodic/jsk-network-tools/default.nix
similarity index 100%
rename from melodic/jsk-network-tools/default.nix
rename to distros/melodic/jsk-network-tools/default.nix
diff --git a/melodic/jsk-pcl-ros-utils/default.nix b/distros/melodic/jsk-pcl-ros-utils/default.nix
similarity index 100%
rename from melodic/jsk-pcl-ros-utils/default.nix
rename to distros/melodic/jsk-pcl-ros-utils/default.nix
diff --git a/melodic/jsk-pcl-ros/default.nix b/distros/melodic/jsk-pcl-ros/default.nix
similarity index 100%
rename from melodic/jsk-pcl-ros/default.nix
rename to distros/melodic/jsk-pcl-ros/default.nix
diff --git a/melodic/jsk-pr2eus/default.nix b/distros/melodic/jsk-pr2eus/default.nix
similarity index 100%
rename from melodic/jsk-pr2eus/default.nix
rename to distros/melodic/jsk-pr2eus/default.nix
diff --git a/melodic/jsk-recognition-msgs/default.nix b/distros/melodic/jsk-recognition-msgs/default.nix
similarity index 100%
rename from melodic/jsk-recognition-msgs/default.nix
rename to distros/melodic/jsk-recognition-msgs/default.nix
diff --git a/melodic/jsk-recognition-utils/default.nix b/distros/melodic/jsk-recognition-utils/default.nix
similarity index 100%
rename from melodic/jsk-recognition-utils/default.nix
rename to distros/melodic/jsk-recognition-utils/default.nix
diff --git a/melodic/jsk-recognition/default.nix b/distros/melodic/jsk-recognition/default.nix
similarity index 100%
rename from melodic/jsk-recognition/default.nix
rename to distros/melodic/jsk-recognition/default.nix
diff --git a/melodic/jsk-roseus/default.nix b/distros/melodic/jsk-roseus/default.nix
similarity index 100%
rename from melodic/jsk-roseus/default.nix
rename to distros/melodic/jsk-roseus/default.nix
diff --git a/melodic/jsk-rqt-plugins/default.nix b/distros/melodic/jsk-rqt-plugins/default.nix
similarity index 100%
rename from melodic/jsk-rqt-plugins/default.nix
rename to distros/melodic/jsk-rqt-plugins/default.nix
diff --git a/melodic/jsk-rviz-plugins/default.nix b/distros/melodic/jsk-rviz-plugins/default.nix
similarity index 100%
rename from melodic/jsk-rviz-plugins/default.nix
rename to distros/melodic/jsk-rviz-plugins/default.nix
diff --git a/melodic/jsk-tilt-laser/default.nix b/distros/melodic/jsk-tilt-laser/default.nix
similarity index 100%
rename from melodic/jsk-tilt-laser/default.nix
rename to distros/melodic/jsk-tilt-laser/default.nix
diff --git a/melodic/jsk-topic-tools/default.nix b/distros/melodic/jsk-topic-tools/default.nix
similarity index 100%
rename from melodic/jsk-topic-tools/default.nix
rename to distros/melodic/jsk-topic-tools/default.nix
diff --git a/melodic/jsk-visualization/default.nix b/distros/melodic/jsk-visualization/default.nix
similarity index 100%
rename from melodic/jsk-visualization/default.nix
rename to distros/melodic/jsk-visualization/default.nix
diff --git a/melodic/jskeus/default.nix b/distros/melodic/jskeus/default.nix
similarity index 100%
rename from melodic/jskeus/default.nix
rename to distros/melodic/jskeus/default.nix
diff --git a/melodic/json-msgs/default.nix b/distros/melodic/json-msgs/default.nix
similarity index 100%
rename from melodic/json-msgs/default.nix
rename to distros/melodic/json-msgs/default.nix
diff --git a/melodic/json-transport/default.nix b/distros/melodic/json-transport/default.nix
similarity index 100%
rename from melodic/json-transport/default.nix
rename to distros/melodic/json-transport/default.nix
diff --git a/melodic/julius/default.nix b/distros/melodic/julius/default.nix
similarity index 100%
rename from melodic/julius/default.nix
rename to distros/melodic/julius/default.nix
diff --git a/melodic/kalman-filter/default.nix b/distros/melodic/kalman-filter/default.nix
similarity index 100%
rename from melodic/kalman-filter/default.nix
rename to distros/melodic/kalman-filter/default.nix
diff --git a/melodic/kartech-linear-actuator-msgs/default.nix b/distros/melodic/kartech-linear-actuator-msgs/default.nix
similarity index 100%
rename from melodic/kartech-linear-actuator-msgs/default.nix
rename to distros/melodic/kartech-linear-actuator-msgs/default.nix
diff --git a/melodic/kdl-conversions/default.nix b/distros/melodic/kdl-conversions/default.nix
similarity index 100%
rename from melodic/kdl-conversions/default.nix
rename to distros/melodic/kdl-conversions/default.nix
diff --git a/melodic/kdl-parser-py/default.nix b/distros/melodic/kdl-parser-py/default.nix
similarity index 100%
rename from melodic/kdl-parser-py/default.nix
rename to distros/melodic/kdl-parser-py/default.nix
diff --git a/melodic/kdl-parser/default.nix b/distros/melodic/kdl-parser/default.nix
similarity index 100%
rename from melodic/kdl-parser/default.nix
rename to distros/melodic/kdl-parser/default.nix
diff --git a/melodic/key-teleop/default.nix b/distros/melodic/key-teleop/default.nix
similarity index 100%
rename from melodic/key-teleop/default.nix
rename to distros/melodic/key-teleop/default.nix
diff --git a/melodic/kinesis-manager/default.nix b/distros/melodic/kinesis-manager/default.nix
similarity index 100%
rename from melodic/kinesis-manager/default.nix
rename to distros/melodic/kinesis-manager/default.nix
diff --git a/melodic/kinesis-video-msgs/default.nix b/distros/melodic/kinesis-video-msgs/default.nix
similarity index 100%
rename from melodic/kinesis-video-msgs/default.nix
rename to distros/melodic/kinesis-video-msgs/default.nix
diff --git a/melodic/kinesis-video-streamer/default.nix b/distros/melodic/kinesis-video-streamer/default.nix
similarity index 100%
rename from melodic/kinesis-video-streamer/default.nix
rename to distros/melodic/kinesis-video-streamer/default.nix
diff --git a/melodic/kobuki-core/default.nix b/distros/melodic/kobuki-core/default.nix
similarity index 100%
rename from melodic/kobuki-core/default.nix
rename to distros/melodic/kobuki-core/default.nix
diff --git a/melodic/kobuki-dock-drive/default.nix b/distros/melodic/kobuki-dock-drive/default.nix
similarity index 100%
rename from melodic/kobuki-dock-drive/default.nix
rename to distros/melodic/kobuki-dock-drive/default.nix
diff --git a/melodic/kobuki-driver/default.nix b/distros/melodic/kobuki-driver/default.nix
similarity index 100%
rename from melodic/kobuki-driver/default.nix
rename to distros/melodic/kobuki-driver/default.nix
diff --git a/melodic/kobuki-ftdi/default.nix b/distros/melodic/kobuki-ftdi/default.nix
similarity index 100%
rename from melodic/kobuki-ftdi/default.nix
rename to distros/melodic/kobuki-ftdi/default.nix
diff --git a/melodic/kobuki-msgs/default.nix b/distros/melodic/kobuki-msgs/default.nix
similarity index 100%
rename from melodic/kobuki-msgs/default.nix
rename to distros/melodic/kobuki-msgs/default.nix
diff --git a/melodic/ksql-airport/default.nix b/distros/melodic/ksql-airport/default.nix
similarity index 100%
rename from melodic/ksql-airport/default.nix
rename to distros/melodic/ksql-airport/default.nix
diff --git a/melodic/laptop-battery-monitor/default.nix b/distros/melodic/laptop-battery-monitor/default.nix
similarity index 100%
rename from melodic/laptop-battery-monitor/default.nix
rename to distros/melodic/laptop-battery-monitor/default.nix
diff --git a/melodic/laser-assembler/default.nix b/distros/melodic/laser-assembler/default.nix
similarity index 100%
rename from melodic/laser-assembler/default.nix
rename to distros/melodic/laser-assembler/default.nix
diff --git a/melodic/laser-cb-detector/default.nix b/distros/melodic/laser-cb-detector/default.nix
similarity index 100%
rename from melodic/laser-cb-detector/default.nix
rename to distros/melodic/laser-cb-detector/default.nix
diff --git a/melodic/laser-filtering/default.nix b/distros/melodic/laser-filtering/default.nix
similarity index 100%
rename from melodic/laser-filtering/default.nix
rename to distros/melodic/laser-filtering/default.nix
diff --git a/melodic/laser-filters-jsk-patch/default.nix b/distros/melodic/laser-filters-jsk-patch/default.nix
similarity index 100%
rename from melodic/laser-filters-jsk-patch/default.nix
rename to distros/melodic/laser-filters-jsk-patch/default.nix
diff --git a/melodic/laser-filters/default.nix b/distros/melodic/laser-filters/default.nix
similarity index 100%
rename from melodic/laser-filters/default.nix
rename to distros/melodic/laser-filters/default.nix
diff --git a/melodic/laser-geometry/default.nix b/distros/melodic/laser-geometry/default.nix
similarity index 100%
rename from melodic/laser-geometry/default.nix
rename to distros/melodic/laser-geometry/default.nix
diff --git a/melodic/laser-pipeline/default.nix b/distros/melodic/laser-pipeline/default.nix
similarity index 100%
rename from melodic/laser-pipeline/default.nix
rename to distros/melodic/laser-pipeline/default.nix
diff --git a/melodic/laser-proc/default.nix b/distros/melodic/laser-proc/default.nix
similarity index 100%
rename from melodic/laser-proc/default.nix
rename to distros/melodic/laser-proc/default.nix
diff --git a/melodic/laser-scan-densifier/default.nix b/distros/melodic/laser-scan-densifier/default.nix
similarity index 100%
rename from melodic/laser-scan-densifier/default.nix
rename to distros/melodic/laser-scan-densifier/default.nix
diff --git a/melodic/laser-scan-publisher-tutorial/default.nix b/distros/melodic/laser-scan-publisher-tutorial/default.nix
similarity index 100%
rename from melodic/laser-scan-publisher-tutorial/default.nix
rename to distros/melodic/laser-scan-publisher-tutorial/default.nix
diff --git a/melodic/laser-tilt-controller-filter/default.nix b/distros/melodic/laser-tilt-controller-filter/default.nix
similarity index 100%
rename from melodic/laser-tilt-controller-filter/default.nix
rename to distros/melodic/laser-tilt-controller-filter/default.nix
diff --git a/melodic/lauv-control/default.nix b/distros/melodic/lauv-control/default.nix
similarity index 100%
rename from melodic/lauv-control/default.nix
rename to distros/melodic/lauv-control/default.nix
diff --git a/melodic/lauv-description/default.nix b/distros/melodic/lauv-description/default.nix
similarity index 100%
rename from melodic/lauv-description/default.nix
rename to distros/melodic/lauv-description/default.nix
diff --git a/melodic/lauv-gazebo/default.nix b/distros/melodic/lauv-gazebo/default.nix
similarity index 100%
rename from melodic/lauv-gazebo/default.nix
rename to distros/melodic/lauv-gazebo/default.nix
diff --git a/melodic/leg-detector/default.nix b/distros/melodic/leg-detector/default.nix
similarity index 100%
rename from melodic/leg-detector/default.nix
rename to distros/melodic/leg-detector/default.nix
diff --git a/melodic/leuze-bringup/default.nix b/distros/melodic/leuze-bringup/default.nix
similarity index 100%
rename from melodic/leuze-bringup/default.nix
rename to distros/melodic/leuze-bringup/default.nix
diff --git a/melodic/leuze-description/default.nix b/distros/melodic/leuze-description/default.nix
similarity index 100%
rename from melodic/leuze-description/default.nix
rename to distros/melodic/leuze-description/default.nix
diff --git a/melodic/leuze-msgs/default.nix b/distros/melodic/leuze-msgs/default.nix
similarity index 100%
rename from melodic/leuze-msgs/default.nix
rename to distros/melodic/leuze-msgs/default.nix
diff --git a/melodic/leuze-phidget-driver/default.nix b/distros/melodic/leuze-phidget-driver/default.nix
similarity index 100%
rename from melodic/leuze-phidget-driver/default.nix
rename to distros/melodic/leuze-phidget-driver/default.nix
diff --git a/melodic/leuze-ros-drivers/default.nix b/distros/melodic/leuze-ros-drivers/default.nix
similarity index 100%
rename from melodic/leuze-ros-drivers/default.nix
rename to distros/melodic/leuze-ros-drivers/default.nix
diff --git a/melodic/leuze-rsl-driver/default.nix b/distros/melodic/leuze-rsl-driver/default.nix
similarity index 100%
rename from melodic/leuze-rsl-driver/default.nix
rename to distros/melodic/leuze-rsl-driver/default.nix
diff --git a/melodic/lex-common-msgs/default.nix b/distros/melodic/lex-common-msgs/default.nix
similarity index 100%
rename from melodic/lex-common-msgs/default.nix
rename to distros/melodic/lex-common-msgs/default.nix
diff --git a/melodic/lex-common/default.nix b/distros/melodic/lex-common/default.nix
similarity index 100%
rename from melodic/lex-common/default.nix
rename to distros/melodic/lex-common/default.nix
diff --git a/melodic/lex-node/default.nix b/distros/melodic/lex-node/default.nix
similarity index 100%
rename from melodic/lex-node/default.nix
rename to distros/melodic/lex-node/default.nix
diff --git a/melodic/lgsvl-msgs/default.nix b/distros/melodic/lgsvl-msgs/default.nix
similarity index 100%
rename from melodic/lgsvl-msgs/default.nix
rename to distros/melodic/lgsvl-msgs/default.nix
diff --git a/melodic/libcmt/default.nix b/distros/melodic/libcmt/default.nix
similarity index 100%
rename from melodic/libcmt/default.nix
rename to distros/melodic/libcmt/default.nix
diff --git a/melodic/libcreate/default.nix b/distros/melodic/libcreate/default.nix
similarity index 100%
rename from melodic/libcreate/default.nix
rename to distros/melodic/libcreate/default.nix
diff --git a/melodic/libdlib/default.nix b/distros/melodic/libdlib/default.nix
similarity index 100%
rename from melodic/libdlib/default.nix
rename to distros/melodic/libdlib/default.nix
diff --git a/melodic/libfranka/default.nix b/distros/melodic/libfranka/default.nix
similarity index 100%
rename from melodic/libfranka/default.nix
rename to distros/melodic/libfranka/default.nix
diff --git a/melodic/libg2o/default.nix b/distros/melodic/libg2o/default.nix
similarity index 100%
rename from melodic/libg2o/default.nix
rename to distros/melodic/libg2o/default.nix
diff --git a/melodic/libmavconn/default.nix b/distros/melodic/libmavconn/default.nix
similarity index 100%
rename from melodic/libmavconn/default.nix
rename to distros/melodic/libmavconn/default.nix
diff --git a/melodic/libmodbus/default.nix b/distros/melodic/libmodbus/default.nix
similarity index 100%
rename from melodic/libmodbus/default.nix
rename to distros/melodic/libmodbus/default.nix
diff --git a/melodic/libntcan/default.nix b/distros/melodic/libntcan/default.nix
similarity index 100%
rename from melodic/libntcan/default.nix
rename to distros/melodic/libntcan/default.nix
diff --git a/melodic/libpcan/default.nix b/distros/melodic/libpcan/default.nix
similarity index 100%
rename from melodic/libpcan/default.nix
rename to distros/melodic/libpcan/default.nix
diff --git a/melodic/libphidget21/default.nix b/distros/melodic/libphidget21/default.nix
similarity index 100%
rename from melodic/libphidget21/default.nix
rename to distros/melodic/libphidget21/default.nix
diff --git a/melodic/libphidgets/default.nix b/distros/melodic/libphidgets/default.nix
similarity index 100%
rename from melodic/libphidgets/default.nix
rename to distros/melodic/libphidgets/default.nix
diff --git a/melodic/libqt-concurrent/default.nix b/distros/melodic/libqt-concurrent/default.nix
similarity index 100%
rename from melodic/libqt-concurrent/default.nix
rename to distros/melodic/libqt-concurrent/default.nix
diff --git a/melodic/libqt-core/default.nix b/distros/melodic/libqt-core/default.nix
similarity index 100%
rename from melodic/libqt-core/default.nix
rename to distros/melodic/libqt-core/default.nix
diff --git a/melodic/libqt-dev/default.nix b/distros/melodic/libqt-dev/default.nix
similarity index 100%
rename from melodic/libqt-dev/default.nix
rename to distros/melodic/libqt-dev/default.nix
diff --git a/melodic/libqt-gui/default.nix b/distros/melodic/libqt-gui/default.nix
similarity index 100%
rename from melodic/libqt-gui/default.nix
rename to distros/melodic/libqt-gui/default.nix
diff --git a/melodic/libqt-network/default.nix b/distros/melodic/libqt-network/default.nix
similarity index 100%
rename from melodic/libqt-network/default.nix
rename to distros/melodic/libqt-network/default.nix
diff --git a/melodic/libqt-opengl-dev/default.nix b/distros/melodic/libqt-opengl-dev/default.nix
similarity index 100%
rename from melodic/libqt-opengl-dev/default.nix
rename to distros/melodic/libqt-opengl-dev/default.nix
diff --git a/melodic/libqt-opengl/default.nix b/distros/melodic/libqt-opengl/default.nix
similarity index 100%
rename from melodic/libqt-opengl/default.nix
rename to distros/melodic/libqt-opengl/default.nix
diff --git a/melodic/libqt-svg-dev/default.nix b/distros/melodic/libqt-svg-dev/default.nix
similarity index 100%
rename from melodic/libqt-svg-dev/default.nix
rename to distros/melodic/libqt-svg-dev/default.nix
diff --git a/melodic/libqt-widgets/default.nix b/distros/melodic/libqt-widgets/default.nix
similarity index 100%
rename from melodic/libqt-widgets/default.nix
rename to distros/melodic/libqt-widgets/default.nix
diff --git a/melodic/librealsense2/default.nix b/distros/melodic/librealsense2/default.nix
similarity index 100%
rename from melodic/librealsense2/default.nix
rename to distros/melodic/librealsense2/default.nix
diff --git a/melodic/libreflexxestype2/default.nix b/distros/melodic/libreflexxestype2/default.nix
similarity index 100%
rename from melodic/libreflexxestype2/default.nix
rename to distros/melodic/libreflexxestype2/default.nix
diff --git a/melodic/librviz-tutorial/default.nix b/distros/melodic/librviz-tutorial/default.nix
similarity index 100%
rename from melodic/librviz-tutorial/default.nix
rename to distros/melodic/librviz-tutorial/default.nix
diff --git a/melodic/libsensors-monitor/default.nix b/distros/melodic/libsensors-monitor/default.nix
similarity index 100%
rename from melodic/libsensors-monitor/default.nix
rename to distros/melodic/libsensors-monitor/default.nix
diff --git a/melodic/libsiftfast/default.nix b/distros/melodic/libsiftfast/default.nix
similarity index 100%
rename from melodic/libsiftfast/default.nix
rename to distros/melodic/libsiftfast/default.nix
diff --git a/melodic/libuvc-camera/default.nix b/distros/melodic/libuvc-camera/default.nix
similarity index 100%
rename from melodic/libuvc-camera/default.nix
rename to distros/melodic/libuvc-camera/default.nix
diff --git a/melodic/libuvc-ros/default.nix b/distros/melodic/libuvc-ros/default.nix
similarity index 100%
rename from melodic/libuvc-ros/default.nix
rename to distros/melodic/libuvc-ros/default.nix
diff --git a/melodic/libuvc/default.nix b/distros/melodic/libuvc/default.nix
similarity index 100%
rename from melodic/libuvc/default.nix
rename to distros/melodic/libuvc/default.nix
diff --git a/melodic/linksys-access-point/default.nix b/distros/melodic/linksys-access-point/default.nix
similarity index 100%
rename from melodic/linksys-access-point/default.nix
rename to distros/melodic/linksys-access-point/default.nix
diff --git a/melodic/linux-networking/default.nix b/distros/melodic/linux-networking/default.nix
similarity index 100%
rename from melodic/linux-networking/default.nix
rename to distros/melodic/linux-networking/default.nix
diff --git a/melodic/linux-peripheral-interfaces/default.nix b/distros/melodic/linux-peripheral-interfaces/default.nix
similarity index 100%
rename from melodic/linux-peripheral-interfaces/default.nix
rename to distros/melodic/linux-peripheral-interfaces/default.nix
diff --git a/melodic/lms1xx/default.nix b/distros/melodic/lms1xx/default.nix
similarity index 100%
rename from melodic/lms1xx/default.nix
rename to distros/melodic/lms1xx/default.nix
diff --git a/melodic/lockfree/default.nix b/distros/melodic/lockfree/default.nix
similarity index 100%
rename from melodic/lockfree/default.nix
rename to distros/melodic/lockfree/default.nix
diff --git a/melodic/locomotor-msgs/default.nix b/distros/melodic/locomotor-msgs/default.nix
similarity index 100%
rename from melodic/locomotor-msgs/default.nix
rename to distros/melodic/locomotor-msgs/default.nix
diff --git a/melodic/locomotor/default.nix b/distros/melodic/locomotor/default.nix
similarity index 100%
rename from melodic/locomotor/default.nix
rename to distros/melodic/locomotor/default.nix
diff --git a/melodic/locomove-base/default.nix b/distros/melodic/locomove-base/default.nix
similarity index 100%
rename from melodic/locomove-base/default.nix
rename to distros/melodic/locomove-base/default.nix
diff --git a/melodic/lpg-planner/default.nix b/distros/melodic/lpg-planner/default.nix
similarity index 100%
rename from melodic/lpg-planner/default.nix
rename to distros/melodic/lpg-planner/default.nix
diff --git a/melodic/lusb/default.nix b/distros/melodic/lusb/default.nix
similarity index 100%
rename from melodic/lusb/default.nix
rename to distros/melodic/lusb/default.nix
diff --git a/melodic/map-laser/default.nix b/distros/melodic/map-laser/default.nix
similarity index 100%
rename from melodic/map-laser/default.nix
rename to distros/melodic/map-laser/default.nix
diff --git a/melodic/map-merge-3d/default.nix b/distros/melodic/map-merge-3d/default.nix
similarity index 100%
rename from melodic/map-merge-3d/default.nix
rename to distros/melodic/map-merge-3d/default.nix
diff --git a/melodic/map-msgs/default.nix b/distros/melodic/map-msgs/default.nix
similarity index 100%
rename from melodic/map-msgs/default.nix
rename to distros/melodic/map-msgs/default.nix
diff --git a/melodic/map-organizer-msgs/default.nix b/distros/melodic/map-organizer-msgs/default.nix
similarity index 100%
rename from melodic/map-organizer-msgs/default.nix
rename to distros/melodic/map-organizer-msgs/default.nix
diff --git a/melodic/map-organizer/default.nix b/distros/melodic/map-organizer/default.nix
similarity index 100%
rename from melodic/map-organizer/default.nix
rename to distros/melodic/map-organizer/default.nix
diff --git a/melodic/map-server/default.nix b/distros/melodic/map-server/default.nix
similarity index 100%
rename from melodic/map-server/default.nix
rename to distros/melodic/map-server/default.nix
diff --git a/melodic/mapviz-plugins/default.nix b/distros/melodic/mapviz-plugins/default.nix
similarity index 100%
rename from melodic/mapviz-plugins/default.nix
rename to distros/melodic/mapviz-plugins/default.nix
diff --git a/melodic/mapviz/default.nix b/distros/melodic/mapviz/default.nix
similarity index 100%
rename from melodic/mapviz/default.nix
rename to distros/melodic/mapviz/default.nix
diff --git a/melodic/marker-msgs/default.nix b/distros/melodic/marker-msgs/default.nix
similarity index 100%
rename from melodic/marker-msgs/default.nix
rename to distros/melodic/marker-msgs/default.nix
diff --git a/melodic/marti-can-msgs/default.nix b/distros/melodic/marti-can-msgs/default.nix
similarity index 100%
rename from melodic/marti-can-msgs/default.nix
rename to distros/melodic/marti-can-msgs/default.nix
diff --git a/melodic/marti-common-msgs/default.nix b/distros/melodic/marti-common-msgs/default.nix
similarity index 100%
rename from melodic/marti-common-msgs/default.nix
rename to distros/melodic/marti-common-msgs/default.nix
diff --git a/melodic/marti-data-structures/default.nix b/distros/melodic/marti-data-structures/default.nix
similarity index 100%
rename from melodic/marti-data-structures/default.nix
rename to distros/melodic/marti-data-structures/default.nix
diff --git a/melodic/marti-nav-msgs/default.nix b/distros/melodic/marti-nav-msgs/default.nix
similarity index 100%
rename from melodic/marti-nav-msgs/default.nix
rename to distros/melodic/marti-nav-msgs/default.nix
diff --git a/melodic/marti-perception-msgs/default.nix b/distros/melodic/marti-perception-msgs/default.nix
similarity index 100%
rename from melodic/marti-perception-msgs/default.nix
rename to distros/melodic/marti-perception-msgs/default.nix
diff --git a/melodic/marti-sensor-msgs/default.nix b/distros/melodic/marti-sensor-msgs/default.nix
similarity index 100%
rename from melodic/marti-sensor-msgs/default.nix
rename to distros/melodic/marti-sensor-msgs/default.nix
diff --git a/melodic/marti-status-msgs/default.nix b/distros/melodic/marti-status-msgs/default.nix
similarity index 100%
rename from melodic/marti-status-msgs/default.nix
rename to distros/melodic/marti-status-msgs/default.nix
diff --git a/melodic/marti-visualization-msgs/default.nix b/distros/melodic/marti-visualization-msgs/default.nix
similarity index 100%
rename from melodic/marti-visualization-msgs/default.nix
rename to distros/melodic/marti-visualization-msgs/default.nix
diff --git a/melodic/master-discovery-fkie/default.nix b/distros/melodic/master-discovery-fkie/default.nix
similarity index 100%
rename from melodic/master-discovery-fkie/default.nix
rename to distros/melodic/master-discovery-fkie/default.nix
diff --git a/melodic/master-sync-fkie/default.nix b/distros/melodic/master-sync-fkie/default.nix
similarity index 100%
rename from melodic/master-sync-fkie/default.nix
rename to distros/melodic/master-sync-fkie/default.nix
diff --git a/melodic/mav-comm/default.nix b/distros/melodic/mav-comm/default.nix
similarity index 100%
rename from melodic/mav-comm/default.nix
rename to distros/melodic/mav-comm/default.nix
diff --git a/melodic/mav-msgs/default.nix b/distros/melodic/mav-msgs/default.nix
similarity index 100%
rename from melodic/mav-msgs/default.nix
rename to distros/melodic/mav-msgs/default.nix
diff --git a/melodic/mav-planning-msgs/default.nix b/distros/melodic/mav-planning-msgs/default.nix
similarity index 100%
rename from melodic/mav-planning-msgs/default.nix
rename to distros/melodic/mav-planning-msgs/default.nix
diff --git a/melodic/mavlink/default.nix b/distros/melodic/mavlink/default.nix
similarity index 100%
rename from melodic/mavlink/default.nix
rename to distros/melodic/mavlink/default.nix
diff --git a/melodic/mavros-extras/default.nix b/distros/melodic/mavros-extras/default.nix
similarity index 100%
rename from melodic/mavros-extras/default.nix
rename to distros/melodic/mavros-extras/default.nix
diff --git a/melodic/mavros-msgs/default.nix b/distros/melodic/mavros-msgs/default.nix
similarity index 100%
rename from melodic/mavros-msgs/default.nix
rename to distros/melodic/mavros-msgs/default.nix
diff --git a/melodic/mbf-abstract-core/default.nix b/distros/melodic/mbf-abstract-core/default.nix
similarity index 100%
rename from melodic/mbf-abstract-core/default.nix
rename to distros/melodic/mbf-abstract-core/default.nix
diff --git a/melodic/mbf-abstract-nav/default.nix b/distros/melodic/mbf-abstract-nav/default.nix
similarity index 100%
rename from melodic/mbf-abstract-nav/default.nix
rename to distros/melodic/mbf-abstract-nav/default.nix
diff --git a/melodic/mbf-costmap-core/default.nix b/distros/melodic/mbf-costmap-core/default.nix
similarity index 100%
rename from melodic/mbf-costmap-core/default.nix
rename to distros/melodic/mbf-costmap-core/default.nix
diff --git a/melodic/mbf-costmap-nav/default.nix b/distros/melodic/mbf-costmap-nav/default.nix
similarity index 100%
rename from melodic/mbf-costmap-nav/default.nix
rename to distros/melodic/mbf-costmap-nav/default.nix
diff --git a/melodic/mbf-msgs/default.nix b/distros/melodic/mbf-msgs/default.nix
similarity index 100%
rename from melodic/mbf-msgs/default.nix
rename to distros/melodic/mbf-msgs/default.nix
diff --git a/melodic/mbf-simple-nav/default.nix b/distros/melodic/mbf-simple-nav/default.nix
similarity index 100%
rename from melodic/mbf-simple-nav/default.nix
rename to distros/melodic/mbf-simple-nav/default.nix
diff --git a/melodic/mbf-utility/default.nix b/distros/melodic/mbf-utility/default.nix
similarity index 100%
rename from melodic/mbf-utility/default.nix
rename to distros/melodic/mbf-utility/default.nix
diff --git a/melodic/mcl-3dl-msgs/default.nix b/distros/melodic/mcl-3dl-msgs/default.nix
similarity index 100%
rename from melodic/mcl-3dl-msgs/default.nix
rename to distros/melodic/mcl-3dl-msgs/default.nix
diff --git a/melodic/mcl-3dl/default.nix b/distros/melodic/mcl-3dl/default.nix
similarity index 100%
rename from melodic/mcl-3dl/default.nix
rename to distros/melodic/mcl-3dl/default.nix
diff --git a/melodic/mcmillan-airfield/default.nix b/distros/melodic/mcmillan-airfield/default.nix
similarity index 100%
rename from melodic/mcmillan-airfield/default.nix
rename to distros/melodic/mcmillan-airfield/default.nix
diff --git a/melodic/md49-base-controller/default.nix b/distros/melodic/md49-base-controller/default.nix
similarity index 100%
rename from melodic/md49-base-controller/default.nix
rename to distros/melodic/md49-base-controller/default.nix
diff --git a/melodic/md49-messages/default.nix b/distros/melodic/md49-messages/default.nix
similarity index 100%
rename from melodic/md49-messages/default.nix
rename to distros/melodic/md49-messages/default.nix
diff --git a/melodic/md49-serialport/default.nix b/distros/melodic/md49-serialport/default.nix
similarity index 100%
rename from melodic/md49-serialport/default.nix
rename to distros/melodic/md49-serialport/default.nix
diff --git a/melodic/mecanum-gazebo-plugin/default.nix b/distros/melodic/mecanum-gazebo-plugin/default.nix
similarity index 100%
rename from melodic/mecanum-gazebo-plugin/default.nix
rename to distros/melodic/mecanum-gazebo-plugin/default.nix
diff --git a/melodic/media-export/default.nix b/distros/melodic/media-export/default.nix
similarity index 100%
rename from melodic/media-export/default.nix
rename to distros/melodic/media-export/default.nix
diff --git a/melodic/message-filters/default.nix b/distros/melodic/message-filters/default.nix
similarity index 100%
rename from melodic/message-filters/default.nix
rename to distros/melodic/message-filters/default.nix
diff --git a/melodic/message-generation/default.nix b/distros/melodic/message-generation/default.nix
similarity index 100%
rename from melodic/message-generation/default.nix
rename to distros/melodic/message-generation/default.nix
diff --git a/melodic/message-relay/default.nix b/distros/melodic/message-relay/default.nix
similarity index 100%
rename from melodic/message-relay/default.nix
rename to distros/melodic/message-relay/default.nix
diff --git a/melodic/message-runtime/default.nix b/distros/melodic/message-runtime/default.nix
similarity index 100%
rename from melodic/message-runtime/default.nix
rename to distros/melodic/message-runtime/default.nix
diff --git a/melodic/microstrain-3dmgx2-imu/default.nix b/distros/melodic/microstrain-3dmgx2-imu/default.nix
similarity index 100%
rename from melodic/microstrain-3dmgx2-imu/default.nix
rename to distros/melodic/microstrain-3dmgx2-imu/default.nix
diff --git a/melodic/microstrain-mips/default.nix b/distros/melodic/microstrain-mips/default.nix
similarity index 100%
rename from melodic/microstrain-mips/default.nix
rename to distros/melodic/microstrain-mips/default.nix
diff --git a/melodic/mini-maxwell/default.nix b/distros/melodic/mini-maxwell/default.nix
similarity index 100%
rename from melodic/mini-maxwell/default.nix
rename to distros/melodic/mini-maxwell/default.nix
diff --git a/melodic/mir-actions/default.nix b/distros/melodic/mir-actions/default.nix
similarity index 100%
rename from melodic/mir-actions/default.nix
rename to distros/melodic/mir-actions/default.nix
diff --git a/melodic/mir-description/default.nix b/distros/melodic/mir-description/default.nix
similarity index 100%
rename from melodic/mir-description/default.nix
rename to distros/melodic/mir-description/default.nix
diff --git a/melodic/mir-driver/default.nix b/distros/melodic/mir-driver/default.nix
similarity index 100%
rename from melodic/mir-driver/default.nix
rename to distros/melodic/mir-driver/default.nix
diff --git a/melodic/mir-dwb-critics/default.nix b/distros/melodic/mir-dwb-critics/default.nix
similarity index 100%
rename from melodic/mir-dwb-critics/default.nix
rename to distros/melodic/mir-dwb-critics/default.nix
diff --git a/melodic/mir-gazebo/default.nix b/distros/melodic/mir-gazebo/default.nix
similarity index 100%
rename from melodic/mir-gazebo/default.nix
rename to distros/melodic/mir-gazebo/default.nix
diff --git a/melodic/mir-msgs/default.nix b/distros/melodic/mir-msgs/default.nix
similarity index 100%
rename from melodic/mir-msgs/default.nix
rename to distros/melodic/mir-msgs/default.nix
diff --git a/melodic/mir-navigation/default.nix b/distros/melodic/mir-navigation/default.nix
similarity index 100%
rename from melodic/mir-navigation/default.nix
rename to distros/melodic/mir-navigation/default.nix
diff --git a/melodic/mir-robot/default.nix b/distros/melodic/mir-robot/default.nix
similarity index 100%
rename from melodic/mir-robot/default.nix
rename to distros/melodic/mir-robot/default.nix
diff --git a/melodic/mk/default.nix b/distros/melodic/mk/default.nix
similarity index 100%
rename from melodic/mk/default.nix
rename to distros/melodic/mk/default.nix
diff --git a/melodic/ml-classifiers/default.nix b/distros/melodic/ml-classifiers/default.nix
similarity index 100%
rename from melodic/ml-classifiers/default.nix
rename to distros/melodic/ml-classifiers/default.nix
diff --git a/melodic/mobileye-560-660-msgs/default.nix b/distros/melodic/mobileye-560-660-msgs/default.nix
similarity index 100%
rename from melodic/mobileye-560-660-msgs/default.nix
rename to distros/melodic/mobileye-560-660-msgs/default.nix
diff --git a/melodic/mongodb-log/default.nix b/distros/melodic/mongodb-log/default.nix
similarity index 100%
rename from melodic/mongodb-log/default.nix
rename to distros/melodic/mongodb-log/default.nix
diff --git a/melodic/mongodb-store-msgs/default.nix b/distros/melodic/mongodb-store-msgs/default.nix
similarity index 100%
rename from melodic/mongodb-store-msgs/default.nix
rename to distros/melodic/mongodb-store-msgs/default.nix
diff --git a/melodic/monocam-settler/default.nix b/distros/melodic/monocam-settler/default.nix
similarity index 100%
rename from melodic/monocam-settler/default.nix
rename to distros/melodic/monocam-settler/default.nix
diff --git a/melodic/mouse-teleop/default.nix b/distros/melodic/mouse-teleop/default.nix
similarity index 100%
rename from melodic/mouse-teleop/default.nix
rename to distros/melodic/mouse-teleop/default.nix
diff --git a/melodic/move-base-flex/default.nix b/distros/melodic/move-base-flex/default.nix
similarity index 100%
rename from melodic/move-base-flex/default.nix
rename to distros/melodic/move-base-flex/default.nix
diff --git a/melodic/move-base-msgs/default.nix b/distros/melodic/move-base-msgs/default.nix
similarity index 100%
rename from melodic/move-base-msgs/default.nix
rename to distros/melodic/move-base-msgs/default.nix
diff --git a/melodic/move-base/default.nix b/distros/melodic/move-base/default.nix
similarity index 100%
rename from melodic/move-base/default.nix
rename to distros/melodic/move-base/default.nix
diff --git a/melodic/move-slow-and-clear/default.nix b/distros/melodic/move-slow-and-clear/default.nix
similarity index 100%
rename from melodic/move-slow-and-clear/default.nix
rename to distros/melodic/move-slow-and-clear/default.nix
diff --git a/melodic/moveit-chomp-optimizer-adapter/default.nix b/distros/melodic/moveit-chomp-optimizer-adapter/default.nix
similarity index 100%
rename from melodic/moveit-chomp-optimizer-adapter/default.nix
rename to distros/melodic/moveit-chomp-optimizer-adapter/default.nix
diff --git a/melodic/moveit-controller-manager-example/default.nix b/distros/melodic/moveit-controller-manager-example/default.nix
similarity index 100%
rename from melodic/moveit-controller-manager-example/default.nix
rename to distros/melodic/moveit-controller-manager-example/default.nix
diff --git a/melodic/moveit-experimental/default.nix b/distros/melodic/moveit-experimental/default.nix
similarity index 100%
rename from melodic/moveit-experimental/default.nix
rename to distros/melodic/moveit-experimental/default.nix
diff --git a/melodic/moveit-fake-controller-manager/default.nix b/distros/melodic/moveit-fake-controller-manager/default.nix
similarity index 100%
rename from melodic/moveit-fake-controller-manager/default.nix
rename to distros/melodic/moveit-fake-controller-manager/default.nix
diff --git a/melodic/moveit-kinematics/default.nix b/distros/melodic/moveit-kinematics/default.nix
similarity index 100%
rename from melodic/moveit-kinematics/default.nix
rename to distros/melodic/moveit-kinematics/default.nix
diff --git a/melodic/moveit-msgs/default.nix b/distros/melodic/moveit-msgs/default.nix
similarity index 100%
rename from melodic/moveit-msgs/default.nix
rename to distros/melodic/moveit-msgs/default.nix
diff --git a/melodic/moveit-planners-chomp/default.nix b/distros/melodic/moveit-planners-chomp/default.nix
similarity index 100%
rename from melodic/moveit-planners-chomp/default.nix
rename to distros/melodic/moveit-planners-chomp/default.nix
diff --git a/melodic/moveit-planners-ompl/default.nix b/distros/melodic/moveit-planners-ompl/default.nix
similarity index 100%
rename from melodic/moveit-planners-ompl/default.nix
rename to distros/melodic/moveit-planners-ompl/default.nix
diff --git a/melodic/moveit-planners/default.nix b/distros/melodic/moveit-planners/default.nix
similarity index 100%
rename from melodic/moveit-planners/default.nix
rename to distros/melodic/moveit-planners/default.nix
diff --git a/melodic/moveit-plugins/default.nix b/distros/melodic/moveit-plugins/default.nix
similarity index 100%
rename from melodic/moveit-plugins/default.nix
rename to distros/melodic/moveit-plugins/default.nix
diff --git a/melodic/moveit-pr2/default.nix b/distros/melodic/moveit-pr2/default.nix
similarity index 100%
rename from melodic/moveit-pr2/default.nix
rename to distros/melodic/moveit-pr2/default.nix
diff --git a/melodic/moveit-resources/default.nix b/distros/melodic/moveit-resources/default.nix
similarity index 100%
rename from melodic/moveit-resources/default.nix
rename to distros/melodic/moveit-resources/default.nix
diff --git a/melodic/moveit-ros-benchmarks/default.nix b/distros/melodic/moveit-ros-benchmarks/default.nix
similarity index 100%
rename from melodic/moveit-ros-benchmarks/default.nix
rename to distros/melodic/moveit-ros-benchmarks/default.nix
diff --git a/melodic/moveit-ros-control-interface/default.nix b/distros/melodic/moveit-ros-control-interface/default.nix
similarity index 100%
rename from melodic/moveit-ros-control-interface/default.nix
rename to distros/melodic/moveit-ros-control-interface/default.nix
diff --git a/melodic/moveit-ros-manipulation/default.nix b/distros/melodic/moveit-ros-manipulation/default.nix
similarity index 100%
rename from melodic/moveit-ros-manipulation/default.nix
rename to distros/melodic/moveit-ros-manipulation/default.nix
diff --git a/melodic/moveit-ros-move-group/default.nix b/distros/melodic/moveit-ros-move-group/default.nix
similarity index 100%
rename from melodic/moveit-ros-move-group/default.nix
rename to distros/melodic/moveit-ros-move-group/default.nix
diff --git a/melodic/moveit-ros-perception/default.nix b/distros/melodic/moveit-ros-perception/default.nix
similarity index 100%
rename from melodic/moveit-ros-perception/default.nix
rename to distros/melodic/moveit-ros-perception/default.nix
diff --git a/melodic/moveit-ros-planning-interface/default.nix b/distros/melodic/moveit-ros-planning-interface/default.nix
similarity index 100%
rename from melodic/moveit-ros-planning-interface/default.nix
rename to distros/melodic/moveit-ros-planning-interface/default.nix
diff --git a/melodic/moveit-ros-planning/default.nix b/distros/melodic/moveit-ros-planning/default.nix
similarity index 100%
rename from melodic/moveit-ros-planning/default.nix
rename to distros/melodic/moveit-ros-planning/default.nix
diff --git a/melodic/moveit-ros-robot-interaction/default.nix b/distros/melodic/moveit-ros-robot-interaction/default.nix
similarity index 100%
rename from melodic/moveit-ros-robot-interaction/default.nix
rename to distros/melodic/moveit-ros-robot-interaction/default.nix
diff --git a/melodic/moveit-ros-visualization/default.nix b/distros/melodic/moveit-ros-visualization/default.nix
similarity index 100%
rename from melodic/moveit-ros-visualization/default.nix
rename to distros/melodic/moveit-ros-visualization/default.nix
diff --git a/melodic/moveit-ros-warehouse/default.nix b/distros/melodic/moveit-ros-warehouse/default.nix
similarity index 100%
rename from melodic/moveit-ros-warehouse/default.nix
rename to distros/melodic/moveit-ros-warehouse/default.nix
diff --git a/melodic/moveit-ros/default.nix b/distros/melodic/moveit-ros/default.nix
similarity index 100%
rename from melodic/moveit-ros/default.nix
rename to distros/melodic/moveit-ros/default.nix
diff --git a/melodic/moveit-runtime/default.nix b/distros/melodic/moveit-runtime/default.nix
similarity index 100%
rename from melodic/moveit-runtime/default.nix
rename to distros/melodic/moveit-runtime/default.nix
diff --git a/melodic/moveit-setup-assistant/default.nix b/distros/melodic/moveit-setup-assistant/default.nix
similarity index 100%
rename from melodic/moveit-setup-assistant/default.nix
rename to distros/melodic/moveit-setup-assistant/default.nix
diff --git a/melodic/moveit-sim-controller/default.nix b/distros/melodic/moveit-sim-controller/default.nix
similarity index 100%
rename from melodic/moveit-sim-controller/default.nix
rename to distros/melodic/moveit-sim-controller/default.nix
diff --git a/melodic/moveit-simple-controller-manager/default.nix b/distros/melodic/moveit-simple-controller-manager/default.nix
similarity index 100%
rename from melodic/moveit-simple-controller-manager/default.nix
rename to distros/melodic/moveit-simple-controller-manager/default.nix
diff --git a/melodic/moveit-visual-tools/default.nix b/distros/melodic/moveit-visual-tools/default.nix
similarity index 100%
rename from melodic/moveit-visual-tools/default.nix
rename to distros/melodic/moveit-visual-tools/default.nix
diff --git a/melodic/moveit/default.nix b/distros/melodic/moveit/default.nix
similarity index 100%
rename from melodic/moveit/default.nix
rename to distros/melodic/moveit/default.nix
diff --git a/melodic/movie-publisher/default.nix b/distros/melodic/movie-publisher/default.nix
similarity index 100%
rename from melodic/movie-publisher/default.nix
rename to distros/melodic/movie-publisher/default.nix
diff --git a/melodic/mrpt-bridge/default.nix b/distros/melodic/mrpt-bridge/default.nix
similarity index 100%
rename from melodic/mrpt-bridge/default.nix
rename to distros/melodic/mrpt-bridge/default.nix
diff --git a/melodic/mrpt-ekf-slam-2d/default.nix b/distros/melodic/mrpt-ekf-slam-2d/default.nix
similarity index 100%
rename from melodic/mrpt-ekf-slam-2d/default.nix
rename to distros/melodic/mrpt-ekf-slam-2d/default.nix
diff --git a/melodic/mrpt-ekf-slam-3d/default.nix b/distros/melodic/mrpt-ekf-slam-3d/default.nix
similarity index 100%
rename from melodic/mrpt-ekf-slam-3d/default.nix
rename to distros/melodic/mrpt-ekf-slam-3d/default.nix
diff --git a/melodic/mrpt-graphslam-2d/default.nix b/distros/melodic/mrpt-graphslam-2d/default.nix
similarity index 100%
rename from melodic/mrpt-graphslam-2d/default.nix
rename to distros/melodic/mrpt-graphslam-2d/default.nix
diff --git a/melodic/mrpt-icp-slam-2d/default.nix b/distros/melodic/mrpt-icp-slam-2d/default.nix
similarity index 100%
rename from melodic/mrpt-icp-slam-2d/default.nix
rename to distros/melodic/mrpt-icp-slam-2d/default.nix
diff --git a/melodic/mrpt-local-obstacles/default.nix b/distros/melodic/mrpt-local-obstacles/default.nix
similarity index 100%
rename from melodic/mrpt-local-obstacles/default.nix
rename to distros/melodic/mrpt-local-obstacles/default.nix
diff --git a/melodic/mrpt-localization/default.nix b/distros/melodic/mrpt-localization/default.nix
similarity index 100%
rename from melodic/mrpt-localization/default.nix
rename to distros/melodic/mrpt-localization/default.nix
diff --git a/melodic/mrpt-map/default.nix b/distros/melodic/mrpt-map/default.nix
similarity index 100%
rename from melodic/mrpt-map/default.nix
rename to distros/melodic/mrpt-map/default.nix
diff --git a/melodic/mrpt-msgs/default.nix b/distros/melodic/mrpt-msgs/default.nix
similarity index 100%
rename from melodic/mrpt-msgs/default.nix
rename to distros/melodic/mrpt-msgs/default.nix
diff --git a/melodic/mrpt-navigation/default.nix b/distros/melodic/mrpt-navigation/default.nix
similarity index 100%
rename from melodic/mrpt-navigation/default.nix
rename to distros/melodic/mrpt-navigation/default.nix
diff --git a/melodic/mrpt-rawlog/default.nix b/distros/melodic/mrpt-rawlog/default.nix
similarity index 100%
rename from melodic/mrpt-rawlog/default.nix
rename to distros/melodic/mrpt-rawlog/default.nix
diff --git a/melodic/mrpt-rbpf-slam/default.nix b/distros/melodic/mrpt-rbpf-slam/default.nix
similarity index 100%
rename from melodic/mrpt-rbpf-slam/default.nix
rename to distros/melodic/mrpt-rbpf-slam/default.nix
diff --git a/melodic/mrpt-reactivenav2d/default.nix b/distros/melodic/mrpt-reactivenav2d/default.nix
similarity index 100%
rename from melodic/mrpt-reactivenav2d/default.nix
rename to distros/melodic/mrpt-reactivenav2d/default.nix
diff --git a/melodic/mrpt-slam/default.nix b/distros/melodic/mrpt-slam/default.nix
similarity index 100%
rename from melodic/mrpt-slam/default.nix
rename to distros/melodic/mrpt-slam/default.nix
diff --git a/melodic/mrpt-tutorials/default.nix b/distros/melodic/mrpt-tutorials/default.nix
similarity index 100%
rename from melodic/mrpt-tutorials/default.nix
rename to distros/melodic/mrpt-tutorials/default.nix
diff --git a/melodic/mrpt1/default.nix b/distros/melodic/mrpt1/default.nix
similarity index 100%
rename from melodic/mrpt1/default.nix
rename to distros/melodic/mrpt1/default.nix
diff --git a/melodic/multi-interface-roam/default.nix b/distros/melodic/multi-interface-roam/default.nix
similarity index 100%
rename from melodic/multi-interface-roam/default.nix
rename to distros/melodic/multi-interface-roam/default.nix
diff --git a/melodic/multi-map-server/default.nix b/distros/melodic/multi-map-server/default.nix
similarity index 100%
rename from melodic/multi-map-server/default.nix
rename to distros/melodic/multi-map-server/default.nix
diff --git a/melodic/multi-object-tracking-lidar/default.nix b/distros/melodic/multi-object-tracking-lidar/default.nix
similarity index 100%
rename from melodic/multi-object-tracking-lidar/default.nix
rename to distros/melodic/multi-object-tracking-lidar/default.nix
diff --git a/melodic/multimaster-fkie/default.nix b/distros/melodic/multimaster-fkie/default.nix
similarity index 100%
rename from melodic/multimaster-fkie/default.nix
rename to distros/melodic/multimaster-fkie/default.nix
diff --git a/melodic/multimaster-launch/default.nix b/distros/melodic/multimaster-launch/default.nix
similarity index 100%
rename from melodic/multimaster-launch/default.nix
rename to distros/melodic/multimaster-launch/default.nix
diff --git a/melodic/multimaster-msgs-fkie/default.nix b/distros/melodic/multimaster-msgs-fkie/default.nix
similarity index 100%
rename from melodic/multimaster-msgs-fkie/default.nix
rename to distros/melodic/multimaster-msgs-fkie/default.nix
diff --git a/melodic/multimaster-msgs/default.nix b/distros/melodic/multimaster-msgs/default.nix
similarity index 100%
rename from melodic/multimaster-msgs/default.nix
rename to distros/melodic/multimaster-msgs/default.nix
diff --git a/melodic/multires-image/default.nix b/distros/melodic/multires-image/default.nix
similarity index 100%
rename from melodic/multires-image/default.nix
rename to distros/melodic/multires-image/default.nix
diff --git a/melodic/multisense-bringup/default.nix b/distros/melodic/multisense-bringup/default.nix
similarity index 100%
rename from melodic/multisense-bringup/default.nix
rename to distros/melodic/multisense-bringup/default.nix
diff --git a/melodic/multisense-cal-check/default.nix b/distros/melodic/multisense-cal-check/default.nix
similarity index 100%
rename from melodic/multisense-cal-check/default.nix
rename to distros/melodic/multisense-cal-check/default.nix
diff --git a/melodic/multisense-description/default.nix b/distros/melodic/multisense-description/default.nix
similarity index 100%
rename from melodic/multisense-description/default.nix
rename to distros/melodic/multisense-description/default.nix
diff --git a/melodic/multisense-lib/default.nix b/distros/melodic/multisense-lib/default.nix
similarity index 100%
rename from melodic/multisense-lib/default.nix
rename to distros/melodic/multisense-lib/default.nix
diff --git a/melodic/multisense-ros/default.nix b/distros/melodic/multisense-ros/default.nix
similarity index 100%
rename from melodic/multisense-ros/default.nix
rename to distros/melodic/multisense-ros/default.nix
diff --git a/melodic/multisense/default.nix b/distros/melodic/multisense/default.nix
similarity index 100%
rename from melodic/multisense/default.nix
rename to distros/melodic/multisense/default.nix
diff --git a/melodic/mvsim/default.nix b/distros/melodic/mvsim/default.nix
similarity index 100%
rename from melodic/mvsim/default.nix
rename to distros/melodic/mvsim/default.nix
diff --git a/melodic/nanomsg/default.nix b/distros/melodic/nanomsg/default.nix
similarity index 100%
rename from melodic/nanomsg/default.nix
rename to distros/melodic/nanomsg/default.nix
diff --git a/melodic/nao-meshes/default.nix b/distros/melodic/nao-meshes/default.nix
similarity index 100%
rename from melodic/nao-meshes/default.nix
rename to distros/melodic/nao-meshes/default.nix
diff --git a/melodic/naoqi-bridge-msgs/default.nix b/distros/melodic/naoqi-bridge-msgs/default.nix
similarity index 100%
rename from melodic/naoqi-bridge-msgs/default.nix
rename to distros/melodic/naoqi-bridge-msgs/default.nix
diff --git a/melodic/naoqi-driver/default.nix b/distros/melodic/naoqi-driver/default.nix
similarity index 100%
rename from melodic/naoqi-driver/default.nix
rename to distros/melodic/naoqi-driver/default.nix
diff --git a/melodic/naoqi-libqi/default.nix b/distros/melodic/naoqi-libqi/default.nix
similarity index 100%
rename from melodic/naoqi-libqi/default.nix
rename to distros/melodic/naoqi-libqi/default.nix
diff --git a/melodic/naoqi-libqicore/default.nix b/distros/melodic/naoqi-libqicore/default.nix
similarity index 100%
rename from melodic/naoqi-libqicore/default.nix
rename to distros/melodic/naoqi-libqicore/default.nix
diff --git a/melodic/nav-2d-msgs/default.nix b/distros/melodic/nav-2d-msgs/default.nix
similarity index 100%
rename from melodic/nav-2d-msgs/default.nix
rename to distros/melodic/nav-2d-msgs/default.nix
diff --git a/melodic/nav-2d-utils/default.nix b/distros/melodic/nav-2d-utils/default.nix
similarity index 100%
rename from melodic/nav-2d-utils/default.nix
rename to distros/melodic/nav-2d-utils/default.nix
diff --git a/melodic/nav-core-adapter/default.nix b/distros/melodic/nav-core-adapter/default.nix
similarity index 100%
rename from melodic/nav-core-adapter/default.nix
rename to distros/melodic/nav-core-adapter/default.nix
diff --git a/melodic/nav-core/default.nix b/distros/melodic/nav-core/default.nix
similarity index 100%
rename from melodic/nav-core/default.nix
rename to distros/melodic/nav-core/default.nix
diff --git a/melodic/nav-core2/default.nix b/distros/melodic/nav-core2/default.nix
similarity index 100%
rename from melodic/nav-core2/default.nix
rename to distros/melodic/nav-core2/default.nix
diff --git a/melodic/nav-grid-iterators/default.nix b/distros/melodic/nav-grid-iterators/default.nix
similarity index 100%
rename from melodic/nav-grid-iterators/default.nix
rename to distros/melodic/nav-grid-iterators/default.nix
diff --git a/melodic/nav-grid-pub-sub/default.nix b/distros/melodic/nav-grid-pub-sub/default.nix
similarity index 100%
rename from melodic/nav-grid-pub-sub/default.nix
rename to distros/melodic/nav-grid-pub-sub/default.nix
diff --git a/melodic/nav-grid/default.nix b/distros/melodic/nav-grid/default.nix
similarity index 100%
rename from melodic/nav-grid/default.nix
rename to distros/melodic/nav-grid/default.nix
diff --git a/melodic/nav-msgs/default.nix b/distros/melodic/nav-msgs/default.nix
similarity index 100%
rename from melodic/nav-msgs/default.nix
rename to distros/melodic/nav-msgs/default.nix
diff --git a/melodic/nav2d-exploration/default.nix b/distros/melodic/nav2d-exploration/default.nix
similarity index 100%
rename from melodic/nav2d-exploration/default.nix
rename to distros/melodic/nav2d-exploration/default.nix
diff --git a/melodic/nav2d-karto/default.nix b/distros/melodic/nav2d-karto/default.nix
similarity index 100%
rename from melodic/nav2d-karto/default.nix
rename to distros/melodic/nav2d-karto/default.nix
diff --git a/melodic/nav2d-localizer/default.nix b/distros/melodic/nav2d-localizer/default.nix
similarity index 100%
rename from melodic/nav2d-localizer/default.nix
rename to distros/melodic/nav2d-localizer/default.nix
diff --git a/melodic/nav2d-msgs/default.nix b/distros/melodic/nav2d-msgs/default.nix
similarity index 100%
rename from melodic/nav2d-msgs/default.nix
rename to distros/melodic/nav2d-msgs/default.nix
diff --git a/melodic/nav2d-navigator/default.nix b/distros/melodic/nav2d-navigator/default.nix
similarity index 100%
rename from melodic/nav2d-navigator/default.nix
rename to distros/melodic/nav2d-navigator/default.nix
diff --git a/melodic/nav2d-operator/default.nix b/distros/melodic/nav2d-operator/default.nix
similarity index 100%
rename from melodic/nav2d-operator/default.nix
rename to distros/melodic/nav2d-operator/default.nix
diff --git a/melodic/nav2d-remote/default.nix b/distros/melodic/nav2d-remote/default.nix
similarity index 100%
rename from melodic/nav2d-remote/default.nix
rename to distros/melodic/nav2d-remote/default.nix
diff --git a/melodic/nav2d-tutorials/default.nix b/distros/melodic/nav2d-tutorials/default.nix
similarity index 100%
rename from melodic/nav2d-tutorials/default.nix
rename to distros/melodic/nav2d-tutorials/default.nix
diff --git a/melodic/nav2d/default.nix b/distros/melodic/nav2d/default.nix
similarity index 100%
rename from melodic/nav2d/default.nix
rename to distros/melodic/nav2d/default.nix
diff --git a/melodic/navfn/default.nix b/distros/melodic/navfn/default.nix
similarity index 100%
rename from melodic/navfn/default.nix
rename to distros/melodic/navfn/default.nix
diff --git a/melodic/navigation-experimental/default.nix b/distros/melodic/navigation-experimental/default.nix
similarity index 100%
rename from melodic/navigation-experimental/default.nix
rename to distros/melodic/navigation-experimental/default.nix
diff --git a/melodic/navigation-layers/default.nix b/distros/melodic/navigation-layers/default.nix
similarity index 100%
rename from melodic/navigation-layers/default.nix
rename to distros/melodic/navigation-layers/default.nix
diff --git a/melodic/navigation-stage/default.nix b/distros/melodic/navigation-stage/default.nix
similarity index 100%
rename from melodic/navigation-stage/default.nix
rename to distros/melodic/navigation-stage/default.nix
diff --git a/melodic/navigation-tutorials/default.nix b/distros/melodic/navigation-tutorials/default.nix
similarity index 100%
rename from melodic/navigation-tutorials/default.nix
rename to distros/melodic/navigation-tutorials/default.nix
diff --git a/melodic/navigation/default.nix b/distros/melodic/navigation/default.nix
similarity index 100%
rename from melodic/navigation/default.nix
rename to distros/melodic/navigation/default.nix
diff --git a/melodic/neobotix-usboard-msgs/default.nix b/distros/melodic/neobotix-usboard-msgs/default.nix
similarity index 100%
rename from melodic/neobotix-usboard-msgs/default.nix
rename to distros/melodic/neobotix-usboard-msgs/default.nix
diff --git a/melodic/neonavigation-common/default.nix b/distros/melodic/neonavigation-common/default.nix
similarity index 100%
rename from melodic/neonavigation-common/default.nix
rename to distros/melodic/neonavigation-common/default.nix
diff --git a/melodic/neonavigation-launch/default.nix b/distros/melodic/neonavigation-launch/default.nix
similarity index 100%
rename from melodic/neonavigation-launch/default.nix
rename to distros/melodic/neonavigation-launch/default.nix
diff --git a/melodic/neonavigation-msgs/default.nix b/distros/melodic/neonavigation-msgs/default.nix
similarity index 100%
rename from melodic/neonavigation-msgs/default.nix
rename to distros/melodic/neonavigation-msgs/default.nix
diff --git a/melodic/neonavigation-rviz-plugins/default.nix b/distros/melodic/neonavigation-rviz-plugins/default.nix
similarity index 100%
rename from melodic/neonavigation-rviz-plugins/default.nix
rename to distros/melodic/neonavigation-rviz-plugins/default.nix
diff --git a/melodic/neonavigation/default.nix b/distros/melodic/neonavigation/default.nix
similarity index 100%
rename from melodic/neonavigation/default.nix
rename to distros/melodic/neonavigation/default.nix
diff --git a/melodic/nerian-stereo/default.nix b/distros/melodic/nerian-stereo/default.nix
similarity index 100%
rename from melodic/nerian-stereo/default.nix
rename to distros/melodic/nerian-stereo/default.nix
diff --git a/melodic/network-autoconfig/default.nix b/distros/melodic/network-autoconfig/default.nix
similarity index 100%
rename from melodic/network-autoconfig/default.nix
rename to distros/melodic/network-autoconfig/default.nix
diff --git a/melodic/network-control-tests/default.nix b/distros/melodic/network-control-tests/default.nix
similarity index 100%
rename from melodic/network-control-tests/default.nix
rename to distros/melodic/network-control-tests/default.nix
diff --git a/melodic/network-detector/default.nix b/distros/melodic/network-detector/default.nix
similarity index 100%
rename from melodic/network-detector/default.nix
rename to distros/melodic/network-detector/default.nix
diff --git a/melodic/network-interface/default.nix b/distros/melodic/network-interface/default.nix
similarity index 100%
rename from melodic/network-interface/default.nix
rename to distros/melodic/network-interface/default.nix
diff --git a/melodic/network-monitor-udp/default.nix b/distros/melodic/network-monitor-udp/default.nix
similarity index 100%
rename from melodic/network-monitor-udp/default.nix
rename to distros/melodic/network-monitor-udp/default.nix
diff --git a/melodic/network-traffic-control/default.nix b/distros/melodic/network-traffic-control/default.nix
similarity index 100%
rename from melodic/network-traffic-control/default.nix
rename to distros/melodic/network-traffic-control/default.nix
diff --git a/melodic/nlopt/default.nix b/distros/melodic/nlopt/default.nix
similarity index 100%
rename from melodic/nlopt/default.nix
rename to distros/melodic/nlopt/default.nix
diff --git a/melodic/nmea-comms/default.nix b/distros/melodic/nmea-comms/default.nix
similarity index 100%
rename from melodic/nmea-comms/default.nix
rename to distros/melodic/nmea-comms/default.nix
diff --git a/melodic/nmea-gps-plugin/default.nix b/distros/melodic/nmea-gps-plugin/default.nix
similarity index 100%
rename from melodic/nmea-gps-plugin/default.nix
rename to distros/melodic/nmea-gps-plugin/default.nix
diff --git a/melodic/nmea-msgs/default.nix b/distros/melodic/nmea-msgs/default.nix
similarity index 100%
rename from melodic/nmea-msgs/default.nix
rename to distros/melodic/nmea-msgs/default.nix
diff --git a/melodic/nmea-navsat-driver/default.nix b/distros/melodic/nmea-navsat-driver/default.nix
similarity index 100%
rename from melodic/nmea-navsat-driver/default.nix
rename to distros/melodic/nmea-navsat-driver/default.nix
diff --git a/melodic/nmea-to-geopose/default.nix b/distros/melodic/nmea-to-geopose/default.nix
similarity index 100%
rename from melodic/nmea-to-geopose/default.nix
rename to distros/melodic/nmea-to-geopose/default.nix
diff --git a/melodic/node-manager-fkie/default.nix b/distros/melodic/node-manager-fkie/default.nix
similarity index 100%
rename from melodic/node-manager-fkie/default.nix
rename to distros/melodic/node-manager-fkie/default.nix
diff --git a/melodic/nodelet-core/default.nix b/distros/melodic/nodelet-core/default.nix
similarity index 100%
rename from melodic/nodelet-core/default.nix
rename to distros/melodic/nodelet-core/default.nix
diff --git a/melodic/nodelet-topic-tools/default.nix b/distros/melodic/nodelet-topic-tools/default.nix
similarity index 100%
rename from melodic/nodelet-topic-tools/default.nix
rename to distros/melodic/nodelet-topic-tools/default.nix
diff --git a/melodic/nodelet-tutorial-math/default.nix b/distros/melodic/nodelet-tutorial-math/default.nix
similarity index 100%
rename from melodic/nodelet-tutorial-math/default.nix
rename to distros/melodic/nodelet-tutorial-math/default.nix
diff --git a/melodic/nodelet/default.nix b/distros/melodic/nodelet/default.nix
similarity index 100%
rename from melodic/nodelet/default.nix
rename to distros/melodic/nodelet/default.nix
diff --git a/melodic/nonpersistent-voxel-layer/default.nix b/distros/melodic/nonpersistent-voxel-layer/default.nix
similarity index 100%
rename from melodic/nonpersistent-voxel-layer/default.nix
rename to distros/melodic/nonpersistent-voxel-layer/default.nix
diff --git a/melodic/novatel-gps-driver/default.nix b/distros/melodic/novatel-gps-driver/default.nix
similarity index 100%
rename from melodic/novatel-gps-driver/default.nix
rename to distros/melodic/novatel-gps-driver/default.nix
diff --git a/melodic/novatel-gps-msgs/default.nix b/distros/melodic/novatel-gps-msgs/default.nix
similarity index 100%
rename from melodic/novatel-gps-msgs/default.nix
rename to distros/melodic/novatel-gps-msgs/default.nix
diff --git a/melodic/novatel-msgs/default.nix b/distros/melodic/novatel-msgs/default.nix
similarity index 100%
rename from melodic/novatel-msgs/default.nix
rename to distros/melodic/novatel-msgs/default.nix
diff --git a/melodic/ntpd-driver/default.nix b/distros/melodic/ntpd-driver/default.nix
similarity index 100%
rename from melodic/ntpd-driver/default.nix
rename to distros/melodic/ntpd-driver/default.nix
diff --git a/melodic/obj-to-pointcloud/default.nix b/distros/melodic/obj-to-pointcloud/default.nix
similarity index 100%
rename from melodic/obj-to-pointcloud/default.nix
rename to distros/melodic/obj-to-pointcloud/default.nix
diff --git a/melodic/object-recognition-msgs/default.nix b/distros/melodic/object-recognition-msgs/default.nix
similarity index 100%
rename from melodic/object-recognition-msgs/default.nix
rename to distros/melodic/object-recognition-msgs/default.nix
diff --git a/melodic/ocean-battery-driver/default.nix b/distros/melodic/ocean-battery-driver/default.nix
similarity index 100%
rename from melodic/ocean-battery-driver/default.nix
rename to distros/melodic/ocean-battery-driver/default.nix
diff --git a/melodic/octomap-mapping/default.nix b/distros/melodic/octomap-mapping/default.nix
similarity index 100%
rename from melodic/octomap-mapping/default.nix
rename to distros/melodic/octomap-mapping/default.nix
diff --git a/melodic/octomap-msgs/default.nix b/distros/melodic/octomap-msgs/default.nix
similarity index 100%
rename from melodic/octomap-msgs/default.nix
rename to distros/melodic/octomap-msgs/default.nix
diff --git a/melodic/octomap-ros/default.nix b/distros/melodic/octomap-ros/default.nix
similarity index 100%
rename from melodic/octomap-ros/default.nix
rename to distros/melodic/octomap-ros/default.nix
diff --git a/melodic/octomap-rviz-plugins/default.nix b/distros/melodic/octomap-rviz-plugins/default.nix
similarity index 100%
rename from melodic/octomap-rviz-plugins/default.nix
rename to distros/melodic/octomap-rviz-plugins/default.nix
diff --git a/melodic/octomap-server/default.nix b/distros/melodic/octomap-server/default.nix
similarity index 100%
rename from melodic/octomap-server/default.nix
rename to distros/melodic/octomap-server/default.nix
diff --git a/melodic/octomap/default.nix b/distros/melodic/octomap/default.nix
similarity index 100%
rename from melodic/octomap/default.nix
rename to distros/melodic/octomap/default.nix
diff --git a/melodic/odom-frame-publisher/default.nix b/distros/melodic/odom-frame-publisher/default.nix
similarity index 100%
rename from melodic/odom-frame-publisher/default.nix
rename to distros/melodic/odom-frame-publisher/default.nix
diff --git a/melodic/odometry-publisher-tutorial/default.nix b/distros/melodic/odometry-publisher-tutorial/default.nix
similarity index 100%
rename from melodic/odometry-publisher-tutorial/default.nix
rename to distros/melodic/odometry-publisher-tutorial/default.nix
diff --git a/melodic/odva-ethernetip/default.nix b/distros/melodic/odva-ethernetip/default.nix
similarity index 100%
rename from melodic/odva-ethernetip/default.nix
rename to distros/melodic/odva-ethernetip/default.nix
diff --git a/melodic/ompl/default.nix b/distros/melodic/ompl/default.nix
similarity index 100%
rename from melodic/ompl/default.nix
rename to distros/melodic/ompl/default.nix
diff --git a/melodic/omron-os32c-driver/default.nix b/distros/melodic/omron-os32c-driver/default.nix
similarity index 100%
rename from melodic/omron-os32c-driver/default.nix
rename to distros/melodic/omron-os32c-driver/default.nix
diff --git a/melodic/open-karto/default.nix b/distros/melodic/open-karto/default.nix
similarity index 100%
rename from melodic/open-karto/default.nix
rename to distros/melodic/open-karto/default.nix
diff --git a/melodic/open-manipulator-control-gui/default.nix b/distros/melodic/open-manipulator-control-gui/default.nix
similarity index 100%
rename from melodic/open-manipulator-control-gui/default.nix
rename to distros/melodic/open-manipulator-control-gui/default.nix
diff --git a/melodic/open-manipulator-controller/default.nix b/distros/melodic/open-manipulator-controller/default.nix
similarity index 100%
rename from melodic/open-manipulator-controller/default.nix
rename to distros/melodic/open-manipulator-controller/default.nix
diff --git a/melodic/open-manipulator-description/default.nix b/distros/melodic/open-manipulator-description/default.nix
similarity index 100%
rename from melodic/open-manipulator-description/default.nix
rename to distros/melodic/open-manipulator-description/default.nix
diff --git a/melodic/open-manipulator-gazebo/default.nix b/distros/melodic/open-manipulator-gazebo/default.nix
similarity index 100%
rename from melodic/open-manipulator-gazebo/default.nix
rename to distros/melodic/open-manipulator-gazebo/default.nix
diff --git a/melodic/open-manipulator-libs/default.nix b/distros/melodic/open-manipulator-libs/default.nix
similarity index 100%
rename from melodic/open-manipulator-libs/default.nix
rename to distros/melodic/open-manipulator-libs/default.nix
diff --git a/melodic/open-manipulator-moveit/default.nix b/distros/melodic/open-manipulator-moveit/default.nix
similarity index 100%
rename from melodic/open-manipulator-moveit/default.nix
rename to distros/melodic/open-manipulator-moveit/default.nix
diff --git a/melodic/open-manipulator-msgs/default.nix b/distros/melodic/open-manipulator-msgs/default.nix
similarity index 100%
rename from melodic/open-manipulator-msgs/default.nix
rename to distros/melodic/open-manipulator-msgs/default.nix
diff --git a/melodic/open-manipulator-simulations/default.nix b/distros/melodic/open-manipulator-simulations/default.nix
similarity index 100%
rename from melodic/open-manipulator-simulations/default.nix
rename to distros/melodic/open-manipulator-simulations/default.nix
diff --git a/melodic/open-manipulator-teleop/default.nix b/distros/melodic/open-manipulator-teleop/default.nix
similarity index 100%
rename from melodic/open-manipulator-teleop/default.nix
rename to distros/melodic/open-manipulator-teleop/default.nix
diff --git a/melodic/open-manipulator-with-tb3-description/default.nix b/distros/melodic/open-manipulator-with-tb3-description/default.nix
similarity index 100%
rename from melodic/open-manipulator-with-tb3-description/default.nix
rename to distros/melodic/open-manipulator-with-tb3-description/default.nix
diff --git a/melodic/open-manipulator-with-tb3-gazebo/default.nix b/distros/melodic/open-manipulator-with-tb3-gazebo/default.nix
similarity index 100%
rename from melodic/open-manipulator-with-tb3-gazebo/default.nix
rename to distros/melodic/open-manipulator-with-tb3-gazebo/default.nix
diff --git a/melodic/open-manipulator-with-tb3-simulations/default.nix b/distros/melodic/open-manipulator-with-tb3-simulations/default.nix
similarity index 100%
rename from melodic/open-manipulator-with-tb3-simulations/default.nix
rename to distros/melodic/open-manipulator-with-tb3-simulations/default.nix
diff --git a/melodic/open-manipulator-with-tb3-tools/default.nix b/distros/melodic/open-manipulator-with-tb3-tools/default.nix
similarity index 100%
rename from melodic/open-manipulator-with-tb3-tools/default.nix
rename to distros/melodic/open-manipulator-with-tb3-tools/default.nix
diff --git a/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix b/distros/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix
similarity index 100%
rename from melodic/open-manipulator-with-tb3-waffle-moveit/default.nix
rename to distros/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix
diff --git a/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix b/distros/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix
similarity index 100%
rename from melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix
rename to distros/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix
diff --git a/melodic/open-manipulator-with-tb3/default.nix b/distros/melodic/open-manipulator-with-tb3/default.nix
similarity index 100%
rename from melodic/open-manipulator-with-tb3/default.nix
rename to distros/melodic/open-manipulator-with-tb3/default.nix
diff --git a/melodic/open-manipulator/default.nix b/distros/melodic/open-manipulator/default.nix
similarity index 100%
rename from melodic/open-manipulator/default.nix
rename to distros/melodic/open-manipulator/default.nix
diff --git a/melodic/opencv-apps/default.nix b/distros/melodic/opencv-apps/default.nix
similarity index 100%
rename from melodic/opencv-apps/default.nix
rename to distros/melodic/opencv-apps/default.nix
diff --git a/melodic/opengm/default.nix b/distros/melodic/opengm/default.nix
similarity index 100%
rename from melodic/opengm/default.nix
rename to distros/melodic/opengm/default.nix
diff --git a/melodic/openni-description/default.nix b/distros/melodic/openni-description/default.nix
similarity index 100%
rename from melodic/openni-description/default.nix
rename to distros/melodic/openni-description/default.nix
diff --git a/melodic/openni-launch/default.nix b/distros/melodic/openni-launch/default.nix
similarity index 100%
rename from melodic/openni-launch/default.nix
rename to distros/melodic/openni-launch/default.nix
diff --git a/melodic/openni2-camera/default.nix b/distros/melodic/openni2-camera/default.nix
similarity index 100%
rename from melodic/openni2-camera/default.nix
rename to distros/melodic/openni2-camera/default.nix
diff --git a/melodic/openni2-launch/default.nix b/distros/melodic/openni2-launch/default.nix
similarity index 100%
rename from melodic/openni2-launch/default.nix
rename to distros/melodic/openni2-launch/default.nix
diff --git a/melodic/openrtm-aist/default.nix b/distros/melodic/openrtm-aist/default.nix
similarity index 100%
rename from melodic/openrtm-aist/default.nix
rename to distros/melodic/openrtm-aist/default.nix
diff --git a/melodic/openslam-gmapping/default.nix b/distros/melodic/openslam-gmapping/default.nix
similarity index 100%
rename from melodic/openslam-gmapping/default.nix
rename to distros/melodic/openslam-gmapping/default.nix
diff --git a/melodic/opt-camera/default.nix b/distros/melodic/opt-camera/default.nix
similarity index 100%
rename from melodic/opt-camera/default.nix
rename to distros/melodic/opt-camera/default.nix
diff --git a/melodic/optpp-catkin/default.nix b/distros/melodic/optpp-catkin/default.nix
similarity index 100%
rename from melodic/optpp-catkin/default.nix
rename to distros/melodic/optpp-catkin/default.nix
diff --git a/melodic/orocos-kdl/default.nix b/distros/melodic/orocos-kdl/default.nix
similarity index 100%
rename from melodic/orocos-kdl/default.nix
rename to distros/melodic/orocos-kdl/default.nix
diff --git a/melodic/orocos-kinematics-dynamics/default.nix b/distros/melodic/orocos-kinematics-dynamics/default.nix
similarity index 100%
rename from melodic/orocos-kinematics-dynamics/default.nix
rename to distros/melodic/orocos-kinematics-dynamics/default.nix
diff --git a/melodic/osg-interactive-markers/default.nix b/distros/melodic/osg-interactive-markers/default.nix
similarity index 100%
rename from melodic/osg-interactive-markers/default.nix
rename to distros/melodic/osg-interactive-markers/default.nix
diff --git a/melodic/osg-markers/default.nix b/distros/melodic/osg-markers/default.nix
similarity index 100%
rename from melodic/osg-markers/default.nix
rename to distros/melodic/osg-markers/default.nix
diff --git a/melodic/osg-utils/default.nix b/distros/melodic/osg-utils/default.nix
similarity index 100%
rename from melodic/osg-utils/default.nix
rename to distros/melodic/osg-utils/default.nix
diff --git a/melodic/osm-cartography/default.nix b/distros/melodic/osm-cartography/default.nix
similarity index 100%
rename from melodic/osm-cartography/default.nix
rename to distros/melodic/osm-cartography/default.nix
diff --git a/melodic/ouster-driver/default.nix b/distros/melodic/ouster-driver/default.nix
similarity index 100%
rename from melodic/ouster-driver/default.nix
rename to distros/melodic/ouster-driver/default.nix
diff --git a/melodic/overrides.nix b/distros/melodic/overrides.nix
similarity index 100%
rename from melodic/overrides.nix
rename to distros/melodic/overrides.nix
diff --git a/melodic/oxford-gps-eth/default.nix b/distros/melodic/oxford-gps-eth/default.nix
similarity index 100%
rename from melodic/oxford-gps-eth/default.nix
rename to distros/melodic/oxford-gps-eth/default.nix
diff --git a/melodic/p2os-doc/default.nix b/distros/melodic/p2os-doc/default.nix
similarity index 100%
rename from melodic/p2os-doc/default.nix
rename to distros/melodic/p2os-doc/default.nix
diff --git a/melodic/p2os-driver/default.nix b/distros/melodic/p2os-driver/default.nix
similarity index 100%
rename from melodic/p2os-driver/default.nix
rename to distros/melodic/p2os-driver/default.nix
diff --git a/melodic/p2os-launch/default.nix b/distros/melodic/p2os-launch/default.nix
similarity index 100%
rename from melodic/p2os-launch/default.nix
rename to distros/melodic/p2os-launch/default.nix
diff --git a/melodic/p2os-msgs/default.nix b/distros/melodic/p2os-msgs/default.nix
similarity index 100%
rename from melodic/p2os-msgs/default.nix
rename to distros/melodic/p2os-msgs/default.nix
diff --git a/melodic/p2os-teleop/default.nix b/distros/melodic/p2os-teleop/default.nix
similarity index 100%
rename from melodic/p2os-teleop/default.nix
rename to distros/melodic/p2os-teleop/default.nix
diff --git a/melodic/p2os-urdf/default.nix b/distros/melodic/p2os-urdf/default.nix
similarity index 100%
rename from melodic/p2os-urdf/default.nix
rename to distros/melodic/p2os-urdf/default.nix
diff --git a/melodic/pacmod-game-control/default.nix b/distros/melodic/pacmod-game-control/default.nix
similarity index 100%
rename from melodic/pacmod-game-control/default.nix
rename to distros/melodic/pacmod-game-control/default.nix
diff --git a/melodic/pacmod-msgs/default.nix b/distros/melodic/pacmod-msgs/default.nix
similarity index 100%
rename from melodic/pacmod-msgs/default.nix
rename to distros/melodic/pacmod-msgs/default.nix
diff --git a/melodic/pacmod3/default.nix b/distros/melodic/pacmod3/default.nix
similarity index 100%
rename from melodic/pacmod3/default.nix
rename to distros/melodic/pacmod3/default.nix
diff --git a/melodic/panda-moveit-config/default.nix b/distros/melodic/panda-moveit-config/default.nix
similarity index 100%
rename from melodic/panda-moveit-config/default.nix
rename to distros/melodic/panda-moveit-config/default.nix
diff --git a/melodic/parameter-assertions/default.nix b/distros/melodic/parameter-assertions/default.nix
similarity index 100%
rename from melodic/parameter-assertions/default.nix
rename to distros/melodic/parameter-assertions/default.nix
diff --git a/melodic/parrot-arsdk/default.nix b/distros/melodic/parrot-arsdk/default.nix
similarity index 100%
rename from melodic/parrot-arsdk/default.nix
rename to distros/melodic/parrot-arsdk/default.nix
diff --git a/melodic/pcl-conversions/default.nix b/distros/melodic/pcl-conversions/default.nix
similarity index 100%
rename from melodic/pcl-conversions/default.nix
rename to distros/melodic/pcl-conversions/default.nix
diff --git a/melodic/pcl-msgs/default.nix b/distros/melodic/pcl-msgs/default.nix
similarity index 100%
rename from melodic/pcl-msgs/default.nix
rename to distros/melodic/pcl-msgs/default.nix
diff --git a/melodic/pcl-ros/default.nix b/distros/melodic/pcl-ros/default.nix
similarity index 100%
rename from melodic/pcl-ros/default.nix
rename to distros/melodic/pcl-ros/default.nix
diff --git a/melodic/people-msgs/default.nix b/distros/melodic/people-msgs/default.nix
similarity index 100%
rename from melodic/people-msgs/default.nix
rename to distros/melodic/people-msgs/default.nix
diff --git a/melodic/people-tracking-filter/default.nix b/distros/melodic/people-tracking-filter/default.nix
similarity index 100%
rename from melodic/people-tracking-filter/default.nix
rename to distros/melodic/people-tracking-filter/default.nix
diff --git a/melodic/people-velocity-tracker/default.nix b/distros/melodic/people-velocity-tracker/default.nix
similarity index 100%
rename from melodic/people-velocity-tracker/default.nix
rename to distros/melodic/people-velocity-tracker/default.nix
diff --git a/melodic/people/default.nix b/distros/melodic/people/default.nix
similarity index 100%
rename from melodic/people/default.nix
rename to distros/melodic/people/default.nix
diff --git a/melodic/pepper-meshes/default.nix b/distros/melodic/pepper-meshes/default.nix
similarity index 100%
rename from melodic/pepper-meshes/default.nix
rename to distros/melodic/pepper-meshes/default.nix
diff --git a/melodic/pepperl-fuchs-r2000/default.nix b/distros/melodic/pepperl-fuchs-r2000/default.nix
similarity index 100%
rename from melodic/pepperl-fuchs-r2000/default.nix
rename to distros/melodic/pepperl-fuchs-r2000/default.nix
diff --git a/melodic/perception-pcl/default.nix b/distros/melodic/perception-pcl/default.nix
similarity index 100%
rename from melodic/perception-pcl/default.nix
rename to distros/melodic/perception-pcl/default.nix
diff --git a/melodic/perception/default.nix b/distros/melodic/perception/default.nix
similarity index 100%
rename from melodic/perception/default.nix
rename to distros/melodic/perception/default.nix
diff --git a/melodic/pheeno-ros-description/default.nix b/distros/melodic/pheeno-ros-description/default.nix
similarity index 100%
rename from melodic/pheeno-ros-description/default.nix
rename to distros/melodic/pheeno-ros-description/default.nix
diff --git a/melodic/phidgets-api/default.nix b/distros/melodic/phidgets-api/default.nix
similarity index 100%
rename from melodic/phidgets-api/default.nix
rename to distros/melodic/phidgets-api/default.nix
diff --git a/melodic/phidgets-drivers/default.nix b/distros/melodic/phidgets-drivers/default.nix
similarity index 100%
rename from melodic/phidgets-drivers/default.nix
rename to distros/melodic/phidgets-drivers/default.nix
diff --git a/melodic/phidgets-high-speed-encoder/default.nix b/distros/melodic/phidgets-high-speed-encoder/default.nix
similarity index 100%
rename from melodic/phidgets-high-speed-encoder/default.nix
rename to distros/melodic/phidgets-high-speed-encoder/default.nix
diff --git a/melodic/phidgets-ik/default.nix b/distros/melodic/phidgets-ik/default.nix
similarity index 100%
rename from melodic/phidgets-ik/default.nix
rename to distros/melodic/phidgets-ik/default.nix
diff --git a/melodic/phidgets-imu/default.nix b/distros/melodic/phidgets-imu/default.nix
similarity index 100%
rename from melodic/phidgets-imu/default.nix
rename to distros/melodic/phidgets-imu/default.nix
diff --git a/melodic/photo/default.nix b/distros/melodic/photo/default.nix
similarity index 100%
rename from melodic/photo/default.nix
rename to distros/melodic/photo/default.nix
diff --git a/melodic/pid/default.nix b/distros/melodic/pid/default.nix
similarity index 100%
rename from melodic/pid/default.nix
rename to distros/melodic/pid/default.nix
diff --git a/melodic/pilz-control/default.nix b/distros/melodic/pilz-control/default.nix
similarity index 100%
rename from melodic/pilz-control/default.nix
rename to distros/melodic/pilz-control/default.nix
diff --git a/melodic/pilz-extensions/default.nix b/distros/melodic/pilz-extensions/default.nix
similarity index 100%
rename from melodic/pilz-extensions/default.nix
rename to distros/melodic/pilz-extensions/default.nix
diff --git a/melodic/pilz-industrial-motion-testutils/default.nix b/distros/melodic/pilz-industrial-motion-testutils/default.nix
similarity index 100%
rename from melodic/pilz-industrial-motion-testutils/default.nix
rename to distros/melodic/pilz-industrial-motion-testutils/default.nix
diff --git a/melodic/pilz-industrial-motion/default.nix b/distros/melodic/pilz-industrial-motion/default.nix
similarity index 100%
rename from melodic/pilz-industrial-motion/default.nix
rename to distros/melodic/pilz-industrial-motion/default.nix
diff --git a/melodic/pilz-msgs/default.nix b/distros/melodic/pilz-msgs/default.nix
similarity index 100%
rename from melodic/pilz-msgs/default.nix
rename to distros/melodic/pilz-msgs/default.nix
diff --git a/melodic/pilz-robot-programming/default.nix b/distros/melodic/pilz-robot-programming/default.nix
similarity index 100%
rename from melodic/pilz-robot-programming/default.nix
rename to distros/melodic/pilz-robot-programming/default.nix
diff --git a/melodic/pilz-robots/default.nix b/distros/melodic/pilz-robots/default.nix
similarity index 100%
rename from melodic/pilz-robots/default.nix
rename to distros/melodic/pilz-robots/default.nix
diff --git a/melodic/pilz-testutils/default.nix b/distros/melodic/pilz-testutils/default.nix
similarity index 100%
rename from melodic/pilz-testutils/default.nix
rename to distros/melodic/pilz-testutils/default.nix
diff --git a/melodic/pilz-trajectory-generation/default.nix b/distros/melodic/pilz-trajectory-generation/default.nix
similarity index 100%
rename from melodic/pilz-trajectory-generation/default.nix
rename to distros/melodic/pilz-trajectory-generation/default.nix
diff --git a/melodic/pilz-utils/default.nix b/distros/melodic/pilz-utils/default.nix
similarity index 100%
rename from melodic/pilz-utils/default.nix
rename to distros/melodic/pilz-utils/default.nix
diff --git a/melodic/pinocchio/default.nix b/distros/melodic/pinocchio/default.nix
similarity index 100%
rename from melodic/pinocchio/default.nix
rename to distros/melodic/pinocchio/default.nix
diff --git a/melodic/planner-cspace-msgs/default.nix b/distros/melodic/planner-cspace-msgs/default.nix
similarity index 100%
rename from melodic/planner-cspace-msgs/default.nix
rename to distros/melodic/planner-cspace-msgs/default.nix
diff --git a/melodic/planner-cspace/default.nix b/distros/melodic/planner-cspace/default.nix
similarity index 100%
rename from melodic/planner-cspace/default.nix
rename to distros/melodic/planner-cspace/default.nix
diff --git a/melodic/plotjuggler/default.nix b/distros/melodic/plotjuggler/default.nix
similarity index 100%
rename from melodic/plotjuggler/default.nix
rename to distros/melodic/plotjuggler/default.nix
diff --git a/melodic/pluginlib-tutorials/default.nix b/distros/melodic/pluginlib-tutorials/default.nix
similarity index 100%
rename from melodic/pluginlib-tutorials/default.nix
rename to distros/melodic/pluginlib-tutorials/default.nix
diff --git a/melodic/pluginlib/default.nix b/distros/melodic/pluginlib/default.nix
similarity index 100%
rename from melodic/pluginlib/default.nix
rename to distros/melodic/pluginlib/default.nix
diff --git a/melodic/point-cloud-publisher-tutorial/default.nix b/distros/melodic/point-cloud-publisher-tutorial/default.nix
similarity index 100%
rename from melodic/point-cloud-publisher-tutorial/default.nix
rename to distros/melodic/point-cloud-publisher-tutorial/default.nix
diff --git a/melodic/pointcloud-to-laserscan/default.nix b/distros/melodic/pointcloud-to-laserscan/default.nix
similarity index 100%
rename from melodic/pointcloud-to-laserscan/default.nix
rename to distros/melodic/pointcloud-to-laserscan/default.nix
diff --git a/melodic/polled-camera/default.nix b/distros/melodic/polled-camera/default.nix
similarity index 100%
rename from melodic/polled-camera/default.nix
rename to distros/melodic/polled-camera/default.nix
diff --git a/melodic/pose-base-controller/default.nix b/distros/melodic/pose-base-controller/default.nix
similarity index 100%
rename from melodic/pose-base-controller/default.nix
rename to distros/melodic/pose-base-controller/default.nix
diff --git a/melodic/pose-cov-ops/default.nix b/distros/melodic/pose-cov-ops/default.nix
similarity index 100%
rename from melodic/pose-cov-ops/default.nix
rename to distros/melodic/pose-cov-ops/default.nix
diff --git a/melodic/pose-follower/default.nix b/distros/melodic/pose-follower/default.nix
similarity index 100%
rename from melodic/pose-follower/default.nix
rename to distros/melodic/pose-follower/default.nix
diff --git a/melodic/posedetection-msgs/default.nix b/distros/melodic/posedetection-msgs/default.nix
similarity index 100%
rename from melodic/posedetection-msgs/default.nix
rename to distros/melodic/posedetection-msgs/default.nix
diff --git a/melodic/position-controllers/default.nix b/distros/melodic/position-controllers/default.nix
similarity index 100%
rename from melodic/position-controllers/default.nix
rename to distros/melodic/position-controllers/default.nix
diff --git a/melodic/power-monitor/default.nix b/distros/melodic/power-monitor/default.nix
similarity index 100%
rename from melodic/power-monitor/default.nix
rename to distros/melodic/power-monitor/default.nix
diff --git a/melodic/power-msgs/default.nix b/distros/melodic/power-msgs/default.nix
similarity index 100%
rename from melodic/power-msgs/default.nix
rename to distros/melodic/power-msgs/default.nix
diff --git a/melodic/pr2-app-manager/default.nix b/distros/melodic/pr2-app-manager/default.nix
similarity index 100%
rename from melodic/pr2-app-manager/default.nix
rename to distros/melodic/pr2-app-manager/default.nix
diff --git a/melodic/pr2-apps/default.nix b/distros/melodic/pr2-apps/default.nix
similarity index 100%
rename from melodic/pr2-apps/default.nix
rename to distros/melodic/pr2-apps/default.nix
diff --git a/melodic/pr2-arm-kinematics/default.nix b/distros/melodic/pr2-arm-kinematics/default.nix
similarity index 100%
rename from melodic/pr2-arm-kinematics/default.nix
rename to distros/melodic/pr2-arm-kinematics/default.nix
diff --git a/melodic/pr2-arm-move-ik/default.nix b/distros/melodic/pr2-arm-move-ik/default.nix
similarity index 100%
rename from melodic/pr2-arm-move-ik/default.nix
rename to distros/melodic/pr2-arm-move-ik/default.nix
diff --git a/melodic/pr2-calibration-controllers/default.nix b/distros/melodic/pr2-calibration-controllers/default.nix
similarity index 100%
rename from melodic/pr2-calibration-controllers/default.nix
rename to distros/melodic/pr2-calibration-controllers/default.nix
diff --git a/melodic/pr2-common-action-msgs/default.nix b/distros/melodic/pr2-common-action-msgs/default.nix
similarity index 100%
rename from melodic/pr2-common-action-msgs/default.nix
rename to distros/melodic/pr2-common-action-msgs/default.nix
diff --git a/melodic/pr2-common-actions/default.nix b/distros/melodic/pr2-common-actions/default.nix
similarity index 100%
rename from melodic/pr2-common-actions/default.nix
rename to distros/melodic/pr2-common-actions/default.nix
diff --git a/melodic/pr2-common/default.nix b/distros/melodic/pr2-common/default.nix
similarity index 100%
rename from melodic/pr2-common/default.nix
rename to distros/melodic/pr2-common/default.nix
diff --git a/melodic/pr2-controller-configuration-gazebo/default.nix b/distros/melodic/pr2-controller-configuration-gazebo/default.nix
similarity index 100%
rename from melodic/pr2-controller-configuration-gazebo/default.nix
rename to distros/melodic/pr2-controller-configuration-gazebo/default.nix
diff --git a/melodic/pr2-controller-interface/default.nix b/distros/melodic/pr2-controller-interface/default.nix
similarity index 100%
rename from melodic/pr2-controller-interface/default.nix
rename to distros/melodic/pr2-controller-interface/default.nix
diff --git a/melodic/pr2-controller-manager/default.nix b/distros/melodic/pr2-controller-manager/default.nix
similarity index 100%
rename from melodic/pr2-controller-manager/default.nix
rename to distros/melodic/pr2-controller-manager/default.nix
diff --git a/melodic/pr2-controllers-msgs/default.nix b/distros/melodic/pr2-controllers-msgs/default.nix
similarity index 100%
rename from melodic/pr2-controllers-msgs/default.nix
rename to distros/melodic/pr2-controllers-msgs/default.nix
diff --git a/melodic/pr2-controllers/default.nix b/distros/melodic/pr2-controllers/default.nix
similarity index 100%
rename from melodic/pr2-controllers/default.nix
rename to distros/melodic/pr2-controllers/default.nix
diff --git a/melodic/pr2-dashboard-aggregator/default.nix b/distros/melodic/pr2-dashboard-aggregator/default.nix
similarity index 100%
rename from melodic/pr2-dashboard-aggregator/default.nix
rename to distros/melodic/pr2-dashboard-aggregator/default.nix
diff --git a/melodic/pr2-description/default.nix b/distros/melodic/pr2-description/default.nix
similarity index 100%
rename from melodic/pr2-description/default.nix
rename to distros/melodic/pr2-description/default.nix
diff --git a/melodic/pr2-ethercat-drivers/default.nix b/distros/melodic/pr2-ethercat-drivers/default.nix
similarity index 100%
rename from melodic/pr2-ethercat-drivers/default.nix
rename to distros/melodic/pr2-ethercat-drivers/default.nix
diff --git a/melodic/pr2-gazebo-plugins/default.nix b/distros/melodic/pr2-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/pr2-gazebo-plugins/default.nix
rename to distros/melodic/pr2-gazebo-plugins/default.nix
diff --git a/melodic/pr2-gazebo/default.nix b/distros/melodic/pr2-gazebo/default.nix
similarity index 100%
rename from melodic/pr2-gazebo/default.nix
rename to distros/melodic/pr2-gazebo/default.nix
diff --git a/melodic/pr2-gripper-action/default.nix b/distros/melodic/pr2-gripper-action/default.nix
similarity index 100%
rename from melodic/pr2-gripper-action/default.nix
rename to distros/melodic/pr2-gripper-action/default.nix
diff --git a/melodic/pr2-hardware-interface/default.nix b/distros/melodic/pr2-hardware-interface/default.nix
similarity index 100%
rename from melodic/pr2-hardware-interface/default.nix
rename to distros/melodic/pr2-hardware-interface/default.nix
diff --git a/melodic/pr2-head-action/default.nix b/distros/melodic/pr2-head-action/default.nix
similarity index 100%
rename from melodic/pr2-head-action/default.nix
rename to distros/melodic/pr2-head-action/default.nix
diff --git a/melodic/pr2-kinematics/default.nix b/distros/melodic/pr2-kinematics/default.nix
similarity index 100%
rename from melodic/pr2-kinematics/default.nix
rename to distros/melodic/pr2-kinematics/default.nix
diff --git a/melodic/pr2-machine/default.nix b/distros/melodic/pr2-machine/default.nix
similarity index 100%
rename from melodic/pr2-machine/default.nix
rename to distros/melodic/pr2-machine/default.nix
diff --git a/melodic/pr2-mannequin-mode/default.nix b/distros/melodic/pr2-mannequin-mode/default.nix
similarity index 100%
rename from melodic/pr2-mannequin-mode/default.nix
rename to distros/melodic/pr2-mannequin-mode/default.nix
diff --git a/melodic/pr2-mechanism-controllers/default.nix b/distros/melodic/pr2-mechanism-controllers/default.nix
similarity index 100%
rename from melodic/pr2-mechanism-controllers/default.nix
rename to distros/melodic/pr2-mechanism-controllers/default.nix
diff --git a/melodic/pr2-mechanism-diagnostics/default.nix b/distros/melodic/pr2-mechanism-diagnostics/default.nix
similarity index 100%
rename from melodic/pr2-mechanism-diagnostics/default.nix
rename to distros/melodic/pr2-mechanism-diagnostics/default.nix
diff --git a/melodic/pr2-mechanism-model/default.nix b/distros/melodic/pr2-mechanism-model/default.nix
similarity index 100%
rename from melodic/pr2-mechanism-model/default.nix
rename to distros/melodic/pr2-mechanism-model/default.nix
diff --git a/melodic/pr2-mechanism-msgs/default.nix b/distros/melodic/pr2-mechanism-msgs/default.nix
similarity index 100%
rename from melodic/pr2-mechanism-msgs/default.nix
rename to distros/melodic/pr2-mechanism-msgs/default.nix
diff --git a/melodic/pr2-mechanism/default.nix b/distros/melodic/pr2-mechanism/default.nix
similarity index 100%
rename from melodic/pr2-mechanism/default.nix
rename to distros/melodic/pr2-mechanism/default.nix
diff --git a/melodic/pr2-move-base/default.nix b/distros/melodic/pr2-move-base/default.nix
similarity index 100%
rename from melodic/pr2-move-base/default.nix
rename to distros/melodic/pr2-move-base/default.nix
diff --git a/melodic/pr2-moveit-config/default.nix b/distros/melodic/pr2-moveit-config/default.nix
similarity index 100%
rename from melodic/pr2-moveit-config/default.nix
rename to distros/melodic/pr2-moveit-config/default.nix
diff --git a/melodic/pr2-moveit-plugins/default.nix b/distros/melodic/pr2-moveit-plugins/default.nix
similarity index 100%
rename from melodic/pr2-moveit-plugins/default.nix
rename to distros/melodic/pr2-moveit-plugins/default.nix
diff --git a/melodic/pr2-msgs/default.nix b/distros/melodic/pr2-msgs/default.nix
similarity index 100%
rename from melodic/pr2-msgs/default.nix
rename to distros/melodic/pr2-msgs/default.nix
diff --git a/melodic/pr2-navigation-config/default.nix b/distros/melodic/pr2-navigation-config/default.nix
similarity index 100%
rename from melodic/pr2-navigation-config/default.nix
rename to distros/melodic/pr2-navigation-config/default.nix
diff --git a/melodic/pr2-navigation-global/default.nix b/distros/melodic/pr2-navigation-global/default.nix
similarity index 100%
rename from melodic/pr2-navigation-global/default.nix
rename to distros/melodic/pr2-navigation-global/default.nix
diff --git a/melodic/pr2-navigation-local/default.nix b/distros/melodic/pr2-navigation-local/default.nix
similarity index 100%
rename from melodic/pr2-navigation-local/default.nix
rename to distros/melodic/pr2-navigation-local/default.nix
diff --git a/melodic/pr2-navigation-perception/default.nix b/distros/melodic/pr2-navigation-perception/default.nix
similarity index 100%
rename from melodic/pr2-navigation-perception/default.nix
rename to distros/melodic/pr2-navigation-perception/default.nix
diff --git a/melodic/pr2-navigation-self-filter/default.nix b/distros/melodic/pr2-navigation-self-filter/default.nix
similarity index 100%
rename from melodic/pr2-navigation-self-filter/default.nix
rename to distros/melodic/pr2-navigation-self-filter/default.nix
diff --git a/melodic/pr2-navigation-slam/default.nix b/distros/melodic/pr2-navigation-slam/default.nix
similarity index 100%
rename from melodic/pr2-navigation-slam/default.nix
rename to distros/melodic/pr2-navigation-slam/default.nix
diff --git a/melodic/pr2-navigation-teleop/default.nix b/distros/melodic/pr2-navigation-teleop/default.nix
similarity index 100%
rename from melodic/pr2-navigation-teleop/default.nix
rename to distros/melodic/pr2-navigation-teleop/default.nix
diff --git a/melodic/pr2-navigation/default.nix b/distros/melodic/pr2-navigation/default.nix
similarity index 100%
rename from melodic/pr2-navigation/default.nix
rename to distros/melodic/pr2-navigation/default.nix
diff --git a/melodic/pr2-position-scripts/default.nix b/distros/melodic/pr2-position-scripts/default.nix
similarity index 100%
rename from melodic/pr2-position-scripts/default.nix
rename to distros/melodic/pr2-position-scripts/default.nix
diff --git a/melodic/pr2-power-board/default.nix b/distros/melodic/pr2-power-board/default.nix
similarity index 100%
rename from melodic/pr2-power-board/default.nix
rename to distros/melodic/pr2-power-board/default.nix
diff --git a/melodic/pr2-power-drivers/default.nix b/distros/melodic/pr2-power-drivers/default.nix
similarity index 100%
rename from melodic/pr2-power-drivers/default.nix
rename to distros/melodic/pr2-power-drivers/default.nix
diff --git a/melodic/pr2-simulator/default.nix b/distros/melodic/pr2-simulator/default.nix
similarity index 100%
rename from melodic/pr2-simulator/default.nix
rename to distros/melodic/pr2-simulator/default.nix
diff --git a/melodic/pr2-teleop-general/default.nix b/distros/melodic/pr2-teleop-general/default.nix
similarity index 100%
rename from melodic/pr2-teleop-general/default.nix
rename to distros/melodic/pr2-teleop-general/default.nix
diff --git a/melodic/pr2-teleop/default.nix b/distros/melodic/pr2-teleop/default.nix
similarity index 100%
rename from melodic/pr2-teleop/default.nix
rename to distros/melodic/pr2-teleop/default.nix
diff --git a/melodic/pr2-tilt-laser-interface/default.nix b/distros/melodic/pr2-tilt-laser-interface/default.nix
similarity index 100%
rename from melodic/pr2-tilt-laser-interface/default.nix
rename to distros/melodic/pr2-tilt-laser-interface/default.nix
diff --git a/melodic/pr2-tuck-arms-action/default.nix b/distros/melodic/pr2-tuck-arms-action/default.nix
similarity index 100%
rename from melodic/pr2-tuck-arms-action/default.nix
rename to distros/melodic/pr2-tuck-arms-action/default.nix
diff --git a/melodic/pr2-tuckarm/default.nix b/distros/melodic/pr2-tuckarm/default.nix
similarity index 100%
rename from melodic/pr2-tuckarm/default.nix
rename to distros/melodic/pr2-tuckarm/default.nix
diff --git a/melodic/pr2eus-moveit/default.nix b/distros/melodic/pr2eus-moveit/default.nix
similarity index 100%
rename from melodic/pr2eus-moveit/default.nix
rename to distros/melodic/pr2eus-moveit/default.nix
diff --git a/melodic/pr2eus-tutorials/default.nix b/distros/melodic/pr2eus-tutorials/default.nix
similarity index 100%
rename from melodic/pr2eus-tutorials/default.nix
rename to distros/melodic/pr2eus-tutorials/default.nix
diff --git a/melodic/pr2eus/default.nix b/distros/melodic/pr2eus/default.nix
similarity index 100%
rename from melodic/pr2eus/default.nix
rename to distros/melodic/pr2eus/default.nix
diff --git a/melodic/prbt-gazebo/default.nix b/distros/melodic/prbt-gazebo/default.nix
similarity index 100%
rename from melodic/prbt-gazebo/default.nix
rename to distros/melodic/prbt-gazebo/default.nix
diff --git a/melodic/prbt-grippers/default.nix b/distros/melodic/prbt-grippers/default.nix
similarity index 100%
rename from melodic/prbt-grippers/default.nix
rename to distros/melodic/prbt-grippers/default.nix
diff --git a/melodic/prbt-hardware-support/default.nix b/distros/melodic/prbt-hardware-support/default.nix
similarity index 100%
rename from melodic/prbt-hardware-support/default.nix
rename to distros/melodic/prbt-hardware-support/default.nix
diff --git a/melodic/prbt-ikfast-manipulator-plugin/default.nix b/distros/melodic/prbt-ikfast-manipulator-plugin/default.nix
similarity index 100%
rename from melodic/prbt-ikfast-manipulator-plugin/default.nix
rename to distros/melodic/prbt-ikfast-manipulator-plugin/default.nix
diff --git a/melodic/prbt-moveit-config/default.nix b/distros/melodic/prbt-moveit-config/default.nix
similarity index 100%
rename from melodic/prbt-moveit-config/default.nix
rename to distros/melodic/prbt-moveit-config/default.nix
diff --git a/melodic/prbt-pg70-support/default.nix b/distros/melodic/prbt-pg70-support/default.nix
similarity index 100%
rename from melodic/prbt-pg70-support/default.nix
rename to distros/melodic/prbt-pg70-support/default.nix
diff --git a/melodic/prbt-support/default.nix b/distros/melodic/prbt-support/default.nix
similarity index 100%
rename from melodic/prbt-support/default.nix
rename to distros/melodic/prbt-support/default.nix
diff --git a/melodic/prosilica-camera/default.nix b/distros/melodic/prosilica-camera/default.nix
similarity index 100%
rename from melodic/prosilica-camera/default.nix
rename to distros/melodic/prosilica-camera/default.nix
diff --git a/melodic/prosilica-gige-sdk/default.nix b/distros/melodic/prosilica-gige-sdk/default.nix
similarity index 100%
rename from melodic/prosilica-gige-sdk/default.nix
rename to distros/melodic/prosilica-gige-sdk/default.nix
diff --git a/melodic/ps3joy/default.nix b/distros/melodic/ps3joy/default.nix
similarity index 100%
rename from melodic/ps3joy/default.nix
rename to distros/melodic/ps3joy/default.nix
diff --git a/melodic/psen-scan/default.nix b/distros/melodic/psen-scan/default.nix
similarity index 100%
rename from melodic/psen-scan/default.nix
rename to distros/melodic/psen-scan/default.nix
diff --git a/melodic/px4-msgs/default.nix b/distros/melodic/px4-msgs/default.nix
similarity index 100%
rename from melodic/px4-msgs/default.nix
rename to distros/melodic/px4-msgs/default.nix
diff --git a/melodic/py-trees-msgs/default.nix b/distros/melodic/py-trees-msgs/default.nix
similarity index 100%
rename from melodic/py-trees-msgs/default.nix
rename to distros/melodic/py-trees-msgs/default.nix
diff --git a/melodic/py-trees-ros/default.nix b/distros/melodic/py-trees-ros/default.nix
similarity index 100%
rename from melodic/py-trees-ros/default.nix
rename to distros/melodic/py-trees-ros/default.nix
diff --git a/melodic/py-trees/default.nix b/distros/melodic/py-trees/default.nix
similarity index 100%
rename from melodic/py-trees/default.nix
rename to distros/melodic/py-trees/default.nix
diff --git a/melodic/pybind11-catkin/default.nix b/distros/melodic/pybind11-catkin/default.nix
similarity index 100%
rename from melodic/pybind11-catkin/default.nix
rename to distros/melodic/pybind11-catkin/default.nix
diff --git a/melodic/pyros-test/default.nix b/distros/melodic/pyros-test/default.nix
similarity index 100%
rename from melodic/pyros-test/default.nix
rename to distros/melodic/pyros-test/default.nix
diff --git a/melodic/pyros-utils/default.nix b/distros/melodic/pyros-utils/default.nix
similarity index 100%
rename from melodic/pyros-utils/default.nix
rename to distros/melodic/pyros-utils/default.nix
diff --git a/melodic/python-orocos-kdl/default.nix b/distros/melodic/python-orocos-kdl/default.nix
similarity index 100%
rename from melodic/python-orocos-kdl/default.nix
rename to distros/melodic/python-orocos-kdl/default.nix
diff --git a/melodic/python-qt-binding.patch b/distros/melodic/python-qt-binding.patch
similarity index 100%
rename from melodic/python-qt-binding.patch
rename to distros/melodic/python-qt-binding.patch
diff --git a/melodic/python-qt-binding/default.nix b/distros/melodic/python-qt-binding/default.nix
similarity index 100%
rename from melodic/python-qt-binding/default.nix
rename to distros/melodic/python-qt-binding/default.nix
diff --git a/melodic/qb-chain-control/default.nix b/distros/melodic/qb-chain-control/default.nix
similarity index 100%
rename from melodic/qb-chain-control/default.nix
rename to distros/melodic/qb-chain-control/default.nix
diff --git a/melodic/qb-chain-description/default.nix b/distros/melodic/qb-chain-description/default.nix
similarity index 100%
rename from melodic/qb-chain-description/default.nix
rename to distros/melodic/qb-chain-description/default.nix
diff --git a/melodic/qb-chain/default.nix b/distros/melodic/qb-chain/default.nix
similarity index 100%
rename from melodic/qb-chain/default.nix
rename to distros/melodic/qb-chain/default.nix
diff --git a/melodic/qb-device-bringup/default.nix b/distros/melodic/qb-device-bringup/default.nix
similarity index 100%
rename from melodic/qb-device-bringup/default.nix
rename to distros/melodic/qb-device-bringup/default.nix
diff --git a/melodic/qb-device-control/default.nix b/distros/melodic/qb-device-control/default.nix
similarity index 100%
rename from melodic/qb-device-control/default.nix
rename to distros/melodic/qb-device-control/default.nix
diff --git a/melodic/qb-device-description/default.nix b/distros/melodic/qb-device-description/default.nix
similarity index 100%
rename from melodic/qb-device-description/default.nix
rename to distros/melodic/qb-device-description/default.nix
diff --git a/melodic/qb-device-driver/default.nix b/distros/melodic/qb-device-driver/default.nix
similarity index 100%
rename from melodic/qb-device-driver/default.nix
rename to distros/melodic/qb-device-driver/default.nix
diff --git a/melodic/qb-device-hardware-interface/default.nix b/distros/melodic/qb-device-hardware-interface/default.nix
similarity index 100%
rename from melodic/qb-device-hardware-interface/default.nix
rename to distros/melodic/qb-device-hardware-interface/default.nix
diff --git a/melodic/qb-device-msgs/default.nix b/distros/melodic/qb-device-msgs/default.nix
similarity index 100%
rename from melodic/qb-device-msgs/default.nix
rename to distros/melodic/qb-device-msgs/default.nix
diff --git a/melodic/qb-device-srvs/default.nix b/distros/melodic/qb-device-srvs/default.nix
similarity index 100%
rename from melodic/qb-device-srvs/default.nix
rename to distros/melodic/qb-device-srvs/default.nix
diff --git a/melodic/qb-device-utils/default.nix b/distros/melodic/qb-device-utils/default.nix
similarity index 100%
rename from melodic/qb-device-utils/default.nix
rename to distros/melodic/qb-device-utils/default.nix
diff --git a/melodic/qb-device/default.nix b/distros/melodic/qb-device/default.nix
similarity index 100%
rename from melodic/qb-device/default.nix
rename to distros/melodic/qb-device/default.nix
diff --git a/melodic/qb-hand-control/default.nix b/distros/melodic/qb-hand-control/default.nix
similarity index 100%
rename from melodic/qb-hand-control/default.nix
rename to distros/melodic/qb-hand-control/default.nix
diff --git a/melodic/qb-hand-description/default.nix b/distros/melodic/qb-hand-description/default.nix
similarity index 100%
rename from melodic/qb-hand-description/default.nix
rename to distros/melodic/qb-hand-description/default.nix
diff --git a/melodic/qb-hand-hardware-interface/default.nix b/distros/melodic/qb-hand-hardware-interface/default.nix
similarity index 100%
rename from melodic/qb-hand-hardware-interface/default.nix
rename to distros/melodic/qb-hand-hardware-interface/default.nix
diff --git a/melodic/qb-hand/default.nix b/distros/melodic/qb-hand/default.nix
similarity index 100%
rename from melodic/qb-hand/default.nix
rename to distros/melodic/qb-hand/default.nix
diff --git a/melodic/qb-move-control/default.nix b/distros/melodic/qb-move-control/default.nix
similarity index 100%
rename from melodic/qb-move-control/default.nix
rename to distros/melodic/qb-move-control/default.nix
diff --git a/melodic/qb-move-description/default.nix b/distros/melodic/qb-move-description/default.nix
similarity index 100%
rename from melodic/qb-move-description/default.nix
rename to distros/melodic/qb-move-description/default.nix
diff --git a/melodic/qb-move-hardware-interface/default.nix b/distros/melodic/qb-move-hardware-interface/default.nix
similarity index 100%
rename from melodic/qb-move-hardware-interface/default.nix
rename to distros/melodic/qb-move-hardware-interface/default.nix
diff --git a/melodic/qb-move/default.nix b/distros/melodic/qb-move/default.nix
similarity index 100%
rename from melodic/qb-move/default.nix
rename to distros/melodic/qb-move/default.nix
diff --git a/melodic/qpmad/default.nix b/distros/melodic/qpmad/default.nix
similarity index 100%
rename from melodic/qpmad/default.nix
rename to distros/melodic/qpmad/default.nix
diff --git a/melodic/qt-dotgraph/default.nix b/distros/melodic/qt-dotgraph/default.nix
similarity index 100%
rename from melodic/qt-dotgraph/default.nix
rename to distros/melodic/qt-dotgraph/default.nix
diff --git a/melodic/qt-gui-app/default.nix b/distros/melodic/qt-gui-app/default.nix
similarity index 100%
rename from melodic/qt-gui-app/default.nix
rename to distros/melodic/qt-gui-app/default.nix
diff --git a/melodic/qt-gui-core/default.nix b/distros/melodic/qt-gui-core/default.nix
similarity index 100%
rename from melodic/qt-gui-core/default.nix
rename to distros/melodic/qt-gui-core/default.nix
diff --git a/melodic/qt-gui-cpp/default.nix b/distros/melodic/qt-gui-cpp/default.nix
similarity index 100%
rename from melodic/qt-gui-cpp/default.nix
rename to distros/melodic/qt-gui-cpp/default.nix
diff --git a/melodic/qt-gui-py-common/default.nix b/distros/melodic/qt-gui-py-common/default.nix
similarity index 100%
rename from melodic/qt-gui-py-common/default.nix
rename to distros/melodic/qt-gui-py-common/default.nix
diff --git a/melodic/qt-gui/default.nix b/distros/melodic/qt-gui/default.nix
similarity index 100%
rename from melodic/qt-gui/default.nix
rename to distros/melodic/qt-gui/default.nix
diff --git a/melodic/qt-qmake/default.nix b/distros/melodic/qt-qmake/default.nix
similarity index 100%
rename from melodic/qt-qmake/default.nix
rename to distros/melodic/qt-qmake/default.nix
diff --git a/melodic/quaternion-operation/default.nix b/distros/melodic/quaternion-operation/default.nix
similarity index 100%
rename from melodic/quaternion-operation/default.nix
rename to distros/melodic/quaternion-operation/default.nix
diff --git a/melodic/qwt-dependency/default.nix b/distros/melodic/qwt-dependency/default.nix
similarity index 100%
rename from melodic/qwt-dependency/default.nix
rename to distros/melodic/qwt-dependency/default.nix
diff --git a/melodic/radar-msgs/default.nix b/distros/melodic/radar-msgs/default.nix
similarity index 100%
rename from melodic/radar-msgs/default.nix
rename to distros/melodic/radar-msgs/default.nix
diff --git a/melodic/radar-omnipresense/default.nix b/distros/melodic/radar-omnipresense/default.nix
similarity index 100%
rename from melodic/radar-omnipresense/default.nix
rename to distros/melodic/radar-omnipresense/default.nix
diff --git a/melodic/rail-manipulation-msgs/default.nix b/distros/melodic/rail-manipulation-msgs/default.nix
similarity index 100%
rename from melodic/rail-manipulation-msgs/default.nix
rename to distros/melodic/rail-manipulation-msgs/default.nix
diff --git a/melodic/rail-mesh-icp/default.nix b/distros/melodic/rail-mesh-icp/default.nix
similarity index 100%
rename from melodic/rail-mesh-icp/default.nix
rename to distros/melodic/rail-mesh-icp/default.nix
diff --git a/melodic/rail-segmentation/default.nix b/distros/melodic/rail-segmentation/default.nix
similarity index 100%
rename from melodic/rail-segmentation/default.nix
rename to distros/melodic/rail-segmentation/default.nix
diff --git a/melodic/random-numbers/default.nix b/distros/melodic/random-numbers/default.nix
similarity index 100%
rename from melodic/random-numbers/default.nix
rename to distros/melodic/random-numbers/default.nix
diff --git a/melodic/range-sensor-layer/default.nix b/distros/melodic/range-sensor-layer/default.nix
similarity index 100%
rename from melodic/range-sensor-layer/default.nix
rename to distros/melodic/range-sensor-layer/default.nix
diff --git a/melodic/raw-description/default.nix b/distros/melodic/raw-description/default.nix
similarity index 100%
rename from melodic/raw-description/default.nix
rename to distros/melodic/raw-description/default.nix
diff --git a/melodic/rc-cloud-accumulator/default.nix b/distros/melodic/rc-cloud-accumulator/default.nix
similarity index 100%
rename from melodic/rc-cloud-accumulator/default.nix
rename to distros/melodic/rc-cloud-accumulator/default.nix
diff --git a/melodic/rc-common-msgs/default.nix b/distros/melodic/rc-common-msgs/default.nix
similarity index 100%
rename from melodic/rc-common-msgs/default.nix
rename to distros/melodic/rc-common-msgs/default.nix
diff --git a/melodic/rc-dynamics-api/default.nix b/distros/melodic/rc-dynamics-api/default.nix
similarity index 100%
rename from melodic/rc-dynamics-api/default.nix
rename to distros/melodic/rc-dynamics-api/default.nix
diff --git a/melodic/rc-genicam-api/default.nix b/distros/melodic/rc-genicam-api/default.nix
similarity index 100%
rename from melodic/rc-genicam-api/default.nix
rename to distros/melodic/rc-genicam-api/default.nix
diff --git a/melodic/rc-hand-eye-calibration-client/default.nix b/distros/melodic/rc-hand-eye-calibration-client/default.nix
similarity index 100%
rename from melodic/rc-hand-eye-calibration-client/default.nix
rename to distros/melodic/rc-hand-eye-calibration-client/default.nix
diff --git a/melodic/rc-pick-client/default.nix b/distros/melodic/rc-pick-client/default.nix
similarity index 100%
rename from melodic/rc-pick-client/default.nix
rename to distros/melodic/rc-pick-client/default.nix
diff --git a/melodic/rc-roi-manager-gui/default.nix b/distros/melodic/rc-roi-manager-gui/default.nix
similarity index 100%
rename from melodic/rc-roi-manager-gui/default.nix
rename to distros/melodic/rc-roi-manager-gui/default.nix
diff --git a/melodic/rc-tagdetect-client/default.nix b/distros/melodic/rc-tagdetect-client/default.nix
similarity index 100%
rename from melodic/rc-tagdetect-client/default.nix
rename to distros/melodic/rc-tagdetect-client/default.nix
diff --git a/melodic/rc-visard-description/default.nix b/distros/melodic/rc-visard-description/default.nix
similarity index 100%
rename from melodic/rc-visard-description/default.nix
rename to distros/melodic/rc-visard-description/default.nix
diff --git a/melodic/rc-visard-driver/default.nix b/distros/melodic/rc-visard-driver/default.nix
similarity index 100%
rename from melodic/rc-visard-driver/default.nix
rename to distros/melodic/rc-visard-driver/default.nix
diff --git a/melodic/rc-visard/default.nix b/distros/melodic/rc-visard/default.nix
similarity index 100%
rename from melodic/rc-visard/default.nix
rename to distros/melodic/rc-visard/default.nix
diff --git a/melodic/rcdiscover/default.nix b/distros/melodic/rcdiscover/default.nix
similarity index 100%
rename from melodic/rcdiscover/default.nix
rename to distros/melodic/rcdiscover/default.nix
diff --git a/melodic/rdl-benchmark/default.nix b/distros/melodic/rdl-benchmark/default.nix
similarity index 100%
rename from melodic/rdl-benchmark/default.nix
rename to distros/melodic/rdl-benchmark/default.nix
diff --git a/melodic/rdl-cmake/default.nix b/distros/melodic/rdl-cmake/default.nix
similarity index 100%
rename from melodic/rdl-cmake/default.nix
rename to distros/melodic/rdl-cmake/default.nix
diff --git a/melodic/rdl-dynamics/default.nix b/distros/melodic/rdl-dynamics/default.nix
similarity index 100%
rename from melodic/rdl-dynamics/default.nix
rename to distros/melodic/rdl-dynamics/default.nix
diff --git a/melodic/rdl-msgs/default.nix b/distros/melodic/rdl-msgs/default.nix
similarity index 100%
rename from melodic/rdl-msgs/default.nix
rename to distros/melodic/rdl-msgs/default.nix
diff --git a/melodic/rdl-ros-tools/default.nix b/distros/melodic/rdl-ros-tools/default.nix
similarity index 100%
rename from melodic/rdl-ros-tools/default.nix
rename to distros/melodic/rdl-ros-tools/default.nix
diff --git a/melodic/rdl-urdfreader/default.nix b/distros/melodic/rdl-urdfreader/default.nix
similarity index 100%
rename from melodic/rdl-urdfreader/default.nix
rename to distros/melodic/rdl-urdfreader/default.nix
diff --git a/melodic/rdl/default.nix b/distros/melodic/rdl/default.nix
similarity index 100%
rename from melodic/rdl/default.nix
rename to distros/melodic/rdl/default.nix
diff --git a/melodic/realsense2-camera/default.nix b/distros/melodic/realsense2-camera/default.nix
similarity index 100%
rename from melodic/realsense2-camera/default.nix
rename to distros/melodic/realsense2-camera/default.nix
diff --git a/melodic/realsense2-description/default.nix b/distros/melodic/realsense2-description/default.nix
similarity index 100%
rename from melodic/realsense2-description/default.nix
rename to distros/melodic/realsense2-description/default.nix
diff --git a/melodic/realtime-tools/default.nix b/distros/melodic/realtime-tools/default.nix
similarity index 100%
rename from melodic/realtime-tools/default.nix
rename to distros/melodic/realtime-tools/default.nix
diff --git a/melodic/resized-image-transport/default.nix b/distros/melodic/resized-image-transport/default.nix
similarity index 100%
rename from melodic/resized-image-transport/default.nix
rename to distros/melodic/resized-image-transport/default.nix
diff --git a/melodic/resource-retriever/default.nix b/distros/melodic/resource-retriever/default.nix
similarity index 100%
rename from melodic/resource-retriever/default.nix
rename to distros/melodic/resource-retriever/default.nix
diff --git a/melodic/rexrov2-control/default.nix b/distros/melodic/rexrov2-control/default.nix
similarity index 100%
rename from melodic/rexrov2-control/default.nix
rename to distros/melodic/rexrov2-control/default.nix
diff --git a/melodic/rexrov2-description/default.nix b/distros/melodic/rexrov2-description/default.nix
similarity index 100%
rename from melodic/rexrov2-description/default.nix
rename to distros/melodic/rexrov2-description/default.nix
diff --git a/melodic/rexrov2-gazebo/default.nix b/distros/melodic/rexrov2-gazebo/default.nix
similarity index 100%
rename from melodic/rexrov2-gazebo/default.nix
rename to distros/melodic/rexrov2-gazebo/default.nix
diff --git a/melodic/rgbd-launch/default.nix b/distros/melodic/rgbd-launch/default.nix
similarity index 100%
rename from melodic/rgbd-launch/default.nix
rename to distros/melodic/rgbd-launch/default.nix
diff --git a/melodic/ridgeback-control/default.nix b/distros/melodic/ridgeback-control/default.nix
similarity index 100%
rename from melodic/ridgeback-control/default.nix
rename to distros/melodic/ridgeback-control/default.nix
diff --git a/melodic/ridgeback-description/default.nix b/distros/melodic/ridgeback-description/default.nix
similarity index 100%
rename from melodic/ridgeback-description/default.nix
rename to distros/melodic/ridgeback-description/default.nix
diff --git a/melodic/ridgeback-desktop/default.nix b/distros/melodic/ridgeback-desktop/default.nix
similarity index 100%
rename from melodic/ridgeback-desktop/default.nix
rename to distros/melodic/ridgeback-desktop/default.nix
diff --git a/melodic/ridgeback-gazebo-plugins/default.nix b/distros/melodic/ridgeback-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/ridgeback-gazebo-plugins/default.nix
rename to distros/melodic/ridgeback-gazebo-plugins/default.nix
diff --git a/melodic/ridgeback-gazebo/default.nix b/distros/melodic/ridgeback-gazebo/default.nix
similarity index 100%
rename from melodic/ridgeback-gazebo/default.nix
rename to distros/melodic/ridgeback-gazebo/default.nix
diff --git a/melodic/ridgeback-msgs/default.nix b/distros/melodic/ridgeback-msgs/default.nix
similarity index 100%
rename from melodic/ridgeback-msgs/default.nix
rename to distros/melodic/ridgeback-msgs/default.nix
diff --git a/melodic/ridgeback-navigation/default.nix b/distros/melodic/ridgeback-navigation/default.nix
similarity index 100%
rename from melodic/ridgeback-navigation/default.nix
rename to distros/melodic/ridgeback-navigation/default.nix
diff --git a/melodic/ridgeback-simulator/default.nix b/distros/melodic/ridgeback-simulator/default.nix
similarity index 100%
rename from melodic/ridgeback-simulator/default.nix
rename to distros/melodic/ridgeback-simulator/default.nix
diff --git a/melodic/ridgeback-viz/default.nix b/distros/melodic/ridgeback-viz/default.nix
similarity index 100%
rename from melodic/ridgeback-viz/default.nix
rename to distros/melodic/ridgeback-viz/default.nix
diff --git a/melodic/robot-activity-msgs/default.nix b/distros/melodic/robot-activity-msgs/default.nix
similarity index 100%
rename from melodic/robot-activity-msgs/default.nix
rename to distros/melodic/robot-activity-msgs/default.nix
diff --git a/melodic/robot-activity-tutorials/default.nix b/distros/melodic/robot-activity-tutorials/default.nix
similarity index 100%
rename from melodic/robot-activity-tutorials/default.nix
rename to distros/melodic/robot-activity-tutorials/default.nix
diff --git a/melodic/robot-activity/default.nix b/distros/melodic/robot-activity/default.nix
similarity index 100%
rename from melodic/robot-activity/default.nix
rename to distros/melodic/robot-activity/default.nix
diff --git a/melodic/robot-calibration-msgs/default.nix b/distros/melodic/robot-calibration-msgs/default.nix
similarity index 100%
rename from melodic/robot-calibration-msgs/default.nix
rename to distros/melodic/robot-calibration-msgs/default.nix
diff --git a/melodic/robot-calibration/default.nix b/distros/melodic/robot-calibration/default.nix
similarity index 100%
rename from melodic/robot-calibration/default.nix
rename to distros/melodic/robot-calibration/default.nix
diff --git a/melodic/robot-controllers-interface/default.nix b/distros/melodic/robot-controllers-interface/default.nix
similarity index 100%
rename from melodic/robot-controllers-interface/default.nix
rename to distros/melodic/robot-controllers-interface/default.nix
diff --git a/melodic/robot-controllers-msgs/default.nix b/distros/melodic/robot-controllers-msgs/default.nix
similarity index 100%
rename from melodic/robot-controllers-msgs/default.nix
rename to distros/melodic/robot-controllers-msgs/default.nix
diff --git a/melodic/robot-controllers/default.nix b/distros/melodic/robot-controllers/default.nix
similarity index 100%
rename from melodic/robot-controllers/default.nix
rename to distros/melodic/robot-controllers/default.nix
diff --git a/melodic/robot-localization/default.nix b/distros/melodic/robot-localization/default.nix
similarity index 100%
rename from melodic/robot-localization/default.nix
rename to distros/melodic/robot-localization/default.nix
diff --git a/melodic/robot-mechanism-controllers/default.nix b/distros/melodic/robot-mechanism-controllers/default.nix
similarity index 100%
rename from melodic/robot-mechanism-controllers/default.nix
rename to distros/melodic/robot-mechanism-controllers/default.nix
diff --git a/melodic/robot-navigation/default.nix b/distros/melodic/robot-navigation/default.nix
similarity index 100%
rename from melodic/robot-navigation/default.nix
rename to distros/melodic/robot-navigation/default.nix
diff --git a/melodic/robot-one/default.nix b/distros/melodic/robot-one/default.nix
similarity index 100%
rename from melodic/robot-one/default.nix
rename to distros/melodic/robot-one/default.nix
diff --git a/melodic/robot-pose-ekf/default.nix b/distros/melodic/robot-pose-ekf/default.nix
similarity index 100%
rename from melodic/robot-pose-ekf/default.nix
rename to distros/melodic/robot-pose-ekf/default.nix
diff --git a/melodic/robot-self-filter/default.nix b/distros/melodic/robot-self-filter/default.nix
similarity index 100%
rename from melodic/robot-self-filter/default.nix
rename to distros/melodic/robot-self-filter/default.nix
diff --git a/melodic/robot-setup-tf-tutorial/default.nix b/distros/melodic/robot-setup-tf-tutorial/default.nix
similarity index 100%
rename from melodic/robot-setup-tf-tutorial/default.nix
rename to distros/melodic/robot-setup-tf-tutorial/default.nix
diff --git a/melodic/robot-state-publisher/default.nix b/distros/melodic/robot-state-publisher/default.nix
similarity index 100%
rename from melodic/robot-state-publisher/default.nix
rename to distros/melodic/robot-state-publisher/default.nix
diff --git a/melodic/robot-upstart/default.nix b/distros/melodic/robot-upstart/default.nix
similarity index 100%
rename from melodic/robot-upstart/default.nix
rename to distros/melodic/robot-upstart/default.nix
diff --git a/melodic/robot/default.nix b/distros/melodic/robot/default.nix
similarity index 100%
rename from melodic/robot/default.nix
rename to distros/melodic/robot/default.nix
diff --git a/melodic/robotis-manipulator/default.nix b/distros/melodic/robotis-manipulator/default.nix
similarity index 100%
rename from melodic/robotis-manipulator/default.nix
rename to distros/melodic/robotis-manipulator/default.nix
diff --git a/melodic/rocon-app-manager-msgs/default.nix b/distros/melodic/rocon-app-manager-msgs/default.nix
similarity index 100%
rename from melodic/rocon-app-manager-msgs/default.nix
rename to distros/melodic/rocon-app-manager-msgs/default.nix
diff --git a/melodic/rocon-bubble-icons/default.nix b/distros/melodic/rocon-bubble-icons/default.nix
similarity index 100%
rename from melodic/rocon-bubble-icons/default.nix
rename to distros/melodic/rocon-bubble-icons/default.nix
diff --git a/melodic/rocon-console/default.nix b/distros/melodic/rocon-console/default.nix
similarity index 100%
rename from melodic/rocon-console/default.nix
rename to distros/melodic/rocon-console/default.nix
diff --git a/melodic/rocon-device-msgs/default.nix b/distros/melodic/rocon-device-msgs/default.nix
similarity index 100%
rename from melodic/rocon-device-msgs/default.nix
rename to distros/melodic/rocon-device-msgs/default.nix
diff --git a/melodic/rocon-ebnf/default.nix b/distros/melodic/rocon-ebnf/default.nix
similarity index 100%
rename from melodic/rocon-ebnf/default.nix
rename to distros/melodic/rocon-ebnf/default.nix
diff --git a/melodic/rocon-icons/default.nix b/distros/melodic/rocon-icons/default.nix
similarity index 100%
rename from melodic/rocon-icons/default.nix
rename to distros/melodic/rocon-icons/default.nix
diff --git a/melodic/rocon-interaction-msgs/default.nix b/distros/melodic/rocon-interaction-msgs/default.nix
similarity index 100%
rename from melodic/rocon-interaction-msgs/default.nix
rename to distros/melodic/rocon-interaction-msgs/default.nix
diff --git a/melodic/rocon-interactions/default.nix b/distros/melodic/rocon-interactions/default.nix
similarity index 100%
rename from melodic/rocon-interactions/default.nix
rename to distros/melodic/rocon-interactions/default.nix
diff --git a/melodic/rocon-launch/default.nix b/distros/melodic/rocon-launch/default.nix
similarity index 100%
rename from melodic/rocon-launch/default.nix
rename to distros/melodic/rocon-launch/default.nix
diff --git a/melodic/rocon-master-info/default.nix b/distros/melodic/rocon-master-info/default.nix
similarity index 100%
rename from melodic/rocon-master-info/default.nix
rename to distros/melodic/rocon-master-info/default.nix
diff --git a/melodic/rocon-msgs/default.nix b/distros/melodic/rocon-msgs/default.nix
similarity index 100%
rename from melodic/rocon-msgs/default.nix
rename to distros/melodic/rocon-msgs/default.nix
diff --git a/melodic/rocon-python-comms/default.nix b/distros/melodic/rocon-python-comms/default.nix
similarity index 100%
rename from melodic/rocon-python-comms/default.nix
rename to distros/melodic/rocon-python-comms/default.nix
diff --git a/melodic/rocon-python-redis/default.nix b/distros/melodic/rocon-python-redis/default.nix
similarity index 100%
rename from melodic/rocon-python-redis/default.nix
rename to distros/melodic/rocon-python-redis/default.nix
diff --git a/melodic/rocon-python-utils/default.nix b/distros/melodic/rocon-python-utils/default.nix
similarity index 100%
rename from melodic/rocon-python-utils/default.nix
rename to distros/melodic/rocon-python-utils/default.nix
diff --git a/melodic/rocon-python-wifi/default.nix b/distros/melodic/rocon-python-wifi/default.nix
similarity index 100%
rename from melodic/rocon-python-wifi/default.nix
rename to distros/melodic/rocon-python-wifi/default.nix
diff --git a/melodic/rocon-semantic-version/default.nix b/distros/melodic/rocon-semantic-version/default.nix
similarity index 100%
rename from melodic/rocon-semantic-version/default.nix
rename to distros/melodic/rocon-semantic-version/default.nix
diff --git a/melodic/rocon-service-pair-msgs/default.nix b/distros/melodic/rocon-service-pair-msgs/default.nix
similarity index 100%
rename from melodic/rocon-service-pair-msgs/default.nix
rename to distros/melodic/rocon-service-pair-msgs/default.nix
diff --git a/melodic/rocon-std-msgs/default.nix b/distros/melodic/rocon-std-msgs/default.nix
similarity index 100%
rename from melodic/rocon-std-msgs/default.nix
rename to distros/melodic/rocon-std-msgs/default.nix
diff --git a/melodic/rocon-tools/default.nix b/distros/melodic/rocon-tools/default.nix
similarity index 100%
rename from melodic/rocon-tools/default.nix
rename to distros/melodic/rocon-tools/default.nix
diff --git a/melodic/rocon-tutorial-msgs/default.nix b/distros/melodic/rocon-tutorial-msgs/default.nix
similarity index 100%
rename from melodic/rocon-tutorial-msgs/default.nix
rename to distros/melodic/rocon-tutorial-msgs/default.nix
diff --git a/melodic/rocon-uri/default.nix b/distros/melodic/rocon-uri/default.nix
similarity index 100%
rename from melodic/rocon-uri/default.nix
rename to distros/melodic/rocon-uri/default.nix
diff --git a/melodic/roomba-stage/default.nix b/distros/melodic/roomba-stage/default.nix
similarity index 100%
rename from melodic/roomba-stage/default.nix
rename to distros/melodic/roomba-stage/default.nix
diff --git a/melodic/ros-base/default.nix b/distros/melodic/ros-base/default.nix
similarity index 100%
rename from melodic/ros-base/default.nix
rename to distros/melodic/ros-base/default.nix
diff --git a/melodic/ros-canopen/default.nix b/distros/melodic/ros-canopen/default.nix
similarity index 100%
rename from melodic/ros-canopen/default.nix
rename to distros/melodic/ros-canopen/default.nix
diff --git a/melodic/ros-comm/default.nix b/distros/melodic/ros-comm/default.nix
similarity index 100%
rename from melodic/ros-comm/default.nix
rename to distros/melodic/ros-comm/default.nix
diff --git a/melodic/ros-control-boilerplate/default.nix b/distros/melodic/ros-control-boilerplate/default.nix
similarity index 100%
rename from melodic/ros-control-boilerplate/default.nix
rename to distros/melodic/ros-control-boilerplate/default.nix
diff --git a/melodic/ros-control/default.nix b/distros/melodic/ros-control/default.nix
similarity index 100%
rename from melodic/ros-control/default.nix
rename to distros/melodic/ros-control/default.nix
diff --git a/melodic/ros-controllers/default.nix b/distros/melodic/ros-controllers/default.nix
similarity index 100%
rename from melodic/ros-controllers/default.nix
rename to distros/melodic/ros-controllers/default.nix
diff --git a/melodic/ros-core/default.nix b/distros/melodic/ros-core/default.nix
similarity index 100%
rename from melodic/ros-core/default.nix
rename to distros/melodic/ros-core/default.nix
diff --git a/melodic/ros-emacs-utils/default.nix b/distros/melodic/ros-emacs-utils/default.nix
similarity index 100%
rename from melodic/ros-emacs-utils/default.nix
rename to distros/melodic/ros-emacs-utils/default.nix
diff --git a/melodic/ros-environment/default.nix b/distros/melodic/ros-environment/default.nix
similarity index 100%
rename from melodic/ros-environment/default.nix
rename to distros/melodic/ros-environment/default.nix
diff --git a/melodic/ros-introspection/default.nix b/distros/melodic/ros-introspection/default.nix
similarity index 100%
rename from melodic/ros-introspection/default.nix
rename to distros/melodic/ros-introspection/default.nix
diff --git a/melodic/ros-monitoring-msgs/default.nix b/distros/melodic/ros-monitoring-msgs/default.nix
similarity index 100%
rename from melodic/ros-monitoring-msgs/default.nix
rename to distros/melodic/ros-monitoring-msgs/default.nix
diff --git a/melodic/ros-pytest/default.nix b/distros/melodic/ros-pytest/default.nix
similarity index 100%
rename from melodic/ros-pytest/default.nix
rename to distros/melodic/ros-pytest/default.nix
diff --git a/melodic/ros-realtime/default.nix b/distros/melodic/ros-realtime/default.nix
similarity index 100%
rename from melodic/ros-realtime/default.nix
rename to distros/melodic/ros-realtime/default.nix
diff --git a/melodic/ros-reflexxes/default.nix b/distros/melodic/ros-reflexxes/default.nix
similarity index 100%
rename from melodic/ros-reflexxes/default.nix
rename to distros/melodic/ros-reflexxes/default.nix
diff --git a/melodic/ros-tutorials/default.nix b/distros/melodic/ros-tutorials/default.nix
similarity index 100%
rename from melodic/ros-tutorials/default.nix
rename to distros/melodic/ros-tutorials/default.nix
diff --git a/melodic/ros-type-introspection/default.nix b/distros/melodic/ros-type-introspection/default.nix
similarity index 100%
rename from melodic/ros-type-introspection/default.nix
rename to distros/melodic/ros-type-introspection/default.nix
diff --git a/melodic/ros/default.nix b/distros/melodic/ros/default.nix
similarity index 100%
rename from melodic/ros/default.nix
rename to distros/melodic/ros/default.nix
diff --git a/melodic/ros1-ign/default.nix b/distros/melodic/ros1-ign/default.nix
similarity index 100%
rename from melodic/ros1-ign/default.nix
rename to distros/melodic/ros1-ign/default.nix
diff --git a/melodic/rosapi/default.nix b/distros/melodic/rosapi/default.nix
similarity index 100%
rename from melodic/rosapi/default.nix
rename to distros/melodic/rosapi/default.nix
diff --git a/melodic/rosatomic/default.nix b/distros/melodic/rosatomic/default.nix
similarity index 100%
rename from melodic/rosatomic/default.nix
rename to distros/melodic/rosatomic/default.nix
diff --git a/melodic/rosauth/default.nix b/distros/melodic/rosauth/default.nix
similarity index 100%
rename from melodic/rosauth/default.nix
rename to distros/melodic/rosauth/default.nix
diff --git a/melodic/rosbag-editor/default.nix b/distros/melodic/rosbag-editor/default.nix
similarity index 100%
rename from melodic/rosbag-editor/default.nix
rename to distros/melodic/rosbag-editor/default.nix
diff --git a/melodic/rosbag-fancy/default.nix b/distros/melodic/rosbag-fancy/default.nix
similarity index 100%
rename from melodic/rosbag-fancy/default.nix
rename to distros/melodic/rosbag-fancy/default.nix
diff --git a/melodic/rosbag-migration-rule/default.nix b/distros/melodic/rosbag-migration-rule/default.nix
similarity index 100%
rename from melodic/rosbag-migration-rule/default.nix
rename to distros/melodic/rosbag-migration-rule/default.nix
diff --git a/melodic/rosbag-pandas/default.nix b/distros/melodic/rosbag-pandas/default.nix
similarity index 100%
rename from melodic/rosbag-pandas/default.nix
rename to distros/melodic/rosbag-pandas/default.nix
diff --git a/melodic/rosbag-storage/default.nix b/distros/melodic/rosbag-storage/default.nix
similarity index 100%
rename from melodic/rosbag-storage/default.nix
rename to distros/melodic/rosbag-storage/default.nix
diff --git a/melodic/rosbag/default.nix b/distros/melodic/rosbag/default.nix
similarity index 100%
rename from melodic/rosbag/default.nix
rename to distros/melodic/rosbag/default.nix
diff --git a/melodic/rosbaglive/default.nix b/distros/melodic/rosbaglive/default.nix
similarity index 100%
rename from melodic/rosbaglive/default.nix
rename to distros/melodic/rosbaglive/default.nix
diff --git a/melodic/rosbash-params/default.nix b/distros/melodic/rosbash-params/default.nix
similarity index 100%
rename from melodic/rosbash-params/default.nix
rename to distros/melodic/rosbash-params/default.nix
diff --git a/melodic/rosbash/default.nix b/distros/melodic/rosbash/default.nix
similarity index 100%
rename from melodic/rosbash/default.nix
rename to distros/melodic/rosbash/default.nix
diff --git a/melodic/rosboost-cfg/default.nix b/distros/melodic/rosboost-cfg/default.nix
similarity index 100%
rename from melodic/rosboost-cfg/default.nix
rename to distros/melodic/rosboost-cfg/default.nix
diff --git a/melodic/rosbridge-msgs/default.nix b/distros/melodic/rosbridge-msgs/default.nix
similarity index 100%
rename from melodic/rosbridge-msgs/default.nix
rename to distros/melodic/rosbridge-msgs/default.nix
diff --git a/melodic/rosbridge-server/default.nix b/distros/melodic/rosbridge-server/default.nix
similarity index 100%
rename from melodic/rosbridge-server/default.nix
rename to distros/melodic/rosbridge-server/default.nix
diff --git a/melodic/rosbridge-suite/default.nix b/distros/melodic/rosbridge-suite/default.nix
similarity index 100%
rename from melodic/rosbridge-suite/default.nix
rename to distros/melodic/rosbridge-suite/default.nix
diff --git a/melodic/rosbuild/default.nix b/distros/melodic/rosbuild/default.nix
similarity index 100%
rename from melodic/rosbuild/default.nix
rename to distros/melodic/rosbuild/default.nix
diff --git a/melodic/rosclean/default.nix b/distros/melodic/rosclean/default.nix
similarity index 100%
rename from melodic/rosclean/default.nix
rename to distros/melodic/rosclean/default.nix
diff --git a/melodic/roscompile/default.nix b/distros/melodic/roscompile/default.nix
similarity index 100%
rename from melodic/roscompile/default.nix
rename to distros/melodic/roscompile/default.nix
diff --git a/melodic/rosconsole-bridge/default.nix b/distros/melodic/rosconsole-bridge/default.nix
similarity index 100%
rename from melodic/rosconsole-bridge/default.nix
rename to distros/melodic/rosconsole-bridge/default.nix
diff --git a/melodic/rosconsole/default.nix b/distros/melodic/rosconsole/default.nix
similarity index 100%
rename from melodic/rosconsole/default.nix
rename to distros/melodic/rosconsole/default.nix
diff --git a/melodic/roscpp-core/default.nix b/distros/melodic/roscpp-core/default.nix
similarity index 100%
rename from melodic/roscpp-core/default.nix
rename to distros/melodic/roscpp-core/default.nix
diff --git a/melodic/roscpp-serialization/default.nix b/distros/melodic/roscpp-serialization/default.nix
similarity index 100%
rename from melodic/roscpp-serialization/default.nix
rename to distros/melodic/roscpp-serialization/default.nix
diff --git a/melodic/roscpp-traits/default.nix b/distros/melodic/roscpp-traits/default.nix
similarity index 100%
rename from melodic/roscpp-traits/default.nix
rename to distros/melodic/roscpp-traits/default.nix
diff --git a/melodic/roscpp-tutorials/default.nix b/distros/melodic/roscpp-tutorials/default.nix
similarity index 100%
rename from melodic/roscpp-tutorials/default.nix
rename to distros/melodic/roscpp-tutorials/default.nix
diff --git a/melodic/roscpp/default.nix b/distros/melodic/roscpp/default.nix
similarity index 100%
rename from melodic/roscpp/default.nix
rename to distros/melodic/roscpp/default.nix
diff --git a/melodic/roscreate/default.nix b/distros/melodic/roscreate/default.nix
similarity index 100%
rename from melodic/roscreate/default.nix
rename to distros/melodic/roscreate/default.nix
diff --git a/melodic/rosdiagnostic/default.nix b/distros/melodic/rosdiagnostic/default.nix
similarity index 100%
rename from melodic/rosdiagnostic/default.nix
rename to distros/melodic/rosdiagnostic/default.nix
diff --git a/melodic/rosemacs/default.nix b/distros/melodic/rosemacs/default.nix
similarity index 100%
rename from melodic/rosemacs/default.nix
rename to distros/melodic/rosemacs/default.nix
diff --git a/melodic/roseus-mongo/default.nix b/distros/melodic/roseus-mongo/default.nix
similarity index 100%
rename from melodic/roseus-mongo/default.nix
rename to distros/melodic/roseus-mongo/default.nix
diff --git a/melodic/roseus-smach/default.nix b/distros/melodic/roseus-smach/default.nix
similarity index 100%
rename from melodic/roseus-smach/default.nix
rename to distros/melodic/roseus-smach/default.nix
diff --git a/melodic/roseus-tutorials/default.nix b/distros/melodic/roseus-tutorials/default.nix
similarity index 100%
rename from melodic/roseus-tutorials/default.nix
rename to distros/melodic/roseus-tutorials/default.nix
diff --git a/melodic/roseus/default.nix b/distros/melodic/roseus/default.nix
similarity index 100%
rename from melodic/roseus/default.nix
rename to distros/melodic/roseus/default.nix
diff --git a/melodic/rosfmt/default.nix b/distros/melodic/rosfmt/default.nix
similarity index 100%
rename from melodic/rosfmt/default.nix
rename to distros/melodic/rosfmt/default.nix
diff --git a/melodic/rosgraph-msgs/default.nix b/distros/melodic/rosgraph-msgs/default.nix
similarity index 100%
rename from melodic/rosgraph-msgs/default.nix
rename to distros/melodic/rosgraph-msgs/default.nix
diff --git a/melodic/rosgraph/default.nix b/distros/melodic/rosgraph/default.nix
similarity index 100%
rename from melodic/rosgraph/default.nix
rename to distros/melodic/rosgraph/default.nix
diff --git a/melodic/roslang/default.nix b/distros/melodic/roslang/default.nix
similarity index 100%
rename from melodic/roslang/default.nix
rename to distros/melodic/roslang/default.nix
diff --git a/melodic/roslaunch/default.nix b/distros/melodic/roslaunch/default.nix
similarity index 100%
rename from melodic/roslaunch/default.nix
rename to distros/melodic/roslaunch/default.nix
diff --git a/melodic/roslib/default.nix b/distros/melodic/roslib/default.nix
similarity index 100%
rename from melodic/roslib/default.nix
rename to distros/melodic/roslib/default.nix
diff --git a/melodic/roslint/default.nix b/distros/melodic/roslint/default.nix
similarity index 100%
rename from melodic/roslint/default.nix
rename to distros/melodic/roslint/default.nix
diff --git a/melodic/roslisp-common/default.nix b/distros/melodic/roslisp-common/default.nix
similarity index 100%
rename from melodic/roslisp-common/default.nix
rename to distros/melodic/roslisp-common/default.nix
diff --git a/melodic/roslisp-repl/default.nix b/distros/melodic/roslisp-repl/default.nix
similarity index 100%
rename from melodic/roslisp-repl/default.nix
rename to distros/melodic/roslisp-repl/default.nix
diff --git a/melodic/roslisp-utilities/default.nix b/distros/melodic/roslisp-utilities/default.nix
similarity index 100%
rename from melodic/roslisp-utilities/default.nix
rename to distros/melodic/roslisp-utilities/default.nix
diff --git a/melodic/roslisp/default.nix b/distros/melodic/roslisp/default.nix
similarity index 100%
rename from melodic/roslisp/default.nix
rename to distros/melodic/roslisp/default.nix
diff --git a/melodic/roslz4/default.nix b/distros/melodic/roslz4/default.nix
similarity index 100%
rename from melodic/roslz4/default.nix
rename to distros/melodic/roslz4/default.nix
diff --git a/melodic/rosmake/default.nix b/distros/melodic/rosmake/default.nix
similarity index 100%
rename from melodic/rosmake/default.nix
rename to distros/melodic/rosmake/default.nix
diff --git a/melodic/rosmaster/default.nix b/distros/melodic/rosmaster/default.nix
similarity index 100%
rename from melodic/rosmaster/default.nix
rename to distros/melodic/rosmaster/default.nix
diff --git a/melodic/rosmon-core/default.nix b/distros/melodic/rosmon-core/default.nix
similarity index 100%
rename from melodic/rosmon-core/default.nix
rename to distros/melodic/rosmon-core/default.nix
diff --git a/melodic/rosmon-msgs/default.nix b/distros/melodic/rosmon-msgs/default.nix
similarity index 100%
rename from melodic/rosmon-msgs/default.nix
rename to distros/melodic/rosmon-msgs/default.nix
diff --git a/melodic/rosmon/default.nix b/distros/melodic/rosmon/default.nix
similarity index 100%
rename from melodic/rosmon/default.nix
rename to distros/melodic/rosmon/default.nix
diff --git a/melodic/rosmsg/default.nix b/distros/melodic/rosmsg/default.nix
similarity index 100%
rename from melodic/rosmsg/default.nix
rename to distros/melodic/rosmsg/default.nix
diff --git a/melodic/rosnode/default.nix b/distros/melodic/rosnode/default.nix
similarity index 100%
rename from melodic/rosnode/default.nix
rename to distros/melodic/rosnode/default.nix
diff --git a/melodic/rosout/default.nix b/distros/melodic/rosout/default.nix
similarity index 100%
rename from melodic/rosout/default.nix
rename to distros/melodic/rosout/default.nix
diff --git a/melodic/rospack/default.nix b/distros/melodic/rospack/default.nix
similarity index 100%
rename from melodic/rospack/default.nix
rename to distros/melodic/rospack/default.nix
diff --git a/melodic/rosparam-handler/default.nix b/distros/melodic/rosparam-handler/default.nix
similarity index 100%
rename from melodic/rosparam-handler/default.nix
rename to distros/melodic/rosparam-handler/default.nix
diff --git a/melodic/rosparam-shortcuts/default.nix b/distros/melodic/rosparam-shortcuts/default.nix
similarity index 100%
rename from melodic/rosparam-shortcuts/default.nix
rename to distros/melodic/rosparam-shortcuts/default.nix
diff --git a/melodic/rosparam/default.nix b/distros/melodic/rosparam/default.nix
similarity index 100%
rename from melodic/rosparam/default.nix
rename to distros/melodic/rosparam/default.nix
diff --git a/melodic/rospatlite/default.nix b/distros/melodic/rospatlite/default.nix
similarity index 100%
rename from melodic/rospatlite/default.nix
rename to distros/melodic/rospatlite/default.nix
diff --git a/melodic/rosping/default.nix b/distros/melodic/rosping/default.nix
similarity index 100%
rename from melodic/rosping/default.nix
rename to distros/melodic/rosping/default.nix
diff --git a/melodic/rospy-message-converter/default.nix b/distros/melodic/rospy-message-converter/default.nix
similarity index 100%
rename from melodic/rospy-message-converter/default.nix
rename to distros/melodic/rospy-message-converter/default.nix
diff --git a/melodic/rospy-tutorials/default.nix b/distros/melodic/rospy-tutorials/default.nix
similarity index 100%
rename from melodic/rospy-tutorials/default.nix
rename to distros/melodic/rospy-tutorials/default.nix
diff --git a/melodic/rospy/default.nix b/distros/melodic/rospy/default.nix
similarity index 100%
rename from melodic/rospy/default.nix
rename to distros/melodic/rospy/default.nix
diff --git a/melodic/rosrt/default.nix b/distros/melodic/rosrt/default.nix
similarity index 100%
rename from melodic/rosrt/default.nix
rename to distros/melodic/rosrt/default.nix
diff --git a/melodic/rosserial-arduino/default.nix b/distros/melodic/rosserial-arduino/default.nix
similarity index 100%
rename from melodic/rosserial-arduino/default.nix
rename to distros/melodic/rosserial-arduino/default.nix
diff --git a/melodic/rosserial-client/default.nix b/distros/melodic/rosserial-client/default.nix
similarity index 100%
rename from melodic/rosserial-client/default.nix
rename to distros/melodic/rosserial-client/default.nix
diff --git a/melodic/rosserial-embeddedlinux/default.nix b/distros/melodic/rosserial-embeddedlinux/default.nix
similarity index 100%
rename from melodic/rosserial-embeddedlinux/default.nix
rename to distros/melodic/rosserial-embeddedlinux/default.nix
diff --git a/melodic/rosserial-mbed/default.nix b/distros/melodic/rosserial-mbed/default.nix
similarity index 100%
rename from melodic/rosserial-mbed/default.nix
rename to distros/melodic/rosserial-mbed/default.nix
diff --git a/melodic/rosserial-msgs/default.nix b/distros/melodic/rosserial-msgs/default.nix
similarity index 100%
rename from melodic/rosserial-msgs/default.nix
rename to distros/melodic/rosserial-msgs/default.nix
diff --git a/melodic/rosserial-python/default.nix b/distros/melodic/rosserial-python/default.nix
similarity index 100%
rename from melodic/rosserial-python/default.nix
rename to distros/melodic/rosserial-python/default.nix
diff --git a/melodic/rosserial-server/default.nix b/distros/melodic/rosserial-server/default.nix
similarity index 100%
rename from melodic/rosserial-server/default.nix
rename to distros/melodic/rosserial-server/default.nix
diff --git a/melodic/rosserial-tivac/default.nix b/distros/melodic/rosserial-tivac/default.nix
similarity index 100%
rename from melodic/rosserial-tivac/default.nix
rename to distros/melodic/rosserial-tivac/default.nix
diff --git a/melodic/rosserial-vex-cortex/default.nix b/distros/melodic/rosserial-vex-cortex/default.nix
similarity index 100%
rename from melodic/rosserial-vex-cortex/default.nix
rename to distros/melodic/rosserial-vex-cortex/default.nix
diff --git a/melodic/rosserial-vex-v5/default.nix b/distros/melodic/rosserial-vex-v5/default.nix
similarity index 100%
rename from melodic/rosserial-vex-v5/default.nix
rename to distros/melodic/rosserial-vex-v5/default.nix
diff --git a/melodic/rosserial-windows/default.nix b/distros/melodic/rosserial-windows/default.nix
similarity index 100%
rename from melodic/rosserial-windows/default.nix
rename to distros/melodic/rosserial-windows/default.nix
diff --git a/melodic/rosserial-xbee/default.nix b/distros/melodic/rosserial-xbee/default.nix
similarity index 100%
rename from melodic/rosserial-xbee/default.nix
rename to distros/melodic/rosserial-xbee/default.nix
diff --git a/melodic/rosserial/default.nix b/distros/melodic/rosserial/default.nix
similarity index 100%
rename from melodic/rosserial/default.nix
rename to distros/melodic/rosserial/default.nix
diff --git a/melodic/rosservice/default.nix b/distros/melodic/rosservice/default.nix
similarity index 100%
rename from melodic/rosservice/default.nix
rename to distros/melodic/rosservice/default.nix
diff --git a/melodic/rostate-machine/default.nix b/distros/melodic/rostate-machine/default.nix
similarity index 100%
rename from melodic/rostate-machine/default.nix
rename to distros/melodic/rostate-machine/default.nix
diff --git a/melodic/rostest/default.nix b/distros/melodic/rostest/default.nix
similarity index 100%
rename from melodic/rostest/default.nix
rename to distros/melodic/rostest/default.nix
diff --git a/melodic/rosthrottle/default.nix b/distros/melodic/rosthrottle/default.nix
similarity index 100%
rename from melodic/rosthrottle/default.nix
rename to distros/melodic/rosthrottle/default.nix
diff --git a/melodic/rostime/default.nix b/distros/melodic/rostime/default.nix
similarity index 100%
rename from melodic/rostime/default.nix
rename to distros/melodic/rostime/default.nix
diff --git a/melodic/rostopic/default.nix b/distros/melodic/rostopic/default.nix
similarity index 100%
rename from melodic/rostopic/default.nix
rename to distros/melodic/rostopic/default.nix
diff --git a/melodic/rosunit/default.nix b/distros/melodic/rosunit/default.nix
similarity index 100%
rename from melodic/rosunit/default.nix
rename to distros/melodic/rosunit/default.nix
diff --git a/melodic/roswtf/default.nix b/distros/melodic/roswtf/default.nix
similarity index 100%
rename from melodic/roswtf/default.nix
rename to distros/melodic/roswtf/default.nix
diff --git a/melodic/roswww/default.nix b/distros/melodic/roswww/default.nix
similarity index 100%
rename from melodic/roswww/default.nix
rename to distros/melodic/roswww/default.nix
diff --git a/melodic/rotate-recovery/default.nix b/distros/melodic/rotate-recovery/default.nix
similarity index 100%
rename from melodic/rotate-recovery/default.nix
rename to distros/melodic/rotate-recovery/default.nix
diff --git a/melodic/rotors-comm/default.nix b/distros/melodic/rotors-comm/default.nix
similarity index 100%
rename from melodic/rotors-comm/default.nix
rename to distros/melodic/rotors-comm/default.nix
diff --git a/melodic/rotors-control/default.nix b/distros/melodic/rotors-control/default.nix
similarity index 100%
rename from melodic/rotors-control/default.nix
rename to distros/melodic/rotors-control/default.nix
diff --git a/melodic/rotors-description/default.nix b/distros/melodic/rotors-description/default.nix
similarity index 100%
rename from melodic/rotors-description/default.nix
rename to distros/melodic/rotors-description/default.nix
diff --git a/melodic/rotors-evaluation/default.nix b/distros/melodic/rotors-evaluation/default.nix
similarity index 100%
rename from melodic/rotors-evaluation/default.nix
rename to distros/melodic/rotors-evaluation/default.nix
diff --git a/melodic/rotors-gazebo-plugins/default.nix b/distros/melodic/rotors-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/rotors-gazebo-plugins/default.nix
rename to distros/melodic/rotors-gazebo-plugins/default.nix
diff --git a/melodic/rotors-gazebo/default.nix b/distros/melodic/rotors-gazebo/default.nix
similarity index 100%
rename from melodic/rotors-gazebo/default.nix
rename to distros/melodic/rotors-gazebo/default.nix
diff --git a/melodic/rotors-hil-interface/default.nix b/distros/melodic/rotors-hil-interface/default.nix
similarity index 100%
rename from melodic/rotors-hil-interface/default.nix
rename to distros/melodic/rotors-hil-interface/default.nix
diff --git a/melodic/rotors-joy-interface/default.nix b/distros/melodic/rotors-joy-interface/default.nix
similarity index 100%
rename from melodic/rotors-joy-interface/default.nix
rename to distros/melodic/rotors-joy-interface/default.nix
diff --git a/melodic/rotors-simulator/default.nix b/distros/melodic/rotors-simulator/default.nix
similarity index 100%
rename from melodic/rotors-simulator/default.nix
rename to distros/melodic/rotors-simulator/default.nix
diff --git a/melodic/route-network/default.nix b/distros/melodic/route-network/default.nix
similarity index 100%
rename from melodic/route-network/default.nix
rename to distros/melodic/route-network/default.nix
diff --git a/melodic/rplidar-ros/default.nix b/distros/melodic/rplidar-ros/default.nix
similarity index 100%
rename from melodic/rplidar-ros/default.nix
rename to distros/melodic/rplidar-ros/default.nix
diff --git a/melodic/rqt-action/default.nix b/distros/melodic/rqt-action/default.nix
similarity index 100%
rename from melodic/rqt-action/default.nix
rename to distros/melodic/rqt-action/default.nix
diff --git a/melodic/rqt-bag-plugins/default.nix b/distros/melodic/rqt-bag-plugins/default.nix
similarity index 100%
rename from melodic/rqt-bag-plugins/default.nix
rename to distros/melodic/rqt-bag-plugins/default.nix
diff --git a/melodic/rqt-bag/default.nix b/distros/melodic/rqt-bag/default.nix
similarity index 100%
rename from melodic/rqt-bag/default.nix
rename to distros/melodic/rqt-bag/default.nix
diff --git a/melodic/rqt-common-plugins/default.nix b/distros/melodic/rqt-common-plugins/default.nix
similarity index 100%
rename from melodic/rqt-common-plugins/default.nix
rename to distros/melodic/rqt-common-plugins/default.nix
diff --git a/melodic/rqt-console/default.nix b/distros/melodic/rqt-console/default.nix
similarity index 100%
rename from melodic/rqt-console/default.nix
rename to distros/melodic/rqt-console/default.nix
diff --git a/melodic/rqt-controller-manager/default.nix b/distros/melodic/rqt-controller-manager/default.nix
similarity index 100%
rename from melodic/rqt-controller-manager/default.nix
rename to distros/melodic/rqt-controller-manager/default.nix
diff --git a/melodic/rqt-dep/default.nix b/distros/melodic/rqt-dep/default.nix
similarity index 100%
rename from melodic/rqt-dep/default.nix
rename to distros/melodic/rqt-dep/default.nix
diff --git a/melodic/rqt-ez-publisher/default.nix b/distros/melodic/rqt-ez-publisher/default.nix
similarity index 100%
rename from melodic/rqt-ez-publisher/default.nix
rename to distros/melodic/rqt-ez-publisher/default.nix
diff --git a/melodic/rqt-graph/default.nix b/distros/melodic/rqt-graph/default.nix
similarity index 100%
rename from melodic/rqt-graph/default.nix
rename to distros/melodic/rqt-graph/default.nix
diff --git a/melodic/rqt-gui-cpp/default.nix b/distros/melodic/rqt-gui-cpp/default.nix
similarity index 100%
rename from melodic/rqt-gui-cpp/default.nix
rename to distros/melodic/rqt-gui-cpp/default.nix
diff --git a/melodic/rqt-gui-py/default.nix b/distros/melodic/rqt-gui-py/default.nix
similarity index 100%
rename from melodic/rqt-gui-py/default.nix
rename to distros/melodic/rqt-gui-py/default.nix
diff --git a/melodic/rqt-gui/default.nix b/distros/melodic/rqt-gui/default.nix
similarity index 100%
rename from melodic/rqt-gui/default.nix
rename to distros/melodic/rqt-gui/default.nix
diff --git a/melodic/rqt-image-view/default.nix b/distros/melodic/rqt-image-view/default.nix
similarity index 100%
rename from melodic/rqt-image-view/default.nix
rename to distros/melodic/rqt-image-view/default.nix
diff --git a/melodic/rqt-joint-trajectory-controller/default.nix b/distros/melodic/rqt-joint-trajectory-controller/default.nix
similarity index 100%
rename from melodic/rqt-joint-trajectory-controller/default.nix
rename to distros/melodic/rqt-joint-trajectory-controller/default.nix
diff --git a/melodic/rqt-launch/default.nix b/distros/melodic/rqt-launch/default.nix
similarity index 100%
rename from melodic/rqt-launch/default.nix
rename to distros/melodic/rqt-launch/default.nix
diff --git a/melodic/rqt-launchtree/default.nix b/distros/melodic/rqt-launchtree/default.nix
similarity index 100%
rename from melodic/rqt-launchtree/default.nix
rename to distros/melodic/rqt-launchtree/default.nix
diff --git a/melodic/rqt-logger-level/default.nix b/distros/melodic/rqt-logger-level/default.nix
similarity index 100%
rename from melodic/rqt-logger-level/default.nix
rename to distros/melodic/rqt-logger-level/default.nix
diff --git a/melodic/rqt-moveit/default.nix b/distros/melodic/rqt-moveit/default.nix
similarity index 100%
rename from melodic/rqt-moveit/default.nix
rename to distros/melodic/rqt-moveit/default.nix
diff --git a/melodic/rqt-msg/default.nix b/distros/melodic/rqt-msg/default.nix
similarity index 100%
rename from melodic/rqt-msg/default.nix
rename to distros/melodic/rqt-msg/default.nix
diff --git a/melodic/rqt-multiplot/default.nix b/distros/melodic/rqt-multiplot/default.nix
similarity index 100%
rename from melodic/rqt-multiplot/default.nix
rename to distros/melodic/rqt-multiplot/default.nix
diff --git a/melodic/rqt-nav-view/default.nix b/distros/melodic/rqt-nav-view/default.nix
similarity index 100%
rename from melodic/rqt-nav-view/default.nix
rename to distros/melodic/rqt-nav-view/default.nix
diff --git a/melodic/rqt-plot/default.nix b/distros/melodic/rqt-plot/default.nix
similarity index 100%
rename from melodic/rqt-plot/default.nix
rename to distros/melodic/rqt-plot/default.nix
diff --git a/melodic/rqt-pose-view/default.nix b/distros/melodic/rqt-pose-view/default.nix
similarity index 100%
rename from melodic/rqt-pose-view/default.nix
rename to distros/melodic/rqt-pose-view/default.nix
diff --git a/melodic/rqt-publisher/default.nix b/distros/melodic/rqt-publisher/default.nix
similarity index 100%
rename from melodic/rqt-publisher/default.nix
rename to distros/melodic/rqt-publisher/default.nix
diff --git a/melodic/rqt-py-common/default.nix b/distros/melodic/rqt-py-common/default.nix
similarity index 100%
rename from melodic/rqt-py-common/default.nix
rename to distros/melodic/rqt-py-common/default.nix
diff --git a/melodic/rqt-py-console/default.nix b/distros/melodic/rqt-py-console/default.nix
similarity index 100%
rename from melodic/rqt-py-console/default.nix
rename to distros/melodic/rqt-py-console/default.nix
diff --git a/melodic/rqt-py-trees/default.nix b/distros/melodic/rqt-py-trees/default.nix
similarity index 100%
rename from melodic/rqt-py-trees/default.nix
rename to distros/melodic/rqt-py-trees/default.nix
diff --git a/melodic/rqt-reconfigure/default.nix b/distros/melodic/rqt-reconfigure/default.nix
similarity index 100%
rename from melodic/rqt-reconfigure/default.nix
rename to distros/melodic/rqt-reconfigure/default.nix
diff --git a/melodic/rqt-robot-dashboard/default.nix b/distros/melodic/rqt-robot-dashboard/default.nix
similarity index 100%
rename from melodic/rqt-robot-dashboard/default.nix
rename to distros/melodic/rqt-robot-dashboard/default.nix
diff --git a/melodic/rqt-robot-monitor/default.nix b/distros/melodic/rqt-robot-monitor/default.nix
similarity index 100%
rename from melodic/rqt-robot-monitor/default.nix
rename to distros/melodic/rqt-robot-monitor/default.nix
diff --git a/melodic/rqt-robot-plugins/default.nix b/distros/melodic/rqt-robot-plugins/default.nix
similarity index 100%
rename from melodic/rqt-robot-plugins/default.nix
rename to distros/melodic/rqt-robot-plugins/default.nix
diff --git a/melodic/rqt-robot-steering/default.nix b/distros/melodic/rqt-robot-steering/default.nix
similarity index 100%
rename from melodic/rqt-robot-steering/default.nix
rename to distros/melodic/rqt-robot-steering/default.nix
diff --git a/melodic/rqt-rosmon/default.nix b/distros/melodic/rqt-rosmon/default.nix
similarity index 100%
rename from melodic/rqt-rosmon/default.nix
rename to distros/melodic/rqt-rosmon/default.nix
diff --git a/melodic/rqt-rotors/default.nix b/distros/melodic/rqt-rotors/default.nix
similarity index 100%
rename from melodic/rqt-rotors/default.nix
rename to distros/melodic/rqt-rotors/default.nix
diff --git a/melodic/rqt-runtime-monitor/default.nix b/distros/melodic/rqt-runtime-monitor/default.nix
similarity index 100%
rename from melodic/rqt-runtime-monitor/default.nix
rename to distros/melodic/rqt-runtime-monitor/default.nix
diff --git a/melodic/rqt-rviz/default.nix b/distros/melodic/rqt-rviz/default.nix
similarity index 100%
rename from melodic/rqt-rviz/default.nix
rename to distros/melodic/rqt-rviz/default.nix
diff --git a/melodic/rqt-service-caller/default.nix b/distros/melodic/rqt-service-caller/default.nix
similarity index 100%
rename from melodic/rqt-service-caller/default.nix
rename to distros/melodic/rqt-service-caller/default.nix
diff --git a/melodic/rqt-shell/default.nix b/distros/melodic/rqt-shell/default.nix
similarity index 100%
rename from melodic/rqt-shell/default.nix
rename to distros/melodic/rqt-shell/default.nix
diff --git a/melodic/rqt-srv/default.nix b/distros/melodic/rqt-srv/default.nix
similarity index 100%
rename from melodic/rqt-srv/default.nix
rename to distros/melodic/rqt-srv/default.nix
diff --git a/melodic/rqt-tf-tree/default.nix b/distros/melodic/rqt-tf-tree/default.nix
similarity index 100%
rename from melodic/rqt-tf-tree/default.nix
rename to distros/melodic/rqt-tf-tree/default.nix
diff --git a/melodic/rqt-top/default.nix b/distros/melodic/rqt-top/default.nix
similarity index 100%
rename from melodic/rqt-top/default.nix
rename to distros/melodic/rqt-top/default.nix
diff --git a/melodic/rqt-topic/default.nix b/distros/melodic/rqt-topic/default.nix
similarity index 100%
rename from melodic/rqt-topic/default.nix
rename to distros/melodic/rqt-topic/default.nix
diff --git a/melodic/rqt-web/default.nix b/distros/melodic/rqt-web/default.nix
similarity index 100%
rename from melodic/rqt-web/default.nix
rename to distros/melodic/rqt-web/default.nix
diff --git a/melodic/rqt/default.nix b/distros/melodic/rqt/default.nix
similarity index 100%
rename from melodic/rqt/default.nix
rename to distros/melodic/rqt/default.nix
diff --git a/melodic/rslidar-driver/default.nix b/distros/melodic/rslidar-driver/default.nix
similarity index 100%
rename from melodic/rslidar-driver/default.nix
rename to distros/melodic/rslidar-driver/default.nix
diff --git a/melodic/rslidar-msgs/default.nix b/distros/melodic/rslidar-msgs/default.nix
similarity index 100%
rename from melodic/rslidar-msgs/default.nix
rename to distros/melodic/rslidar-msgs/default.nix
diff --git a/melodic/rslidar-pointcloud/default.nix b/distros/melodic/rslidar-pointcloud/default.nix
similarity index 100%
rename from melodic/rslidar-pointcloud/default.nix
rename to distros/melodic/rslidar-pointcloud/default.nix
diff --git a/melodic/rslidar/default.nix b/distros/melodic/rslidar/default.nix
similarity index 100%
rename from melodic/rslidar/default.nix
rename to distros/melodic/rslidar/default.nix
diff --git a/melodic/rtabmap-ros/default.nix b/distros/melodic/rtabmap-ros/default.nix
similarity index 100%
rename from melodic/rtabmap-ros/default.nix
rename to distros/melodic/rtabmap-ros/default.nix
diff --git a/melodic/rviz-imu-plugin/default.nix b/distros/melodic/rviz-imu-plugin/default.nix
similarity index 100%
rename from melodic/rviz-imu-plugin/default.nix
rename to distros/melodic/rviz-imu-plugin/default.nix
diff --git a/melodic/rviz-plugin-tutorials/default.nix b/distros/melodic/rviz-plugin-tutorials/default.nix
similarity index 100%
rename from melodic/rviz-plugin-tutorials/default.nix
rename to distros/melodic/rviz-plugin-tutorials/default.nix
diff --git a/melodic/rviz-python-tutorial/default.nix b/distros/melodic/rviz-python-tutorial/default.nix
similarity index 100%
rename from melodic/rviz-python-tutorial/default.nix
rename to distros/melodic/rviz-python-tutorial/default.nix
diff --git a/melodic/rviz-visual-tools/default.nix b/distros/melodic/rviz-visual-tools/default.nix
similarity index 100%
rename from melodic/rviz-visual-tools/default.nix
rename to distros/melodic/rviz-visual-tools/default.nix
diff --git a/melodic/rviz/default.nix b/distros/melodic/rviz/default.nix
similarity index 100%
rename from melodic/rviz/default.nix
rename to distros/melodic/rviz/default.nix
diff --git a/melodic/rxcpp-vendor/default.nix b/distros/melodic/rxcpp-vendor/default.nix
similarity index 100%
rename from melodic/rxcpp-vendor/default.nix
rename to distros/melodic/rxcpp-vendor/default.nix
diff --git a/melodic/rxros-tf/default.nix b/distros/melodic/rxros-tf/default.nix
similarity index 100%
rename from melodic/rxros-tf/default.nix
rename to distros/melodic/rxros-tf/default.nix
diff --git a/melodic/rxros/default.nix b/distros/melodic/rxros/default.nix
similarity index 100%
rename from melodic/rxros/default.nix
rename to distros/melodic/rxros/default.nix
diff --git a/melodic/safe-teleop-base/default.nix b/distros/melodic/safe-teleop-base/default.nix
similarity index 100%
rename from melodic/safe-teleop-base/default.nix
rename to distros/melodic/safe-teleop-base/default.nix
diff --git a/melodic/safe-teleop-pr2/default.nix b/distros/melodic/safe-teleop-pr2/default.nix
similarity index 100%
rename from melodic/safe-teleop-pr2/default.nix
rename to distros/melodic/safe-teleop-pr2/default.nix
diff --git a/melodic/safe-teleop-stage/default.nix b/distros/melodic/safe-teleop-stage/default.nix
similarity index 100%
rename from melodic/safe-teleop-stage/default.nix
rename to distros/melodic/safe-teleop-stage/default.nix
diff --git a/melodic/safety-limiter-msgs/default.nix b/distros/melodic/safety-limiter-msgs/default.nix
similarity index 100%
rename from melodic/safety-limiter-msgs/default.nix
rename to distros/melodic/safety-limiter-msgs/default.nix
diff --git a/melodic/safety-limiter/default.nix b/distros/melodic/safety-limiter/default.nix
similarity index 100%
rename from melodic/safety-limiter/default.nix
rename to distros/melodic/safety-limiter/default.nix
diff --git a/melodic/sainsmart-relay-usb/default.nix b/distros/melodic/sainsmart-relay-usb/default.nix
similarity index 100%
rename from melodic/sainsmart-relay-usb/default.nix
rename to distros/melodic/sainsmart-relay-usb/default.nix
diff --git a/melodic/sand-island/default.nix b/distros/melodic/sand-island/default.nix
similarity index 100%
rename from melodic/sand-island/default.nix
rename to distros/melodic/sand-island/default.nix
diff --git a/melodic/sbg-driver/default.nix b/distros/melodic/sbg-driver/default.nix
similarity index 100%
rename from melodic/sbg-driver/default.nix
rename to distros/melodic/sbg-driver/default.nix
diff --git a/melodic/sbpl-lattice-planner/default.nix b/distros/melodic/sbpl-lattice-planner/default.nix
similarity index 100%
rename from melodic/sbpl-lattice-planner/default.nix
rename to distros/melodic/sbpl-lattice-planner/default.nix
diff --git a/melodic/sbpl-recovery/default.nix b/distros/melodic/sbpl-recovery/default.nix
similarity index 100%
rename from melodic/sbpl-recovery/default.nix
rename to distros/melodic/sbpl-recovery/default.nix
diff --git a/melodic/sbpl/default.nix b/distros/melodic/sbpl/default.nix
similarity index 100%
rename from melodic/sbpl/default.nix
rename to distros/melodic/sbpl/default.nix
diff --git a/melodic/scheduler-msgs/default.nix b/distros/melodic/scheduler-msgs/default.nix
similarity index 100%
rename from melodic/scheduler-msgs/default.nix
rename to distros/melodic/scheduler-msgs/default.nix
diff --git a/melodic/schunk-description/default.nix b/distros/melodic/schunk-description/default.nix
similarity index 100%
rename from melodic/schunk-description/default.nix
rename to distros/melodic/schunk-description/default.nix
diff --git a/melodic/schunk-libm5api/default.nix b/distros/melodic/schunk-libm5api/default.nix
similarity index 100%
rename from melodic/schunk-libm5api/default.nix
rename to distros/melodic/schunk-libm5api/default.nix
diff --git a/melodic/schunk-modular-robotics/default.nix b/distros/melodic/schunk-modular-robotics/default.nix
similarity index 100%
rename from melodic/schunk-modular-robotics/default.nix
rename to distros/melodic/schunk-modular-robotics/default.nix
diff --git a/melodic/schunk-powercube-chain/default.nix b/distros/melodic/schunk-powercube-chain/default.nix
similarity index 100%
rename from melodic/schunk-powercube-chain/default.nix
rename to distros/melodic/schunk-powercube-chain/default.nix
diff --git a/melodic/schunk-sdh/default.nix b/distros/melodic/schunk-sdh/default.nix
similarity index 100%
rename from melodic/schunk-sdh/default.nix
rename to distros/melodic/schunk-sdh/default.nix
diff --git a/melodic/schunk-simulated-tactile-sensors/default.nix b/distros/melodic/schunk-simulated-tactile-sensors/default.nix
similarity index 100%
rename from melodic/schunk-simulated-tactile-sensors/default.nix
rename to distros/melodic/schunk-simulated-tactile-sensors/default.nix
diff --git a/melodic/sdhlibrary-cpp/default.nix b/distros/melodic/sdhlibrary-cpp/default.nix
similarity index 100%
rename from melodic/sdhlibrary-cpp/default.nix
rename to distros/melodic/sdhlibrary-cpp/default.nix
diff --git a/melodic/seed-r7-bringup/default.nix b/distros/melodic/seed-r7-bringup/default.nix
similarity index 100%
rename from melodic/seed-r7-bringup/default.nix
rename to distros/melodic/seed-r7-bringup/default.nix
diff --git a/melodic/seed-r7-description/default.nix b/distros/melodic/seed-r7-description/default.nix
similarity index 100%
rename from melodic/seed-r7-description/default.nix
rename to distros/melodic/seed-r7-description/default.nix
diff --git a/melodic/seed-r7-moveit-config/default.nix b/distros/melodic/seed-r7-moveit-config/default.nix
similarity index 100%
rename from melodic/seed-r7-moveit-config/default.nix
rename to distros/melodic/seed-r7-moveit-config/default.nix
diff --git a/melodic/seed-r7-navigation/default.nix b/distros/melodic/seed-r7-navigation/default.nix
similarity index 100%
rename from melodic/seed-r7-navigation/default.nix
rename to distros/melodic/seed-r7-navigation/default.nix
diff --git a/melodic/seed-r7-robot-interface/default.nix b/distros/melodic/seed-r7-robot-interface/default.nix
similarity index 100%
rename from melodic/seed-r7-robot-interface/default.nix
rename to distros/melodic/seed-r7-robot-interface/default.nix
diff --git a/melodic/seed-r7-ros-controller/default.nix b/distros/melodic/seed-r7-ros-controller/default.nix
similarity index 100%
rename from melodic/seed-r7-ros-controller/default.nix
rename to distros/melodic/seed-r7-ros-controller/default.nix
diff --git a/melodic/seed-r7-ros-pkg/default.nix b/distros/melodic/seed-r7-ros-pkg/default.nix
similarity index 100%
rename from melodic/seed-r7-ros-pkg/default.nix
rename to distros/melodic/seed-r7-ros-pkg/default.nix
diff --git a/melodic/seed-r7-samples/default.nix b/distros/melodic/seed-r7-samples/default.nix
similarity index 100%
rename from melodic/seed-r7-samples/default.nix
rename to distros/melodic/seed-r7-samples/default.nix
diff --git a/melodic/seed-r7-typef-moveit-config/default.nix b/distros/melodic/seed-r7-typef-moveit-config/default.nix
similarity index 100%
rename from melodic/seed-r7-typef-moveit-config/default.nix
rename to distros/melodic/seed-r7-typef-moveit-config/default.nix
diff --git a/melodic/seed-smartactuator-sdk/default.nix b/distros/melodic/seed-smartactuator-sdk/default.nix
similarity index 100%
rename from melodic/seed-smartactuator-sdk/default.nix
rename to distros/melodic/seed-smartactuator-sdk/default.nix
diff --git a/melodic/self-test/default.nix b/distros/melodic/self-test/default.nix
similarity index 100%
rename from melodic/self-test/default.nix
rename to distros/melodic/self-test/default.nix
diff --git a/melodic/semantic-point-annotator/default.nix b/distros/melodic/semantic-point-annotator/default.nix
similarity index 100%
rename from melodic/semantic-point-annotator/default.nix
rename to distros/melodic/semantic-point-annotator/default.nix
diff --git a/melodic/sensor-msgs/default.nix b/distros/melodic/sensor-msgs/default.nix
similarity index 100%
rename from melodic/sensor-msgs/default.nix
rename to distros/melodic/sensor-msgs/default.nix
diff --git a/melodic/serial/default.nix b/distros/melodic/serial/default.nix
similarity index 100%
rename from melodic/serial/default.nix
rename to distros/melodic/serial/default.nix
diff --git a/melodic/service-tools/default.nix b/distros/melodic/service-tools/default.nix
similarity index 100%
rename from melodic/service-tools/default.nix
rename to distros/melodic/service-tools/default.nix
diff --git a/melodic/settlerlib/default.nix b/distros/melodic/settlerlib/default.nix
similarity index 100%
rename from melodic/settlerlib/default.nix
rename to distros/melodic/settlerlib/default.nix
diff --git a/melodic/shape-msgs/default.nix b/distros/melodic/shape-msgs/default.nix
similarity index 100%
rename from melodic/shape-msgs/default.nix
rename to distros/melodic/shape-msgs/default.nix
diff --git a/melodic/sick-safetyscanners/default.nix b/distros/melodic/sick-safetyscanners/default.nix
similarity index 100%
rename from melodic/sick-safetyscanners/default.nix
rename to distros/melodic/sick-safetyscanners/default.nix
diff --git a/melodic/sick-scan/default.nix b/distros/melodic/sick-scan/default.nix
similarity index 100%
rename from melodic/sick-scan/default.nix
rename to distros/melodic/sick-scan/default.nix
diff --git a/melodic/sick-tim/default.nix b/distros/melodic/sick-tim/default.nix
similarity index 100%
rename from melodic/sick-tim/default.nix
rename to distros/melodic/sick-tim/default.nix
diff --git a/melodic/simple-grasping/default.nix b/distros/melodic/simple-grasping/default.nix
similarity index 100%
rename from melodic/simple-grasping/default.nix
rename to distros/melodic/simple-grasping/default.nix
diff --git a/melodic/simple-message/default.nix b/distros/melodic/simple-message/default.nix
similarity index 100%
rename from melodic/simple-message/default.nix
rename to distros/melodic/simple-message/default.nix
diff --git a/melodic/simple-navigation-goals-tutorial/default.nix b/distros/melodic/simple-navigation-goals-tutorial/default.nix
similarity index 100%
rename from melodic/simple-navigation-goals-tutorial/default.nix
rename to distros/melodic/simple-navigation-goals-tutorial/default.nix
diff --git a/melodic/simulators/default.nix b/distros/melodic/simulators/default.nix
similarity index 100%
rename from melodic/simulators/default.nix
rename to distros/melodic/simulators/default.nix
diff --git a/melodic/single-joint-position-action/default.nix b/distros/melodic/single-joint-position-action/default.nix
similarity index 100%
rename from melodic/single-joint-position-action/default.nix
rename to distros/melodic/single-joint-position-action/default.nix
diff --git a/melodic/slam-gmapping/default.nix b/distros/melodic/slam-gmapping/default.nix
similarity index 100%
rename from melodic/slam-gmapping/default.nix
rename to distros/melodic/slam-gmapping/default.nix
diff --git a/melodic/slam-karto/default.nix b/distros/melodic/slam-karto/default.nix
similarity index 100%
rename from melodic/slam-karto/default.nix
rename to distros/melodic/slam-karto/default.nix
diff --git a/melodic/slam-toolbox/default.nix b/distros/melodic/slam-toolbox/default.nix
similarity index 100%
rename from melodic/slam-toolbox/default.nix
rename to distros/melodic/slam-toolbox/default.nix
diff --git a/melodic/slic/default.nix b/distros/melodic/slic/default.nix
similarity index 100%
rename from melodic/slic/default.nix
rename to distros/melodic/slic/default.nix
diff --git a/melodic/slime-ros/default.nix b/distros/melodic/slime-ros/default.nix
similarity index 100%
rename from melodic/slime-ros/default.nix
rename to distros/melodic/slime-ros/default.nix
diff --git a/melodic/slime-wrapper/default.nix b/distros/melodic/slime-wrapper/default.nix
similarity index 100%
rename from melodic/slime-wrapper/default.nix
rename to distros/melodic/slime-wrapper/default.nix
diff --git a/melodic/smach-msgs/default.nix b/distros/melodic/smach-msgs/default.nix
similarity index 100%
rename from melodic/smach-msgs/default.nix
rename to distros/melodic/smach-msgs/default.nix
diff --git a/melodic/smach-ros/default.nix b/distros/melodic/smach-ros/default.nix
similarity index 100%
rename from melodic/smach-ros/default.nix
rename to distros/melodic/smach-ros/default.nix
diff --git a/melodic/smach-viewer/default.nix b/distros/melodic/smach-viewer/default.nix
similarity index 100%
rename from melodic/smach-viewer/default.nix
rename to distros/melodic/smach-viewer/default.nix
diff --git a/melodic/smach/default.nix b/distros/melodic/smach/default.nix
similarity index 100%
rename from melodic/smach/default.nix
rename to distros/melodic/smach/default.nix
diff --git a/melodic/smclib/default.nix b/distros/melodic/smclib/default.nix
similarity index 100%
rename from melodic/smclib/default.nix
rename to distros/melodic/smclib/default.nix
diff --git a/melodic/social-navigation-layers/default.nix b/distros/melodic/social-navigation-layers/default.nix
similarity index 100%
rename from melodic/social-navigation-layers/default.nix
rename to distros/melodic/social-navigation-layers/default.nix
diff --git a/melodic/socketcan-bridge/default.nix b/distros/melodic/socketcan-bridge/default.nix
similarity index 100%
rename from melodic/socketcan-bridge/default.nix
rename to distros/melodic/socketcan-bridge/default.nix
diff --git a/melodic/socketcan-interface/default.nix b/distros/melodic/socketcan-interface/default.nix
similarity index 100%
rename from melodic/socketcan-interface/default.nix
rename to distros/melodic/socketcan-interface/default.nix
diff --git a/melodic/soem/default.nix b/distros/melodic/soem/default.nix
similarity index 100%
rename from melodic/soem/default.nix
rename to distros/melodic/soem/default.nix
diff --git a/melodic/sophus/default.nix b/distros/melodic/sophus/default.nix
similarity index 100%
rename from melodic/sophus/default.nix
rename to distros/melodic/sophus/default.nix
diff --git a/melodic/sparse-bundle-adjustment/default.nix b/distros/melodic/sparse-bundle-adjustment/default.nix
similarity index 100%
rename from melodic/sparse-bundle-adjustment/default.nix
rename to distros/melodic/sparse-bundle-adjustment/default.nix
diff --git a/melodic/spatio-temporal-voxel-layer/default.nix b/distros/melodic/spatio-temporal-voxel-layer/default.nix
similarity index 100%
rename from melodic/spatio-temporal-voxel-layer/default.nix
rename to distros/melodic/spatio-temporal-voxel-layer/default.nix
diff --git a/melodic/speech-recognition-msgs/default.nix b/distros/melodic/speech-recognition-msgs/default.nix
similarity index 100%
rename from melodic/speech-recognition-msgs/default.nix
rename to distros/melodic/speech-recognition-msgs/default.nix
diff --git a/melodic/srdfdom/default.nix b/distros/melodic/srdfdom/default.nix
similarity index 100%
rename from melodic/srdfdom/default.nix
rename to distros/melodic/srdfdom/default.nix
diff --git a/melodic/stage-ros/default.nix b/distros/melodic/stage-ros/default.nix
similarity index 100%
rename from melodic/stage-ros/default.nix
rename to distros/melodic/stage-ros/default.nix
diff --git a/melodic/stage/default.nix b/distros/melodic/stage/default.nix
similarity index 100%
rename from melodic/stage/default.nix
rename to distros/melodic/stage/default.nix
diff --git a/melodic/static-tf/default.nix b/distros/melodic/static-tf/default.nix
similarity index 100%
rename from melodic/static-tf/default.nix
rename to distros/melodic/static-tf/default.nix
diff --git a/melodic/static-transform-mux/default.nix b/distros/melodic/static-transform-mux/default.nix
similarity index 100%
rename from melodic/static-transform-mux/default.nix
rename to distros/melodic/static-transform-mux/default.nix
diff --git a/melodic/std-capabilities/default.nix b/distros/melodic/std-capabilities/default.nix
similarity index 100%
rename from melodic/std-capabilities/default.nix
rename to distros/melodic/std-capabilities/default.nix
diff --git a/melodic/std-msgs/default.nix b/distros/melodic/std-msgs/default.nix
similarity index 100%
rename from melodic/std-msgs/default.nix
rename to distros/melodic/std-msgs/default.nix
diff --git a/melodic/std-srvs/default.nix b/distros/melodic/std-srvs/default.nix
similarity index 100%
rename from melodic/std-srvs/default.nix
rename to distros/melodic/std-srvs/default.nix
diff --git a/melodic/stereo-image-proc/default.nix b/distros/melodic/stereo-image-proc/default.nix
similarity index 100%
rename from melodic/stereo-image-proc/default.nix
rename to distros/melodic/stereo-image-proc/default.nix
diff --git a/melodic/stereo-msgs/default.nix b/distros/melodic/stereo-msgs/default.nix
similarity index 100%
rename from melodic/stereo-msgs/default.nix
rename to distros/melodic/stereo-msgs/default.nix
diff --git a/melodic/swri-console-util/default.nix b/distros/melodic/swri-console-util/default.nix
similarity index 100%
rename from melodic/swri-console-util/default.nix
rename to distros/melodic/swri-console-util/default.nix
diff --git a/melodic/swri-console/default.nix b/distros/melodic/swri-console/default.nix
similarity index 100%
rename from melodic/swri-console/default.nix
rename to distros/melodic/swri-console/default.nix
diff --git a/melodic/swri-dbw-interface/default.nix b/distros/melodic/swri-dbw-interface/default.nix
similarity index 100%
rename from melodic/swri-dbw-interface/default.nix
rename to distros/melodic/swri-dbw-interface/default.nix
diff --git a/melodic/swri-geometry-util/default.nix b/distros/melodic/swri-geometry-util/default.nix
similarity index 100%
rename from melodic/swri-geometry-util/default.nix
rename to distros/melodic/swri-geometry-util/default.nix
diff --git a/melodic/swri-image-util/default.nix b/distros/melodic/swri-image-util/default.nix
similarity index 100%
rename from melodic/swri-image-util/default.nix
rename to distros/melodic/swri-image-util/default.nix
diff --git a/melodic/swri-math-util/default.nix b/distros/melodic/swri-math-util/default.nix
similarity index 100%
rename from melodic/swri-math-util/default.nix
rename to distros/melodic/swri-math-util/default.nix
diff --git a/melodic/swri-nodelet/default.nix b/distros/melodic/swri-nodelet/default.nix
similarity index 100%
rename from melodic/swri-nodelet/default.nix
rename to distros/melodic/swri-nodelet/default.nix
diff --git a/melodic/swri-opencv-util/default.nix b/distros/melodic/swri-opencv-util/default.nix
similarity index 100%
rename from melodic/swri-opencv-util/default.nix
rename to distros/melodic/swri-opencv-util/default.nix
diff --git a/melodic/swri-prefix-tools/default.nix b/distros/melodic/swri-prefix-tools/default.nix
similarity index 100%
rename from melodic/swri-prefix-tools/default.nix
rename to distros/melodic/swri-prefix-tools/default.nix
diff --git a/melodic/swri-profiler-msgs/default.nix b/distros/melodic/swri-profiler-msgs/default.nix
similarity index 100%
rename from melodic/swri-profiler-msgs/default.nix
rename to distros/melodic/swri-profiler-msgs/default.nix
diff --git a/melodic/swri-profiler-tools/default.nix b/distros/melodic/swri-profiler-tools/default.nix
similarity index 100%
rename from melodic/swri-profiler-tools/default.nix
rename to distros/melodic/swri-profiler-tools/default.nix
diff --git a/melodic/swri-profiler/default.nix b/distros/melodic/swri-profiler/default.nix
similarity index 100%
rename from melodic/swri-profiler/default.nix
rename to distros/melodic/swri-profiler/default.nix
diff --git a/melodic/swri-roscpp/default.nix b/distros/melodic/swri-roscpp/default.nix
similarity index 100%
rename from melodic/swri-roscpp/default.nix
rename to distros/melodic/swri-roscpp/default.nix
diff --git a/melodic/swri-rospy/default.nix b/distros/melodic/swri-rospy/default.nix
similarity index 100%
rename from melodic/swri-rospy/default.nix
rename to distros/melodic/swri-rospy/default.nix
diff --git a/melodic/swri-route-util/default.nix b/distros/melodic/swri-route-util/default.nix
similarity index 100%
rename from melodic/swri-route-util/default.nix
rename to distros/melodic/swri-route-util/default.nix
diff --git a/melodic/swri-serial-util/default.nix b/distros/melodic/swri-serial-util/default.nix
similarity index 100%
rename from melodic/swri-serial-util/default.nix
rename to distros/melodic/swri-serial-util/default.nix
diff --git a/melodic/swri-string-util/default.nix b/distros/melodic/swri-string-util/default.nix
similarity index 100%
rename from melodic/swri-string-util/default.nix
rename to distros/melodic/swri-string-util/default.nix
diff --git a/melodic/swri-system-util/default.nix b/distros/melodic/swri-system-util/default.nix
similarity index 100%
rename from melodic/swri-system-util/default.nix
rename to distros/melodic/swri-system-util/default.nix
diff --git a/melodic/swri-transform-util/default.nix b/distros/melodic/swri-transform-util/default.nix
similarity index 100%
rename from melodic/swri-transform-util/default.nix
rename to distros/melodic/swri-transform-util/default.nix
diff --git a/melodic/swri-yaml-util/default.nix b/distros/melodic/swri-yaml-util/default.nix
similarity index 100%
rename from melodic/swri-yaml-util/default.nix
rename to distros/melodic/swri-yaml-util/default.nix
diff --git a/melodic/talos-description-calibration/default.nix b/distros/melodic/talos-description-calibration/default.nix
similarity index 100%
rename from melodic/talos-description-calibration/default.nix
rename to distros/melodic/talos-description-calibration/default.nix
diff --git a/melodic/talos-description-inertial/default.nix b/distros/melodic/talos-description-inertial/default.nix
similarity index 100%
rename from melodic/talos-description-inertial/default.nix
rename to distros/melodic/talos-description-inertial/default.nix
diff --git a/melodic/talos-description/default.nix b/distros/melodic/talos-description/default.nix
similarity index 100%
rename from melodic/talos-description/default.nix
rename to distros/melodic/talos-description/default.nix
diff --git a/melodic/teb-local-planner-tutorials/default.nix b/distros/melodic/teb-local-planner-tutorials/default.nix
similarity index 100%
rename from melodic/teb-local-planner-tutorials/default.nix
rename to distros/melodic/teb-local-planner-tutorials/default.nix
diff --git a/melodic/teb-local-planner/default.nix b/distros/melodic/teb-local-planner/default.nix
similarity index 100%
rename from melodic/teb-local-planner/default.nix
rename to distros/melodic/teb-local-planner/default.nix
diff --git a/melodic/teleop-tools-msgs/default.nix b/distros/melodic/teleop-tools-msgs/default.nix
similarity index 100%
rename from melodic/teleop-tools-msgs/default.nix
rename to distros/melodic/teleop-tools-msgs/default.nix
diff --git a/melodic/teleop-tools/default.nix b/distros/melodic/teleop-tools/default.nix
similarity index 100%
rename from melodic/teleop-tools/default.nix
rename to distros/melodic/teleop-tools/default.nix
diff --git a/melodic/teleop-twist-joy/default.nix b/distros/melodic/teleop-twist-joy/default.nix
similarity index 100%
rename from melodic/teleop-twist-joy/default.nix
rename to distros/melodic/teleop-twist-joy/default.nix
diff --git a/melodic/teleop-twist-keyboard/default.nix b/distros/melodic/teleop-twist-keyboard/default.nix
similarity index 100%
rename from melodic/teleop-twist-keyboard/default.nix
rename to distros/melodic/teleop-twist-keyboard/default.nix
diff --git a/melodic/teraranger-array/default.nix b/distros/melodic/teraranger-array/default.nix
similarity index 100%
rename from melodic/teraranger-array/default.nix
rename to distros/melodic/teraranger-array/default.nix
diff --git a/melodic/teraranger/default.nix b/distros/melodic/teraranger/default.nix
similarity index 100%
rename from melodic/teraranger/default.nix
rename to distros/melodic/teraranger/default.nix
diff --git a/melodic/test-diagnostic-aggregator/default.nix b/distros/melodic/test-diagnostic-aggregator/default.nix
similarity index 100%
rename from melodic/test-diagnostic-aggregator/default.nix
rename to distros/melodic/test-diagnostic-aggregator/default.nix
diff --git a/melodic/test-mavros/default.nix b/distros/melodic/test-mavros/default.nix
similarity index 100%
rename from melodic/test-mavros/default.nix
rename to distros/melodic/test-mavros/default.nix
diff --git a/melodic/test-osm/default.nix b/distros/melodic/test-osm/default.nix
similarity index 100%
rename from melodic/test-osm/default.nix
rename to distros/melodic/test-osm/default.nix
diff --git a/melodic/tf-conversions/default.nix b/distros/melodic/tf-conversions/default.nix
similarity index 100%
rename from melodic/tf-conversions/default.nix
rename to distros/melodic/tf-conversions/default.nix
diff --git a/melodic/tf-remapper-cpp/default.nix b/distros/melodic/tf-remapper-cpp/default.nix
similarity index 100%
rename from melodic/tf-remapper-cpp/default.nix
rename to distros/melodic/tf-remapper-cpp/default.nix
diff --git a/melodic/tf/default.nix b/distros/melodic/tf/default.nix
similarity index 100%
rename from melodic/tf/default.nix
rename to distros/melodic/tf/default.nix
diff --git a/melodic/tf2-bullet/default.nix b/distros/melodic/tf2-bullet/default.nix
similarity index 100%
rename from melodic/tf2-bullet/default.nix
rename to distros/melodic/tf2-bullet/default.nix
diff --git a/melodic/tf2-eigen/default.nix b/distros/melodic/tf2-eigen/default.nix
similarity index 100%
rename from melodic/tf2-eigen/default.nix
rename to distros/melodic/tf2-eigen/default.nix
diff --git a/melodic/tf2-geometry-msgs/default.nix b/distros/melodic/tf2-geometry-msgs/default.nix
similarity index 100%
rename from melodic/tf2-geometry-msgs/default.nix
rename to distros/melodic/tf2-geometry-msgs/default.nix
diff --git a/melodic/tf2-kdl/default.nix b/distros/melodic/tf2-kdl/default.nix
similarity index 100%
rename from melodic/tf2-kdl/default.nix
rename to distros/melodic/tf2-kdl/default.nix
diff --git a/melodic/tf2-msgs/default.nix b/distros/melodic/tf2-msgs/default.nix
similarity index 100%
rename from melodic/tf2-msgs/default.nix
rename to distros/melodic/tf2-msgs/default.nix
diff --git a/melodic/tf2-py/default.nix b/distros/melodic/tf2-py/default.nix
similarity index 100%
rename from melodic/tf2-py/default.nix
rename to distros/melodic/tf2-py/default.nix
diff --git a/melodic/tf2-relay/default.nix b/distros/melodic/tf2-relay/default.nix
similarity index 100%
rename from melodic/tf2-relay/default.nix
rename to distros/melodic/tf2-relay/default.nix
diff --git a/melodic/tf2-ros/default.nix b/distros/melodic/tf2-ros/default.nix
similarity index 100%
rename from melodic/tf2-ros/default.nix
rename to distros/melodic/tf2-ros/default.nix
diff --git a/melodic/tf2-sensor-msgs/default.nix b/distros/melodic/tf2-sensor-msgs/default.nix
similarity index 100%
rename from melodic/tf2-sensor-msgs/default.nix
rename to distros/melodic/tf2-sensor-msgs/default.nix
diff --git a/melodic/tf2-tools/default.nix b/distros/melodic/tf2-tools/default.nix
similarity index 100%
rename from melodic/tf2-tools/default.nix
rename to distros/melodic/tf2-tools/default.nix
diff --git a/melodic/tf2-web-republisher/default.nix b/distros/melodic/tf2-web-republisher/default.nix
similarity index 100%
rename from melodic/tf2-web-republisher/default.nix
rename to distros/melodic/tf2-web-republisher/default.nix
diff --git a/melodic/tf2/default.nix b/distros/melodic/tf2/default.nix
similarity index 100%
rename from melodic/tf2/default.nix
rename to distros/melodic/tf2/default.nix
diff --git a/melodic/theora-image-transport/default.nix b/distros/melodic/theora-image-transport/default.nix
similarity index 100%
rename from melodic/theora-image-transport/default.nix
rename to distros/melodic/theora-image-transport/default.nix
diff --git a/melodic/tile-map/default.nix b/distros/melodic/tile-map/default.nix
similarity index 100%
rename from melodic/tile-map/default.nix
rename to distros/melodic/tile-map/default.nix
diff --git a/melodic/timestamp-tools/default.nix b/distros/melodic/timestamp-tools/default.nix
similarity index 100%
rename from melodic/timestamp-tools/default.nix
rename to distros/melodic/timestamp-tools/default.nix
diff --git a/melodic/topic-tools/default.nix b/distros/melodic/topic-tools/default.nix
similarity index 100%
rename from melodic/topic-tools/default.nix
rename to distros/melodic/topic-tools/default.nix
diff --git a/melodic/toposens-description/default.nix b/distros/melodic/toposens-description/default.nix
similarity index 100%
rename from melodic/toposens-description/default.nix
rename to distros/melodic/toposens-description/default.nix
diff --git a/melodic/toposens-driver/default.nix b/distros/melodic/toposens-driver/default.nix
similarity index 100%
rename from melodic/toposens-driver/default.nix
rename to distros/melodic/toposens-driver/default.nix
diff --git a/melodic/toposens-markers/default.nix b/distros/melodic/toposens-markers/default.nix
similarity index 100%
rename from melodic/toposens-markers/default.nix
rename to distros/melodic/toposens-markers/default.nix
diff --git a/melodic/toposens-msgs/default.nix b/distros/melodic/toposens-msgs/default.nix
similarity index 100%
rename from melodic/toposens-msgs/default.nix
rename to distros/melodic/toposens-msgs/default.nix
diff --git a/melodic/toposens-pointcloud/default.nix b/distros/melodic/toposens-pointcloud/default.nix
similarity index 100%
rename from melodic/toposens-pointcloud/default.nix
rename to distros/melodic/toposens-pointcloud/default.nix
diff --git a/melodic/toposens-sync/default.nix b/distros/melodic/toposens-sync/default.nix
similarity index 100%
rename from melodic/toposens-sync/default.nix
rename to distros/melodic/toposens-sync/default.nix
diff --git a/melodic/toposens/default.nix b/distros/melodic/toposens/default.nix
similarity index 100%
rename from melodic/toposens/default.nix
rename to distros/melodic/toposens/default.nix
diff --git a/melodic/towr-ros/default.nix b/distros/melodic/towr-ros/default.nix
similarity index 100%
rename from melodic/towr-ros/default.nix
rename to distros/melodic/towr-ros/default.nix
diff --git a/melodic/towr/default.nix b/distros/melodic/towr/default.nix
similarity index 100%
rename from melodic/towr/default.nix
rename to distros/melodic/towr/default.nix
diff --git a/melodic/trac-ik-examples/default.nix b/distros/melodic/trac-ik-examples/default.nix
similarity index 100%
rename from melodic/trac-ik-examples/default.nix
rename to distros/melodic/trac-ik-examples/default.nix
diff --git a/melodic/trac-ik-kinematics-plugin/default.nix b/distros/melodic/trac-ik-kinematics-plugin/default.nix
similarity index 100%
rename from melodic/trac-ik-kinematics-plugin/default.nix
rename to distros/melodic/trac-ik-kinematics-plugin/default.nix
diff --git a/melodic/trac-ik-python/default.nix b/distros/melodic/trac-ik-python/default.nix
similarity index 100%
rename from melodic/trac-ik-python/default.nix
rename to distros/melodic/trac-ik-python/default.nix
diff --git a/melodic/trac-ik/default.nix b/distros/melodic/trac-ik/default.nix
similarity index 100%
rename from melodic/trac-ik/default.nix
rename to distros/melodic/trac-ik/default.nix
diff --git a/melodic/tracetools/default.nix b/distros/melodic/tracetools/default.nix
similarity index 100%
rename from melodic/tracetools/default.nix
rename to distros/melodic/tracetools/default.nix
diff --git a/melodic/track-odometry/default.nix b/distros/melodic/track-odometry/default.nix
similarity index 100%
rename from melodic/track-odometry/default.nix
rename to distros/melodic/track-odometry/default.nix
diff --git a/melodic/trajectory-msgs/default.nix b/distros/melodic/trajectory-msgs/default.nix
similarity index 100%
rename from melodic/trajectory-msgs/default.nix
rename to distros/melodic/trajectory-msgs/default.nix
diff --git a/melodic/trajectory-tracker-msgs/default.nix b/distros/melodic/trajectory-tracker-msgs/default.nix
similarity index 100%
rename from melodic/trajectory-tracker-msgs/default.nix
rename to distros/melodic/trajectory-tracker-msgs/default.nix
diff --git a/melodic/trajectory-tracker-rviz-plugins/default.nix b/distros/melodic/trajectory-tracker-rviz-plugins/default.nix
similarity index 100%
rename from melodic/trajectory-tracker-rviz-plugins/default.nix
rename to distros/melodic/trajectory-tracker-rviz-plugins/default.nix
diff --git a/melodic/trajectory-tracker/default.nix b/distros/melodic/trajectory-tracker/default.nix
similarity index 100%
rename from melodic/trajectory-tracker/default.nix
rename to distros/melodic/trajectory-tracker/default.nix
diff --git a/melodic/transmission-interface/default.nix b/distros/melodic/transmission-interface/default.nix
similarity index 100%
rename from melodic/transmission-interface/default.nix
rename to distros/melodic/transmission-interface/default.nix
diff --git a/melodic/tts/default.nix b/distros/melodic/tts/default.nix
similarity index 100%
rename from melodic/tts/default.nix
rename to distros/melodic/tts/default.nix
diff --git a/melodic/turtle-actionlib/default.nix b/distros/melodic/turtle-actionlib/default.nix
similarity index 100%
rename from melodic/turtle-actionlib/default.nix
rename to distros/melodic/turtle-actionlib/default.nix
diff --git a/melodic/turtle-tf/default.nix b/distros/melodic/turtle-tf/default.nix
similarity index 100%
rename from melodic/turtle-tf/default.nix
rename to distros/melodic/turtle-tf/default.nix
diff --git a/melodic/turtle-tf2/default.nix b/distros/melodic/turtle-tf2/default.nix
similarity index 100%
rename from melodic/turtle-tf2/default.nix
rename to distros/melodic/turtle-tf2/default.nix
diff --git a/melodic/turtlebot3-applications-msgs/default.nix b/distros/melodic/turtlebot3-applications-msgs/default.nix
similarity index 100%
rename from melodic/turtlebot3-applications-msgs/default.nix
rename to distros/melodic/turtlebot3-applications-msgs/default.nix
diff --git a/melodic/turtlebot3-applications/default.nix b/distros/melodic/turtlebot3-applications/default.nix
similarity index 100%
rename from melodic/turtlebot3-applications/default.nix
rename to distros/melodic/turtlebot3-applications/default.nix
diff --git a/melodic/turtlebot3-automatic-parking-vision/default.nix b/distros/melodic/turtlebot3-automatic-parking-vision/default.nix
similarity index 100%
rename from melodic/turtlebot3-automatic-parking-vision/default.nix
rename to distros/melodic/turtlebot3-automatic-parking-vision/default.nix
diff --git a/melodic/turtlebot3-automatic-parking/default.nix b/distros/melodic/turtlebot3-automatic-parking/default.nix
similarity index 100%
rename from melodic/turtlebot3-automatic-parking/default.nix
rename to distros/melodic/turtlebot3-automatic-parking/default.nix
diff --git a/melodic/turtlebot3-autorace-camera/default.nix b/distros/melodic/turtlebot3-autorace-camera/default.nix
similarity index 100%
rename from melodic/turtlebot3-autorace-camera/default.nix
rename to distros/melodic/turtlebot3-autorace-camera/default.nix
diff --git a/melodic/turtlebot3-autorace-control/default.nix b/distros/melodic/turtlebot3-autorace-control/default.nix
similarity index 100%
rename from melodic/turtlebot3-autorace-control/default.nix
rename to distros/melodic/turtlebot3-autorace-control/default.nix
diff --git a/melodic/turtlebot3-autorace-core/default.nix b/distros/melodic/turtlebot3-autorace-core/default.nix
similarity index 100%
rename from melodic/turtlebot3-autorace-core/default.nix
rename to distros/melodic/turtlebot3-autorace-core/default.nix
diff --git a/melodic/turtlebot3-autorace-detect/default.nix b/distros/melodic/turtlebot3-autorace-detect/default.nix
similarity index 100%
rename from melodic/turtlebot3-autorace-detect/default.nix
rename to distros/melodic/turtlebot3-autorace-detect/default.nix
diff --git a/melodic/turtlebot3-autorace/default.nix b/distros/melodic/turtlebot3-autorace/default.nix
similarity index 100%
rename from melodic/turtlebot3-autorace/default.nix
rename to distros/melodic/turtlebot3-autorace/default.nix
diff --git a/melodic/turtlebot3-bringup/default.nix b/distros/melodic/turtlebot3-bringup/default.nix
similarity index 100%
rename from melodic/turtlebot3-bringup/default.nix
rename to distros/melodic/turtlebot3-bringup/default.nix
diff --git a/melodic/turtlebot3-description/default.nix b/distros/melodic/turtlebot3-description/default.nix
similarity index 100%
rename from melodic/turtlebot3-description/default.nix
rename to distros/melodic/turtlebot3-description/default.nix
diff --git a/melodic/turtlebot3-example/default.nix b/distros/melodic/turtlebot3-example/default.nix
similarity index 100%
rename from melodic/turtlebot3-example/default.nix
rename to distros/melodic/turtlebot3-example/default.nix
diff --git a/melodic/turtlebot3-fake/default.nix b/distros/melodic/turtlebot3-fake/default.nix
similarity index 100%
rename from melodic/turtlebot3-fake/default.nix
rename to distros/melodic/turtlebot3-fake/default.nix
diff --git a/melodic/turtlebot3-follow-filter/default.nix b/distros/melodic/turtlebot3-follow-filter/default.nix
similarity index 100%
rename from melodic/turtlebot3-follow-filter/default.nix
rename to distros/melodic/turtlebot3-follow-filter/default.nix
diff --git a/melodic/turtlebot3-follower/default.nix b/distros/melodic/turtlebot3-follower/default.nix
similarity index 100%
rename from melodic/turtlebot3-follower/default.nix
rename to distros/melodic/turtlebot3-follower/default.nix
diff --git a/melodic/turtlebot3-gazebo/default.nix b/distros/melodic/turtlebot3-gazebo/default.nix
similarity index 100%
rename from melodic/turtlebot3-gazebo/default.nix
rename to distros/melodic/turtlebot3-gazebo/default.nix
diff --git a/melodic/turtlebot3-msgs/default.nix b/distros/melodic/turtlebot3-msgs/default.nix
similarity index 100%
rename from melodic/turtlebot3-msgs/default.nix
rename to distros/melodic/turtlebot3-msgs/default.nix
diff --git a/melodic/turtlebot3-navigation/default.nix b/distros/melodic/turtlebot3-navigation/default.nix
similarity index 100%
rename from melodic/turtlebot3-navigation/default.nix
rename to distros/melodic/turtlebot3-navigation/default.nix
diff --git a/melodic/turtlebot3-panorama/default.nix b/distros/melodic/turtlebot3-panorama/default.nix
similarity index 100%
rename from melodic/turtlebot3-panorama/default.nix
rename to distros/melodic/turtlebot3-panorama/default.nix
diff --git a/melodic/turtlebot3-simulations/default.nix b/distros/melodic/turtlebot3-simulations/default.nix
similarity index 100%
rename from melodic/turtlebot3-simulations/default.nix
rename to distros/melodic/turtlebot3-simulations/default.nix
diff --git a/melodic/turtlebot3-slam/default.nix b/distros/melodic/turtlebot3-slam/default.nix
similarity index 100%
rename from melodic/turtlebot3-slam/default.nix
rename to distros/melodic/turtlebot3-slam/default.nix
diff --git a/melodic/turtlebot3-teleop/default.nix b/distros/melodic/turtlebot3-teleop/default.nix
similarity index 100%
rename from melodic/turtlebot3-teleop/default.nix
rename to distros/melodic/turtlebot3-teleop/default.nix
diff --git a/melodic/turtlebot3/default.nix b/distros/melodic/turtlebot3/default.nix
similarity index 100%
rename from melodic/turtlebot3/default.nix
rename to distros/melodic/turtlebot3/default.nix
diff --git a/melodic/turtlesim-dash-tutorial/default.nix b/distros/melodic/turtlesim-dash-tutorial/default.nix
similarity index 100%
rename from melodic/turtlesim-dash-tutorial/default.nix
rename to distros/melodic/turtlesim-dash-tutorial/default.nix
diff --git a/melodic/turtlesim/default.nix b/distros/melodic/turtlesim/default.nix
similarity index 100%
rename from melodic/turtlesim/default.nix
rename to distros/melodic/turtlesim/default.nix
diff --git a/melodic/tuw-airskin-msgs/default.nix b/distros/melodic/tuw-airskin-msgs/default.nix
similarity index 100%
rename from melodic/tuw-airskin-msgs/default.nix
rename to distros/melodic/tuw-airskin-msgs/default.nix
diff --git a/melodic/tuw-aruco/default.nix b/distros/melodic/tuw-aruco/default.nix
similarity index 100%
rename from melodic/tuw-aruco/default.nix
rename to distros/melodic/tuw-aruco/default.nix
diff --git a/melodic/tuw-checkerboard/default.nix b/distros/melodic/tuw-checkerboard/default.nix
similarity index 100%
rename from melodic/tuw-checkerboard/default.nix
rename to distros/melodic/tuw-checkerboard/default.nix
diff --git a/melodic/tuw-ellipses/default.nix b/distros/melodic/tuw-ellipses/default.nix
similarity index 100%
rename from melodic/tuw-ellipses/default.nix
rename to distros/melodic/tuw-ellipses/default.nix
diff --git a/melodic/tuw-gazebo-msgs/default.nix b/distros/melodic/tuw-gazebo-msgs/default.nix
similarity index 100%
rename from melodic/tuw-gazebo-msgs/default.nix
rename to distros/melodic/tuw-gazebo-msgs/default.nix
diff --git a/melodic/tuw-geometry-msgs/default.nix b/distros/melodic/tuw-geometry-msgs/default.nix
similarity index 100%
rename from melodic/tuw-geometry-msgs/default.nix
rename to distros/melodic/tuw-geometry-msgs/default.nix
diff --git a/melodic/tuw-geometry/default.nix b/distros/melodic/tuw-geometry/default.nix
similarity index 100%
rename from melodic/tuw-geometry/default.nix
rename to distros/melodic/tuw-geometry/default.nix
diff --git a/melodic/tuw-marker-detection/default.nix b/distros/melodic/tuw-marker-detection/default.nix
similarity index 100%
rename from melodic/tuw-marker-detection/default.nix
rename to distros/melodic/tuw-marker-detection/default.nix
diff --git a/melodic/tuw-marker-pose-estimation/default.nix b/distros/melodic/tuw-marker-pose-estimation/default.nix
similarity index 100%
rename from melodic/tuw-marker-pose-estimation/default.nix
rename to distros/melodic/tuw-marker-pose-estimation/default.nix
diff --git a/melodic/tuw-msgs/default.nix b/distros/melodic/tuw-msgs/default.nix
similarity index 100%
rename from melodic/tuw-msgs/default.nix
rename to distros/melodic/tuw-msgs/default.nix
diff --git a/melodic/tuw-multi-robot-msgs/default.nix b/distros/melodic/tuw-multi-robot-msgs/default.nix
similarity index 100%
rename from melodic/tuw-multi-robot-msgs/default.nix
rename to distros/melodic/tuw-multi-robot-msgs/default.nix
diff --git a/melodic/tuw-nav-msgs/default.nix b/distros/melodic/tuw-nav-msgs/default.nix
similarity index 100%
rename from melodic/tuw-nav-msgs/default.nix
rename to distros/melodic/tuw-nav-msgs/default.nix
diff --git a/melodic/tuw-object-msgs/default.nix b/distros/melodic/tuw-object-msgs/default.nix
similarity index 100%
rename from melodic/tuw-object-msgs/default.nix
rename to distros/melodic/tuw-object-msgs/default.nix
diff --git a/melodic/tuw-vehicle-msgs/default.nix b/distros/melodic/tuw-vehicle-msgs/default.nix
similarity index 100%
rename from melodic/tuw-vehicle-msgs/default.nix
rename to distros/melodic/tuw-vehicle-msgs/default.nix
diff --git a/melodic/twist-mux-msgs/default.nix b/distros/melodic/twist-mux-msgs/default.nix
similarity index 100%
rename from melodic/twist-mux-msgs/default.nix
rename to distros/melodic/twist-mux-msgs/default.nix
diff --git a/melodic/twist-mux/default.nix b/distros/melodic/twist-mux/default.nix
similarity index 100%
rename from melodic/twist-mux/default.nix
rename to distros/melodic/twist-mux/default.nix
diff --git a/melodic/twist-recovery/default.nix b/distros/melodic/twist-recovery/default.nix
similarity index 100%
rename from melodic/twist-recovery/default.nix
rename to distros/melodic/twist-recovery/default.nix
diff --git a/melodic/ubiquity-motor/default.nix b/distros/melodic/ubiquity-motor/default.nix
similarity index 100%
rename from melodic/ubiquity-motor/default.nix
rename to distros/melodic/ubiquity-motor/default.nix
diff --git a/melodic/ublox-gps/default.nix b/distros/melodic/ublox-gps/default.nix
similarity index 100%
rename from melodic/ublox-gps/default.nix
rename to distros/melodic/ublox-gps/default.nix
diff --git a/melodic/ublox-msgs/default.nix b/distros/melodic/ublox-msgs/default.nix
similarity index 100%
rename from melodic/ublox-msgs/default.nix
rename to distros/melodic/ublox-msgs/default.nix
diff --git a/melodic/ublox-serialization/default.nix b/distros/melodic/ublox-serialization/default.nix
similarity index 100%
rename from melodic/ublox-serialization/default.nix
rename to distros/melodic/ublox-serialization/default.nix
diff --git a/melodic/ublox/default.nix b/distros/melodic/ublox/default.nix
similarity index 100%
rename from melodic/ublox/default.nix
rename to distros/melodic/ublox/default.nix
diff --git a/melodic/um6/default.nix b/distros/melodic/um6/default.nix
similarity index 100%
rename from melodic/um6/default.nix
rename to distros/melodic/um6/default.nix
diff --git a/melodic/um7/default.nix b/distros/melodic/um7/default.nix
similarity index 100%
rename from melodic/um7/default.nix
rename to distros/melodic/um7/default.nix
diff --git a/melodic/underwater-sensor-msgs/default.nix b/distros/melodic/underwater-sensor-msgs/default.nix
similarity index 100%
rename from melodic/underwater-sensor-msgs/default.nix
rename to distros/melodic/underwater-sensor-msgs/default.nix
diff --git a/melodic/underwater-vehicle-dynamics/default.nix b/distros/melodic/underwater-vehicle-dynamics/default.nix
similarity index 100%
rename from melodic/underwater-vehicle-dynamics/default.nix
rename to distros/melodic/underwater-vehicle-dynamics/default.nix
diff --git a/melodic/unique-id/default.nix b/distros/melodic/unique-id/default.nix
similarity index 100%
rename from melodic/unique-id/default.nix
rename to distros/melodic/unique-id/default.nix
diff --git a/melodic/unique-identifier/default.nix b/distros/melodic/unique-identifier/default.nix
similarity index 100%
rename from melodic/unique-identifier/default.nix
rename to distros/melodic/unique-identifier/default.nix
diff --git a/melodic/urdf-geometry-parser/default.nix b/distros/melodic/urdf-geometry-parser/default.nix
similarity index 100%
rename from melodic/urdf-geometry-parser/default.nix
rename to distros/melodic/urdf-geometry-parser/default.nix
diff --git a/melodic/urdf-parser-plugin/default.nix b/distros/melodic/urdf-parser-plugin/default.nix
similarity index 100%
rename from melodic/urdf-parser-plugin/default.nix
rename to distros/melodic/urdf-parser-plugin/default.nix
diff --git a/melodic/urdf-sim-tutorial/default.nix b/distros/melodic/urdf-sim-tutorial/default.nix
similarity index 100%
rename from melodic/urdf-sim-tutorial/default.nix
rename to distros/melodic/urdf-sim-tutorial/default.nix
diff --git a/melodic/urdf-test/default.nix b/distros/melodic/urdf-test/default.nix
similarity index 100%
rename from melodic/urdf-test/default.nix
rename to distros/melodic/urdf-test/default.nix
diff --git a/melodic/urdf-tutorial/default.nix b/distros/melodic/urdf-tutorial/default.nix
similarity index 100%
rename from melodic/urdf-tutorial/default.nix
rename to distros/melodic/urdf-tutorial/default.nix
diff --git a/melodic/urdf/default.nix b/distros/melodic/urdf/default.nix
similarity index 100%
rename from melodic/urdf/default.nix
rename to distros/melodic/urdf/default.nix
diff --git a/melodic/urdfdom-py/default.nix b/distros/melodic/urdfdom-py/default.nix
similarity index 100%
rename from melodic/urdfdom-py/default.nix
rename to distros/melodic/urdfdom-py/default.nix
diff --git a/melodic/urg-c/default.nix b/distros/melodic/urg-c/default.nix
similarity index 100%
rename from melodic/urg-c/default.nix
rename to distros/melodic/urg-c/default.nix
diff --git a/melodic/urg-node/default.nix b/distros/melodic/urg-node/default.nix
similarity index 100%
rename from melodic/urg-node/default.nix
rename to distros/melodic/urg-node/default.nix
diff --git a/melodic/urg-stamped/default.nix b/distros/melodic/urg-stamped/default.nix
similarity index 100%
rename from melodic/urg-stamped/default.nix
rename to distros/melodic/urg-stamped/default.nix
diff --git a/melodic/usb-cam-controllers/default.nix b/distros/melodic/usb-cam-controllers/default.nix
similarity index 100%
rename from melodic/usb-cam-controllers/default.nix
rename to distros/melodic/usb-cam-controllers/default.nix
diff --git a/melodic/usb-cam-hardware-interface/default.nix b/distros/melodic/usb-cam-hardware-interface/default.nix
similarity index 100%
rename from melodic/usb-cam-hardware-interface/default.nix
rename to distros/melodic/usb-cam-hardware-interface/default.nix
diff --git a/melodic/usb-cam-hardware/default.nix b/distros/melodic/usb-cam-hardware/default.nix
similarity index 100%
rename from melodic/usb-cam-hardware/default.nix
rename to distros/melodic/usb-cam-hardware/default.nix
diff --git a/melodic/usb-cam/default.nix b/distros/melodic/usb-cam/default.nix
similarity index 100%
rename from melodic/usb-cam/default.nix
rename to distros/melodic/usb-cam/default.nix
diff --git a/melodic/usv-gazebo-plugins/default.nix b/distros/melodic/usv-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/usv-gazebo-plugins/default.nix
rename to distros/melodic/usv-gazebo-plugins/default.nix
diff --git a/melodic/uuid-msgs/default.nix b/distros/melodic/uuid-msgs/default.nix
similarity index 100%
rename from melodic/uuid-msgs/default.nix
rename to distros/melodic/uuid-msgs/default.nix
diff --git a/melodic/uuv-assistants/default.nix b/distros/melodic/uuv-assistants/default.nix
similarity index 100%
rename from melodic/uuv-assistants/default.nix
rename to distros/melodic/uuv-assistants/default.nix
diff --git a/melodic/uuv-auv-control-allocator/default.nix b/distros/melodic/uuv-auv-control-allocator/default.nix
similarity index 100%
rename from melodic/uuv-auv-control-allocator/default.nix
rename to distros/melodic/uuv-auv-control-allocator/default.nix
diff --git a/melodic/uuv-control-cascaded-pid/default.nix b/distros/melodic/uuv-control-cascaded-pid/default.nix
similarity index 100%
rename from melodic/uuv-control-cascaded-pid/default.nix
rename to distros/melodic/uuv-control-cascaded-pid/default.nix
diff --git a/melodic/uuv-control-msgs/default.nix b/distros/melodic/uuv-control-msgs/default.nix
similarity index 100%
rename from melodic/uuv-control-msgs/default.nix
rename to distros/melodic/uuv-control-msgs/default.nix
diff --git a/melodic/uuv-control-utils/default.nix b/distros/melodic/uuv-control-utils/default.nix
similarity index 100%
rename from melodic/uuv-control-utils/default.nix
rename to distros/melodic/uuv-control-utils/default.nix
diff --git a/melodic/uuv-descriptions/default.nix b/distros/melodic/uuv-descriptions/default.nix
similarity index 100%
rename from melodic/uuv-descriptions/default.nix
rename to distros/melodic/uuv-descriptions/default.nix
diff --git a/melodic/uuv-gazebo-plugins/default.nix b/distros/melodic/uuv-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/uuv-gazebo-plugins/default.nix
rename to distros/melodic/uuv-gazebo-plugins/default.nix
diff --git a/melodic/uuv-gazebo-ros-plugins-msgs/default.nix b/distros/melodic/uuv-gazebo-ros-plugins-msgs/default.nix
similarity index 100%
rename from melodic/uuv-gazebo-ros-plugins-msgs/default.nix
rename to distros/melodic/uuv-gazebo-ros-plugins-msgs/default.nix
diff --git a/melodic/uuv-gazebo-ros-plugins/default.nix b/distros/melodic/uuv-gazebo-ros-plugins/default.nix
similarity index 100%
rename from melodic/uuv-gazebo-ros-plugins/default.nix
rename to distros/melodic/uuv-gazebo-ros-plugins/default.nix
diff --git a/melodic/uuv-gazebo-worlds/default.nix b/distros/melodic/uuv-gazebo-worlds/default.nix
similarity index 100%
rename from melodic/uuv-gazebo-worlds/default.nix
rename to distros/melodic/uuv-gazebo-worlds/default.nix
diff --git a/melodic/uuv-gazebo/default.nix b/distros/melodic/uuv-gazebo/default.nix
similarity index 100%
rename from melodic/uuv-gazebo/default.nix
rename to distros/melodic/uuv-gazebo/default.nix
diff --git a/melodic/uuv-sensor-ros-plugins-msgs/default.nix b/distros/melodic/uuv-sensor-ros-plugins-msgs/default.nix
similarity index 100%
rename from melodic/uuv-sensor-ros-plugins-msgs/default.nix
rename to distros/melodic/uuv-sensor-ros-plugins-msgs/default.nix
diff --git a/melodic/uuv-sensor-ros-plugins/default.nix b/distros/melodic/uuv-sensor-ros-plugins/default.nix
similarity index 100%
rename from melodic/uuv-sensor-ros-plugins/default.nix
rename to distros/melodic/uuv-sensor-ros-plugins/default.nix
diff --git a/melodic/uuv-simulator/default.nix b/distros/melodic/uuv-simulator/default.nix
similarity index 100%
rename from melodic/uuv-simulator/default.nix
rename to distros/melodic/uuv-simulator/default.nix
diff --git a/melodic/uuv-teleop/default.nix b/distros/melodic/uuv-teleop/default.nix
similarity index 100%
rename from melodic/uuv-teleop/default.nix
rename to distros/melodic/uuv-teleop/default.nix
diff --git a/melodic/uuv-thruster-manager/default.nix b/distros/melodic/uuv-thruster-manager/default.nix
similarity index 100%
rename from melodic/uuv-thruster-manager/default.nix
rename to distros/melodic/uuv-thruster-manager/default.nix
diff --git a/melodic/uuv-trajectory-control/default.nix b/distros/melodic/uuv-trajectory-control/default.nix
similarity index 100%
rename from melodic/uuv-trajectory-control/default.nix
rename to distros/melodic/uuv-trajectory-control/default.nix
diff --git a/melodic/uuv-world-plugins/default.nix b/distros/melodic/uuv-world-plugins/default.nix
similarity index 100%
rename from melodic/uuv-world-plugins/default.nix
rename to distros/melodic/uuv-world-plugins/default.nix
diff --git a/melodic/uuv-world-ros-plugins-msgs/default.nix b/distros/melodic/uuv-world-ros-plugins-msgs/default.nix
similarity index 100%
rename from melodic/uuv-world-ros-plugins-msgs/default.nix
rename to distros/melodic/uuv-world-ros-plugins-msgs/default.nix
diff --git a/melodic/uuv-world-ros-plugins/default.nix b/distros/melodic/uuv-world-ros-plugins/default.nix
similarity index 100%
rename from melodic/uuv-world-ros-plugins/default.nix
rename to distros/melodic/uuv-world-ros-plugins/default.nix
diff --git a/melodic/uvc-camera/default.nix b/distros/melodic/uvc-camera/default.nix
similarity index 100%
rename from melodic/uvc-camera/default.nix
rename to distros/melodic/uvc-camera/default.nix
diff --git a/melodic/uwsim-bullet/default.nix b/distros/melodic/uwsim-bullet/default.nix
similarity index 100%
rename from melodic/uwsim-bullet/default.nix
rename to distros/melodic/uwsim-bullet/default.nix
diff --git a/melodic/uwsim-osgbullet/default.nix b/distros/melodic/uwsim-osgbullet/default.nix
similarity index 100%
rename from melodic/uwsim-osgbullet/default.nix
rename to distros/melodic/uwsim-osgbullet/default.nix
diff --git a/melodic/uwsim-osgocean/default.nix b/distros/melodic/uwsim-osgocean/default.nix
similarity index 100%
rename from melodic/uwsim-osgocean/default.nix
rename to distros/melodic/uwsim-osgocean/default.nix
diff --git a/melodic/uwsim-osgworks/default.nix b/distros/melodic/uwsim-osgworks/default.nix
similarity index 100%
rename from melodic/uwsim-osgworks/default.nix
rename to distros/melodic/uwsim-osgworks/default.nix
diff --git a/melodic/vapor-master/default.nix b/distros/melodic/vapor-master/default.nix
similarity index 100%
rename from melodic/vapor-master/default.nix
rename to distros/melodic/vapor-master/default.nix
diff --git a/melodic/variant-msgs/default.nix b/distros/melodic/variant-msgs/default.nix
similarity index 100%
rename from melodic/variant-msgs/default.nix
rename to distros/melodic/variant-msgs/default.nix
diff --git a/melodic/variant-topic-test/default.nix b/distros/melodic/variant-topic-test/default.nix
similarity index 100%
rename from melodic/variant-topic-test/default.nix
rename to distros/melodic/variant-topic-test/default.nix
diff --git a/melodic/variant-topic-tools/default.nix b/distros/melodic/variant-topic-tools/default.nix
similarity index 100%
rename from melodic/variant-topic-tools/default.nix
rename to distros/melodic/variant-topic-tools/default.nix
diff --git a/melodic/variant/default.nix b/distros/melodic/variant/default.nix
similarity index 100%
rename from melodic/variant/default.nix
rename to distros/melodic/variant/default.nix
diff --git a/melodic/velocity-controllers/default.nix b/distros/melodic/velocity-controllers/default.nix
similarity index 100%
rename from melodic/velocity-controllers/default.nix
rename to distros/melodic/velocity-controllers/default.nix
diff --git a/melodic/velodyne-description/default.nix b/distros/melodic/velodyne-description/default.nix
similarity index 100%
rename from melodic/velodyne-description/default.nix
rename to distros/melodic/velodyne-description/default.nix
diff --git a/melodic/velodyne-driver/default.nix b/distros/melodic/velodyne-driver/default.nix
similarity index 100%
rename from melodic/velodyne-driver/default.nix
rename to distros/melodic/velodyne-driver/default.nix
diff --git a/melodic/velodyne-gazebo-plugins/default.nix b/distros/melodic/velodyne-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/velodyne-gazebo-plugins/default.nix
rename to distros/melodic/velodyne-gazebo-plugins/default.nix
diff --git a/melodic/velodyne-laserscan/default.nix b/distros/melodic/velodyne-laserscan/default.nix
similarity index 100%
rename from melodic/velodyne-laserscan/default.nix
rename to distros/melodic/velodyne-laserscan/default.nix
diff --git a/melodic/velodyne-msgs/default.nix b/distros/melodic/velodyne-msgs/default.nix
similarity index 100%
rename from melodic/velodyne-msgs/default.nix
rename to distros/melodic/velodyne-msgs/default.nix
diff --git a/melodic/velodyne-pointcloud/default.nix b/distros/melodic/velodyne-pointcloud/default.nix
similarity index 100%
rename from melodic/velodyne-pointcloud/default.nix
rename to distros/melodic/velodyne-pointcloud/default.nix
diff --git a/melodic/velodyne-simulator/default.nix b/distros/melodic/velodyne-simulator/default.nix
similarity index 100%
rename from melodic/velodyne-simulator/default.nix
rename to distros/melodic/velodyne-simulator/default.nix
diff --git a/melodic/velodyne/default.nix b/distros/melodic/velodyne/default.nix
similarity index 100%
rename from melodic/velodyne/default.nix
rename to distros/melodic/velodyne/default.nix
diff --git a/melodic/video-stream-opencv/default.nix b/distros/melodic/video-stream-opencv/default.nix
similarity index 100%
rename from melodic/video-stream-opencv/default.nix
rename to distros/melodic/video-stream-opencv/default.nix
diff --git a/melodic/view-controller-msgs/default.nix b/distros/melodic/view-controller-msgs/default.nix
similarity index 100%
rename from melodic/view-controller-msgs/default.nix
rename to distros/melodic/view-controller-msgs/default.nix
diff --git a/melodic/virtual-force-publisher/default.nix b/distros/melodic/virtual-force-publisher/default.nix
similarity index 100%
rename from melodic/virtual-force-publisher/default.nix
rename to distros/melodic/virtual-force-publisher/default.nix
diff --git a/melodic/vision-msgs/default.nix b/distros/melodic/vision-msgs/default.nix
similarity index 100%
rename from melodic/vision-msgs/default.nix
rename to distros/melodic/vision-msgs/default.nix
diff --git a/melodic/vision-opencv/default.nix b/distros/melodic/vision-opencv/default.nix
similarity index 100%
rename from melodic/vision-opencv/default.nix
rename to distros/melodic/vision-opencv/default.nix
diff --git a/melodic/vision-visp/default.nix b/distros/melodic/vision-visp/default.nix
similarity index 100%
rename from melodic/vision-visp/default.nix
rename to distros/melodic/vision-visp/default.nix
diff --git a/melodic/visp-auto-tracker/default.nix b/distros/melodic/visp-auto-tracker/default.nix
similarity index 100%
rename from melodic/visp-auto-tracker/default.nix
rename to distros/melodic/visp-auto-tracker/default.nix
diff --git a/melodic/visp-bridge/default.nix b/distros/melodic/visp-bridge/default.nix
similarity index 100%
rename from melodic/visp-bridge/default.nix
rename to distros/melodic/visp-bridge/default.nix
diff --git a/melodic/visp-camera-calibration/default.nix b/distros/melodic/visp-camera-calibration/default.nix
similarity index 100%
rename from melodic/visp-camera-calibration/default.nix
rename to distros/melodic/visp-camera-calibration/default.nix
diff --git a/melodic/visp-hand2eye-calibration/default.nix b/distros/melodic/visp-hand2eye-calibration/default.nix
similarity index 100%
rename from melodic/visp-hand2eye-calibration/default.nix
rename to distros/melodic/visp-hand2eye-calibration/default.nix
diff --git a/melodic/visp-tracker/default.nix b/distros/melodic/visp-tracker/default.nix
similarity index 100%
rename from melodic/visp-tracker/default.nix
rename to distros/melodic/visp-tracker/default.nix
diff --git a/melodic/visualization-marker-tutorials/default.nix b/distros/melodic/visualization-marker-tutorials/default.nix
similarity index 100%
rename from melodic/visualization-marker-tutorials/default.nix
rename to distros/melodic/visualization-marker-tutorials/default.nix
diff --git a/melodic/visualization-msgs/default.nix b/distros/melodic/visualization-msgs/default.nix
similarity index 100%
rename from melodic/visualization-msgs/default.nix
rename to distros/melodic/visualization-msgs/default.nix
diff --git a/melodic/visualization-osg/default.nix b/distros/melodic/visualization-osg/default.nix
similarity index 100%
rename from melodic/visualization-osg/default.nix
rename to distros/melodic/visualization-osg/default.nix
diff --git a/melodic/visualization-tutorials/default.nix b/distros/melodic/visualization-tutorials/default.nix
similarity index 100%
rename from melodic/visualization-tutorials/default.nix
rename to distros/melodic/visualization-tutorials/default.nix
diff --git a/melodic/viz/default.nix b/distros/melodic/viz/default.nix
similarity index 100%
rename from melodic/viz/default.nix
rename to distros/melodic/viz/default.nix
diff --git a/melodic/voice-text/default.nix b/distros/melodic/voice-text/default.nix
similarity index 100%
rename from melodic/voice-text/default.nix
rename to distros/melodic/voice-text/default.nix
diff --git a/melodic/volksbot-driver/default.nix b/distros/melodic/volksbot-driver/default.nix
similarity index 100%
rename from melodic/volksbot-driver/default.nix
rename to distros/melodic/volksbot-driver/default.nix
diff --git a/melodic/voxel-grid/default.nix b/distros/melodic/voxel-grid/default.nix
similarity index 100%
rename from melodic/voxel-grid/default.nix
rename to distros/melodic/voxel-grid/default.nix
diff --git a/melodic/vrpn-client-ros/default.nix b/distros/melodic/vrpn-client-ros/default.nix
similarity index 100%
rename from melodic/vrpn-client-ros/default.nix
rename to distros/melodic/vrpn-client-ros/default.nix
diff --git a/melodic/vrpn/default.nix b/distros/melodic/vrpn/default.nix
similarity index 100%
rename from melodic/vrpn/default.nix
rename to distros/melodic/vrpn/default.nix
diff --git a/melodic/vrx-gazebo/default.nix b/distros/melodic/vrx-gazebo/default.nix
similarity index 100%
rename from melodic/vrx-gazebo/default.nix
rename to distros/melodic/vrx-gazebo/default.nix
diff --git a/melodic/wamv-description/default.nix b/distros/melodic/wamv-description/default.nix
similarity index 100%
rename from melodic/wamv-description/default.nix
rename to distros/melodic/wamv-description/default.nix
diff --git a/melodic/wamv-gazebo/default.nix b/distros/melodic/wamv-gazebo/default.nix
similarity index 100%
rename from melodic/wamv-gazebo/default.nix
rename to distros/melodic/wamv-gazebo/default.nix
diff --git a/melodic/warehouse-ros/default.nix b/distros/melodic/warehouse-ros/default.nix
similarity index 100%
rename from melodic/warehouse-ros/default.nix
rename to distros/melodic/warehouse-ros/default.nix
diff --git a/melodic/warthog-control/default.nix b/distros/melodic/warthog-control/default.nix
similarity index 100%
rename from melodic/warthog-control/default.nix
rename to distros/melodic/warthog-control/default.nix
diff --git a/melodic/warthog-description/default.nix b/distros/melodic/warthog-description/default.nix
similarity index 100%
rename from melodic/warthog-description/default.nix
rename to distros/melodic/warthog-description/default.nix
diff --git a/melodic/warthog-desktop/default.nix b/distros/melodic/warthog-desktop/default.nix
similarity index 100%
rename from melodic/warthog-desktop/default.nix
rename to distros/melodic/warthog-desktop/default.nix
diff --git a/melodic/warthog-gazebo/default.nix b/distros/melodic/warthog-gazebo/default.nix
similarity index 100%
rename from melodic/warthog-gazebo/default.nix
rename to distros/melodic/warthog-gazebo/default.nix
diff --git a/melodic/warthog-msgs/default.nix b/distros/melodic/warthog-msgs/default.nix
similarity index 100%
rename from melodic/warthog-msgs/default.nix
rename to distros/melodic/warthog-msgs/default.nix
diff --git a/melodic/warthog-simulator/default.nix b/distros/melodic/warthog-simulator/default.nix
similarity index 100%
rename from melodic/warthog-simulator/default.nix
rename to distros/melodic/warthog-simulator/default.nix
diff --git a/melodic/warthog-viz/default.nix b/distros/melodic/warthog-viz/default.nix
similarity index 100%
rename from melodic/warthog-viz/default.nix
rename to distros/melodic/warthog-viz/default.nix
diff --git a/melodic/wave-gazebo-plugins/default.nix b/distros/melodic/wave-gazebo-plugins/default.nix
similarity index 100%
rename from melodic/wave-gazebo-plugins/default.nix
rename to distros/melodic/wave-gazebo-plugins/default.nix
diff --git a/melodic/wave-gazebo/default.nix b/distros/melodic/wave-gazebo/default.nix
similarity index 100%
rename from melodic/wave-gazebo/default.nix
rename to distros/melodic/wave-gazebo/default.nix
diff --git a/melodic/web-video-server/default.nix b/distros/melodic/web-video-server/default.nix
similarity index 100%
rename from melodic/web-video-server/default.nix
rename to distros/melodic/web-video-server/default.nix
diff --git a/melodic/webkit-dependency/default.nix b/distros/melodic/webkit-dependency/default.nix
similarity index 100%
rename from melodic/webkit-dependency/default.nix
rename to distros/melodic/webkit-dependency/default.nix
diff --git a/melodic/webots-ros/default.nix b/distros/melodic/webots-ros/default.nix
similarity index 100%
rename from melodic/webots-ros/default.nix
rename to distros/melodic/webots-ros/default.nix
diff --git a/melodic/webrtc-ros/default.nix b/distros/melodic/webrtc-ros/default.nix
similarity index 100%
rename from melodic/webrtc-ros/default.nix
rename to distros/melodic/webrtc-ros/default.nix
diff --git a/melodic/webrtc/default.nix b/distros/melodic/webrtc/default.nix
similarity index 100%
rename from melodic/webrtc/default.nix
rename to distros/melodic/webrtc/default.nix
diff --git a/melodic/wge100-camera-firmware/default.nix b/distros/melodic/wge100-camera-firmware/default.nix
similarity index 100%
rename from melodic/wge100-camera-firmware/default.nix
rename to distros/melodic/wge100-camera-firmware/default.nix
diff --git a/melodic/wge100-camera/default.nix b/distros/melodic/wge100-camera/default.nix
similarity index 100%
rename from melodic/wge100-camera/default.nix
rename to distros/melodic/wge100-camera/default.nix
diff --git a/melodic/wge100-driver/default.nix b/distros/melodic/wge100-driver/default.nix
similarity index 100%
rename from melodic/wge100-driver/default.nix
rename to distros/melodic/wge100-driver/default.nix
diff --git a/melodic/wifi-ddwrt/default.nix b/distros/melodic/wifi-ddwrt/default.nix
similarity index 100%
rename from melodic/wifi-ddwrt/default.nix
rename to distros/melodic/wifi-ddwrt/default.nix
diff --git a/melodic/willow-maps/default.nix b/distros/melodic/willow-maps/default.nix
similarity index 100%
rename from melodic/willow-maps/default.nix
rename to distros/melodic/willow-maps/default.nix
diff --git a/melodic/wu-ros-tools/default.nix b/distros/melodic/wu-ros-tools/default.nix
similarity index 100%
rename from melodic/wu-ros-tools/default.nix
rename to distros/melodic/wu-ros-tools/default.nix
diff --git a/melodic/xacro/default.nix b/distros/melodic/xacro/default.nix
similarity index 100%
rename from melodic/xacro/default.nix
rename to distros/melodic/xacro/default.nix
diff --git a/melodic/xmlrpcpp/default.nix b/distros/melodic/xmlrpcpp/default.nix
similarity index 100%
rename from melodic/xmlrpcpp/default.nix
rename to distros/melodic/xmlrpcpp/default.nix
diff --git a/melodic/xpp-examples/default.nix b/distros/melodic/xpp-examples/default.nix
similarity index 100%
rename from melodic/xpp-examples/default.nix
rename to distros/melodic/xpp-examples/default.nix
diff --git a/melodic/xpp-hyq/default.nix b/distros/melodic/xpp-hyq/default.nix
similarity index 100%
rename from melodic/xpp-hyq/default.nix
rename to distros/melodic/xpp-hyq/default.nix
diff --git a/melodic/xpp-msgs/default.nix b/distros/melodic/xpp-msgs/default.nix
similarity index 100%
rename from melodic/xpp-msgs/default.nix
rename to distros/melodic/xpp-msgs/default.nix
diff --git a/melodic/xpp-quadrotor/default.nix b/distros/melodic/xpp-quadrotor/default.nix
similarity index 100%
rename from melodic/xpp-quadrotor/default.nix
rename to distros/melodic/xpp-quadrotor/default.nix
diff --git a/melodic/xpp-states/default.nix b/distros/melodic/xpp-states/default.nix
similarity index 100%
rename from melodic/xpp-states/default.nix
rename to distros/melodic/xpp-states/default.nix
diff --git a/melodic/xpp-vis/default.nix b/distros/melodic/xpp-vis/default.nix
similarity index 100%
rename from melodic/xpp-vis/default.nix
rename to distros/melodic/xpp-vis/default.nix
diff --git a/melodic/xpp/default.nix b/distros/melodic/xpp/default.nix
similarity index 100%
rename from melodic/xpp/default.nix
rename to distros/melodic/xpp/default.nix
diff --git a/melodic/xsens-driver/default.nix b/distros/melodic/xsens-driver/default.nix
similarity index 100%
rename from melodic/xsens-driver/default.nix
rename to distros/melodic/xsens-driver/default.nix
diff --git a/melodic/xv-11-laser-driver/default.nix b/distros/melodic/xv-11-laser-driver/default.nix
similarity index 100%
rename from melodic/xv-11-laser-driver/default.nix
rename to distros/melodic/xv-11-laser-driver/default.nix
diff --git a/melodic/yocs-ar-marker-tracking/default.nix b/distros/melodic/yocs-ar-marker-tracking/default.nix
similarity index 100%
rename from melodic/yocs-ar-marker-tracking/default.nix
rename to distros/melodic/yocs-ar-marker-tracking/default.nix
diff --git a/melodic/yocs-ar-pair-approach/default.nix b/distros/melodic/yocs-ar-pair-approach/default.nix
similarity index 100%
rename from melodic/yocs-ar-pair-approach/default.nix
rename to distros/melodic/yocs-ar-pair-approach/default.nix
diff --git a/melodic/yocs-ar-pair-tracking/default.nix b/distros/melodic/yocs-ar-pair-tracking/default.nix
similarity index 100%
rename from melodic/yocs-ar-pair-tracking/default.nix
rename to distros/melodic/yocs-ar-pair-tracking/default.nix
diff --git a/melodic/yocs-cmd-vel-mux/default.nix b/distros/melodic/yocs-cmd-vel-mux/default.nix
similarity index 100%
rename from melodic/yocs-cmd-vel-mux/default.nix
rename to distros/melodic/yocs-cmd-vel-mux/default.nix
diff --git a/melodic/yocs-controllers/default.nix b/distros/melodic/yocs-controllers/default.nix
similarity index 100%
rename from melodic/yocs-controllers/default.nix
rename to distros/melodic/yocs-controllers/default.nix
diff --git a/melodic/yocs-diff-drive-pose-controller/default.nix b/distros/melodic/yocs-diff-drive-pose-controller/default.nix
similarity index 100%
rename from melodic/yocs-diff-drive-pose-controller/default.nix
rename to distros/melodic/yocs-diff-drive-pose-controller/default.nix
diff --git a/melodic/yocs-joyop/default.nix b/distros/melodic/yocs-joyop/default.nix
similarity index 100%
rename from melodic/yocs-joyop/default.nix
rename to distros/melodic/yocs-joyop/default.nix
diff --git a/melodic/yocs-keyop/default.nix b/distros/melodic/yocs-keyop/default.nix
similarity index 100%
rename from melodic/yocs-keyop/default.nix
rename to distros/melodic/yocs-keyop/default.nix
diff --git a/melodic/yocs-localization-manager/default.nix b/distros/melodic/yocs-localization-manager/default.nix
similarity index 100%
rename from melodic/yocs-localization-manager/default.nix
rename to distros/melodic/yocs-localization-manager/default.nix
diff --git a/melodic/yocs-math-toolkit/default.nix b/distros/melodic/yocs-math-toolkit/default.nix
similarity index 100%
rename from melodic/yocs-math-toolkit/default.nix
rename to distros/melodic/yocs-math-toolkit/default.nix
diff --git a/melodic/yocs-msgs/default.nix b/distros/melodic/yocs-msgs/default.nix
similarity index 100%
rename from melodic/yocs-msgs/default.nix
rename to distros/melodic/yocs-msgs/default.nix
diff --git a/melodic/yocs-navi-toolkit/default.nix b/distros/melodic/yocs-navi-toolkit/default.nix
similarity index 100%
rename from melodic/yocs-navi-toolkit/default.nix
rename to distros/melodic/yocs-navi-toolkit/default.nix
diff --git a/melodic/yocs-navigator/default.nix b/distros/melodic/yocs-navigator/default.nix
similarity index 100%
rename from melodic/yocs-navigator/default.nix
rename to distros/melodic/yocs-navigator/default.nix
diff --git a/melodic/yocs-rapps/default.nix b/distros/melodic/yocs-rapps/default.nix
similarity index 100%
rename from melodic/yocs-rapps/default.nix
rename to distros/melodic/yocs-rapps/default.nix
diff --git a/melodic/yocs-safety-controller/default.nix b/distros/melodic/yocs-safety-controller/default.nix
similarity index 100%
rename from melodic/yocs-safety-controller/default.nix
rename to distros/melodic/yocs-safety-controller/default.nix
diff --git a/melodic/yocs-velocity-smoother/default.nix b/distros/melodic/yocs-velocity-smoother/default.nix
similarity index 100%
rename from melodic/yocs-velocity-smoother/default.nix
rename to distros/melodic/yocs-velocity-smoother/default.nix
diff --git a/melodic/yocs-virtual-sensor/default.nix b/distros/melodic/yocs-virtual-sensor/default.nix
similarity index 100%
rename from melodic/yocs-virtual-sensor/default.nix
rename to distros/melodic/yocs-virtual-sensor/default.nix
diff --git a/melodic/yocs-waypoint-provider/default.nix b/distros/melodic/yocs-waypoint-provider/default.nix
similarity index 100%
rename from melodic/yocs-waypoint-provider/default.nix
rename to distros/melodic/yocs-waypoint-provider/default.nix
diff --git a/melodic/yocs-waypoints-navi/default.nix b/distros/melodic/yocs-waypoints-navi/default.nix
similarity index 100%
rename from melodic/yocs-waypoints-navi/default.nix
rename to distros/melodic/yocs-waypoints-navi/default.nix
diff --git a/melodic/yosemite-valley/default.nix b/distros/melodic/yosemite-valley/default.nix
similarity index 100%
rename from melodic/yosemite-valley/default.nix
rename to distros/melodic/yosemite-valley/default.nix
diff --git a/melodic/ypspur-ros/default.nix b/distros/melodic/ypspur-ros/default.nix
similarity index 100%
rename from melodic/ypspur-ros/default.nix
rename to distros/melodic/ypspur-ros/default.nix
diff --git a/melodic/ypspur/default.nix b/distros/melodic/ypspur/default.nix
similarity index 100%
rename from melodic/ypspur/default.nix
rename to distros/melodic/ypspur/default.nix
diff --git a/melodic/yujin-ocs/default.nix b/distros/melodic/yujin-ocs/default.nix
similarity index 100%
rename from melodic/yujin-ocs/default.nix
rename to distros/melodic/yujin-ocs/default.nix
diff --git a/melodic/zeroconf-msgs/default.nix b/distros/melodic/zeroconf-msgs/default.nix
similarity index 100%
rename from melodic/zeroconf-msgs/default.nix
rename to distros/melodic/zeroconf-msgs/default.nix
diff --git a/overlay.nix b/overlay.nix
index 1b49eb1fe9..e8f76baf70 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -2,5 +2,5 @@ self: super:
 with import ./lib/mk-overlay.nix { inherit (super) lib; };
 applyOverlays self super [
   (import ./base.nix)
-  (import ./distros.nix)
+  (import ./distros)
 ]