diff --git a/connectivity/dhcp/PKG-INFO b/base/dhcp/PKG-INFO
similarity index 100%
rename from connectivity/dhcp/PKG-INFO
rename to base/dhcp/PKG-INFO
diff --git a/connectivity/dhcp/centos/build_srpm.data b/base/dhcp/centos/build_srpm.data
similarity index 100%
rename from connectivity/dhcp/centos/build_srpm.data
rename to base/dhcp/centos/build_srpm.data
diff --git a/connectivity/dhcp/centos/files/dhclient-dhcp6-wrs-install-uuid.patch b/base/dhcp/centos/files/dhclient-dhcp6-wrs-install-uuid.patch
similarity index 100%
rename from connectivity/dhcp/centos/files/dhclient-dhcp6-wrs-install-uuid.patch
rename to base/dhcp/centos/files/dhclient-dhcp6-wrs-install-uuid.patch
diff --git a/connectivity/dhcp/centos/files/dhclient-disable-NSUPDATE.patch b/base/dhcp/centos/files/dhclient-disable-NSUPDATE.patch
similarity index 100%
rename from connectivity/dhcp/centos/files/dhclient-disable-NSUPDATE.patch
rename to base/dhcp/centos/files/dhclient-disable-NSUPDATE.patch
diff --git a/connectivity/dhcp/centos/files/dhclient-enter-hooks b/base/dhcp/centos/files/dhclient-enter-hooks
similarity index 100%
rename from connectivity/dhcp/centos/files/dhclient-enter-hooks
rename to base/dhcp/centos/files/dhclient-enter-hooks
diff --git a/connectivity/dhcp/centos/files/dhclient-handle-wrs-install-uuid.patch b/base/dhcp/centos/files/dhclient-handle-wrs-install-uuid.patch
similarity index 100%
rename from connectivity/dhcp/centos/files/dhclient-handle-wrs-install-uuid.patch
rename to base/dhcp/centos/files/dhclient-handle-wrs-install-uuid.patch
diff --git a/connectivity/dhcp/centos/files/dhclient-ipv6-bind-to-interface.patch b/base/dhcp/centos/files/dhclient-ipv6-bind-to-interface.patch
similarity index 100%
rename from connectivity/dhcp/centos/files/dhclient-ipv6-bind-to-interface.patch
rename to base/dhcp/centos/files/dhclient-ipv6-bind-to-interface.patch
diff --git a/connectivity/dhcp/centos/files/dhclient-ipv6-conditionally-set-hostname.patch b/base/dhcp/centos/files/dhclient-ipv6-conditionally-set-hostname.patch
similarity index 100%
rename from connectivity/dhcp/centos/files/dhclient-ipv6-conditionally-set-hostname.patch
rename to base/dhcp/centos/files/dhclient-ipv6-conditionally-set-hostname.patch
diff --git a/connectivity/dhcp/centos/files/dhclient-restrict-interfaces-to-command-line.patch b/base/dhcp/centos/files/dhclient-restrict-interfaces-to-command-line.patch
similarity index 100%
rename from connectivity/dhcp/centos/files/dhclient-restrict-interfaces-to-command-line.patch
rename to base/dhcp/centos/files/dhclient-restrict-interfaces-to-command-line.patch
diff --git a/connectivity/dhcp/centos/files/dhclient.conf b/base/dhcp/centos/files/dhclient.conf
similarity index 100%
rename from connectivity/dhcp/centos/files/dhclient.conf
rename to base/dhcp/centos/files/dhclient.conf
diff --git a/connectivity/dhcp/centos/files/dhcp-handle-default-classless-static-route.patch b/base/dhcp/centos/files/dhcp-handle-default-classless-static-route.patch
similarity index 100%
rename from connectivity/dhcp/centos/files/dhcp-handle-default-classless-static-route.patch
rename to base/dhcp/centos/files/dhcp-handle-default-classless-static-route.patch
diff --git a/connectivity/dhcp/centos/files/site.h b/base/dhcp/centos/files/site.h
similarity index 100%
rename from connectivity/dhcp/centos/files/site.h
rename to base/dhcp/centos/files/site.h
diff --git a/connectivity/dhcp/centos/files/support-disable-nsupdate.patch b/base/dhcp/centos/files/support-disable-nsupdate.patch
similarity index 100%
rename from connectivity/dhcp/centos/files/support-disable-nsupdate.patch
rename to base/dhcp/centos/files/support-disable-nsupdate.patch
diff --git a/connectivity/dhcp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/dhcp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from connectivity/dhcp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/dhcp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/connectivity/dhcp/centos/meta_patches/PATCH_ORDER b/base/dhcp/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from connectivity/dhcp/centos/meta_patches/PATCH_ORDER
rename to base/dhcp/centos/meta_patches/PATCH_ORDER
diff --git a/connectivity/dhcp/centos/meta_patches/dhclient-dhcp6-set-hostname.patch b/base/dhcp/centos/meta_patches/dhclient-dhcp6-set-hostname.patch
similarity index 100%
rename from connectivity/dhcp/centos/meta_patches/dhclient-dhcp6-set-hostname.patch
rename to base/dhcp/centos/meta_patches/dhclient-dhcp6-set-hostname.patch
diff --git a/connectivity/dhcp/centos/meta_patches/dhclient-disable-NSUPDATE.patch b/base/dhcp/centos/meta_patches/dhclient-disable-NSUPDATE.patch
similarity index 100%
rename from connectivity/dhcp/centos/meta_patches/dhclient-disable-NSUPDATE.patch
rename to base/dhcp/centos/meta_patches/dhclient-disable-NSUPDATE.patch
diff --git a/connectivity/dhcp/centos/meta_patches/mark-dhclient.conf-as-config.patch b/base/dhcp/centos/meta_patches/mark-dhclient.conf-as-config.patch
similarity index 100%
rename from connectivity/dhcp/centos/meta_patches/mark-dhclient.conf-as-config.patch
rename to base/dhcp/centos/meta_patches/mark-dhclient.conf-as-config.patch
diff --git a/connectivity/dhcp/centos/meta_patches/remove-unecessary-dhcp-exit-hooks-file.patch b/base/dhcp/centos/meta_patches/remove-unecessary-dhcp-exit-hooks-file.patch
similarity index 100%
rename from connectivity/dhcp/centos/meta_patches/remove-unecessary-dhcp-exit-hooks-file.patch
rename to base/dhcp/centos/meta_patches/remove-unecessary-dhcp-exit-hooks-file.patch
diff --git a/connectivity/dhcp/centos/meta_patches/spec-dhcp-enter-hooks.patch b/base/dhcp/centos/meta_patches/spec-dhcp-enter-hooks.patch
similarity index 100%
rename from connectivity/dhcp/centos/meta_patches/spec-dhcp-enter-hooks.patch
rename to base/dhcp/centos/meta_patches/spec-dhcp-enter-hooks.patch
diff --git a/connectivity/dhcp/centos/meta_patches/spec-include-TiS-patches.patch b/base/dhcp/centos/meta_patches/spec-include-TiS-patches.patch
similarity index 100%
rename from connectivity/dhcp/centos/meta_patches/spec-include-TiS-patches.patch
rename to base/dhcp/centos/meta_patches/spec-include-TiS-patches.patch
diff --git a/connectivity/dhcp/centos/srpm_path b/base/dhcp/centos/srpm_path
similarity index 100%
rename from connectivity/dhcp/centos/srpm_path
rename to base/dhcp/centos/srpm_path
diff --git a/core/initscripts/PKG-INFO b/base/initscripts/PKG-INFO
similarity index 100%
rename from core/initscripts/PKG-INFO
rename to base/initscripts/PKG-INFO
diff --git a/base/initscripts/centos/build_srpm.data b/base/initscripts/centos/build_srpm.data
new file mode 100644
index 000000000..85ff151d9
--- /dev/null
+++ b/base/initscripts/centos/build_srpm.data
@@ -0,0 +1,2 @@
+COPY_LIST="$FILES_BASE/* $GIT_BASE/base/procps/files/sysctl.conf"
+TIS_PATCH_VER=16
diff --git a/core/initscripts/centos/files/mountnfs.service b/base/initscripts/centos/files/mountnfs.service
similarity index 100%
rename from core/initscripts/centos/files/mountnfs.service
rename to base/initscripts/centos/files/mountnfs.service
diff --git a/core/initscripts/centos/files/mountnfs.sh b/base/initscripts/centos/files/mountnfs.sh
similarity index 100%
rename from core/initscripts/centos/files/mountnfs.sh
rename to base/initscripts/centos/files/mountnfs.sh
diff --git a/core/initscripts/centos/meta_patches/0001-Disable-zeroconf-route.patch b/base/initscripts/centos/meta_patches/0001-Disable-zeroconf-route.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/0001-Disable-zeroconf-route.patch
rename to base/initscripts/centos/meta_patches/0001-Disable-zeroconf-route.patch
diff --git a/core/initscripts/centos/meta_patches/0001-Fix-Interfaces-intermittenly-do-not-come-up-on-boot.patch b/base/initscripts/centos/meta_patches/0001-Fix-Interfaces-intermittenly-do-not-come-up-on-boot.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/0001-Fix-Interfaces-intermittenly-do-not-come-up-on-boot.patch
rename to base/initscripts/centos/meta_patches/0001-Fix-Interfaces-intermittenly-do-not-come-up-on-boot.patch
diff --git a/core/initscripts/centos/meta_patches/0001-Support-PROMISC-for-interfaces-config.patch b/base/initscripts/centos/meta_patches/0001-Support-PROMISC-for-interfaces-config.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/0001-Support-PROMISC-for-interfaces-config.patch
rename to base/initscripts/centos/meta_patches/0001-Support-PROMISC-for-interfaces-config.patch
diff --git a/core/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/core/initscripts/centos/meta_patches/PATCH_ORDER b/base/initscripts/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from core/initscripts/centos/meta_patches/PATCH_ORDER
rename to base/initscripts/centos/meta_patches/PATCH_ORDER
diff --git a/core/initscripts/centos/meta_patches/add_build_require_on_systemd.patch b/base/initscripts/centos/meta_patches/add_build_require_on_systemd.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/add_build_require_on_systemd.patch
rename to base/initscripts/centos/meta_patches/add_build_require_on_systemd.patch
diff --git a/core/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch b/base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
rename to base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
diff --git a/core/initscripts/centos/meta_patches/force-delay-check-link-down.patch b/base/initscripts/centos/meta_patches/force-delay-check-link-down.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/force-delay-check-link-down.patch
rename to base/initscripts/centos/meta_patches/force-delay-check-link-down.patch
diff --git a/core/initscripts/centos/meta_patches/ipv6-static-route-support.patch b/base/initscripts/centos/meta_patches/ipv6-static-route-support.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/ipv6-static-route-support.patch
rename to base/initscripts/centos/meta_patches/ipv6-static-route-support.patch
diff --git a/core/initscripts/centos/meta_patches/run-ifdown-on-all-interfaces.patch b/base/initscripts/centos/meta_patches/run-ifdown-on-all-interfaces.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/run-ifdown-on-all-interfaces.patch
rename to base/initscripts/centos/meta_patches/run-ifdown-on-all-interfaces.patch
diff --git a/core/initscripts/centos/meta_patches/spec-add-mountnfs-init-script.patch b/base/initscripts/centos/meta_patches/spec-add-mountnfs-init-script.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/spec-add-mountnfs-init-script.patch
rename to base/initscripts/centos/meta_patches/spec-add-mountnfs-init-script.patch
diff --git a/core/initscripts/centos/meta_patches/spec-ifup-eth-stop-waiting-if-link-is-up.patch b/base/initscripts/centos/meta_patches/spec-ifup-eth-stop-waiting-if-link-is-up.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/spec-ifup-eth-stop-waiting-if-link-is-up.patch
rename to base/initscripts/centos/meta_patches/spec-ifup-eth-stop-waiting-if-link-is-up.patch
diff --git a/core/initscripts/centos/meta_patches/spec-include-TiS-changes.patch b/base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/spec-include-TiS-changes.patch
rename to base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch
diff --git a/core/initscripts/centos/meta_patches/spec-run-dhclient-as-daemon-for-ipv6.patch b/base/initscripts/centos/meta_patches/spec-run-dhclient-as-daemon-for-ipv6.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/spec-run-dhclient-as-daemon-for-ipv6.patch
rename to base/initscripts/centos/meta_patches/spec-run-dhclient-as-daemon-for-ipv6.patch
diff --git a/core/initscripts/centos/meta_patches/spec-sysconfig-affirmative-check-for-link-carrier.patch b/base/initscripts/centos/meta_patches/spec-sysconfig-affirmative-check-for-link-carrier.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/spec-sysconfig-affirmative-check-for-link-carrier.patch
rename to base/initscripts/centos/meta_patches/spec-sysconfig-affirmative-check-for-link-carrier.patch
diff --git a/core/initscripts/centos/meta_patches/spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch b/base/initscripts/centos/meta_patches/spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch
rename to base/initscripts/centos/meta_patches/spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch
diff --git a/core/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch b/base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch
similarity index 100%
rename from core/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch
rename to base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch
diff --git a/core/initscripts/centos/patches/0001-dhclient-remove-1-arg.patch b/base/initscripts/centos/patches/0001-dhclient-remove-1-arg.patch
similarity index 100%
rename from core/initscripts/centos/patches/0001-dhclient-remove-1-arg.patch
rename to base/initscripts/centos/patches/0001-dhclient-remove-1-arg.patch
diff --git a/core/initscripts/centos/patches/0001-force-delay-check-link-down.patch b/base/initscripts/centos/patches/0001-force-delay-check-link-down.patch
similarity index 100%
rename from core/initscripts/centos/patches/0001-force-delay-check-link-down.patch
rename to base/initscripts/centos/patches/0001-force-delay-check-link-down.patch
diff --git a/core/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch b/base/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch
similarity index 100%
rename from core/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch
rename to base/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch
diff --git a/core/initscripts/centos/patches/ifup-eth-stop-waiting-if-link-is-up.patch b/base/initscripts/centos/patches/ifup-eth-stop-waiting-if-link-is-up.patch
similarity index 100%
rename from core/initscripts/centos/patches/ifup-eth-stop-waiting-if-link-is-up.patch
rename to base/initscripts/centos/patches/ifup-eth-stop-waiting-if-link-is-up.patch
diff --git a/core/initscripts/centos/patches/ipv6-static-route-support.patch b/base/initscripts/centos/patches/ipv6-static-route-support.patch
similarity index 100%
rename from core/initscripts/centos/patches/ipv6-static-route-support.patch
rename to base/initscripts/centos/patches/ipv6-static-route-support.patch
diff --git a/core/initscripts/centos/patches/relocate-dhclient-leases-to-var-run.patch b/base/initscripts/centos/patches/relocate-dhclient-leases-to-var-run.patch
similarity index 100%
rename from core/initscripts/centos/patches/relocate-dhclient-leases-to-var-run.patch
rename to base/initscripts/centos/patches/relocate-dhclient-leases-to-var-run.patch
diff --git a/core/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch b/base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch
similarity index 100%
rename from core/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch
rename to base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch
diff --git a/core/initscripts/centos/patches/run-ifdown-on-all-interfaces.patch b/base/initscripts/centos/patches/run-ifdown-on-all-interfaces.patch
similarity index 100%
rename from core/initscripts/centos/patches/run-ifdown-on-all-interfaces.patch
rename to base/initscripts/centos/patches/run-ifdown-on-all-interfaces.patch
diff --git a/core/initscripts/centos/patches/support-interface-promisc.patch b/base/initscripts/centos/patches/support-interface-promisc.patch
similarity index 100%
rename from core/initscripts/centos/patches/support-interface-promisc.patch
rename to base/initscripts/centos/patches/support-interface-promisc.patch
diff --git a/core/initscripts/centos/patches/support-interface-scriptlets.patch b/base/initscripts/centos/patches/support-interface-scriptlets.patch
similarity index 100%
rename from core/initscripts/centos/patches/support-interface-scriptlets.patch
rename to base/initscripts/centos/patches/support-interface-scriptlets.patch
diff --git a/core/initscripts/centos/patches/sysconfig-affirmative-check-for-link-carrier.patch b/base/initscripts/centos/patches/sysconfig-affirmative-check-for-link-carrier.patch
similarity index 100%
rename from core/initscripts/centos/patches/sysconfig-affirmative-check-for-link-carrier.patch
rename to base/initscripts/centos/patches/sysconfig-affirmative-check-for-link-carrier.patch
diff --git a/core/initscripts/centos/patches/sysconfig-unsafe-usage-of-linkdelay-variable.patch b/base/initscripts/centos/patches/sysconfig-unsafe-usage-of-linkdelay-variable.patch
similarity index 100%
rename from core/initscripts/centos/patches/sysconfig-unsafe-usage-of-linkdelay-variable.patch
rename to base/initscripts/centos/patches/sysconfig-unsafe-usage-of-linkdelay-variable.patch
diff --git a/core/initscripts/centos/srpm_path b/base/initscripts/centos/srpm_path
similarity index 100%
rename from core/initscripts/centos/srpm_path
rename to base/initscripts/centos/srpm_path
diff --git a/support/libevent/.gitignore b/base/libevent/.gitignore
similarity index 100%
rename from support/libevent/.gitignore
rename to base/libevent/.gitignore
diff --git a/support/libevent/PKG-INFO b/base/libevent/PKG-INFO
similarity index 100%
rename from support/libevent/PKG-INFO
rename to base/libevent/PKG-INFO
diff --git a/extended/watchdog/centos/build_srpm.data b/base/libevent/centos/build_srpm.data
similarity index 100%
rename from extended/watchdog/centos/build_srpm.data
rename to base/libevent/centos/build_srpm.data
diff --git a/support/libevent/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/libevent/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from support/libevent/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/libevent/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/support/libevent/centos/meta_patches/PATCH_ORDER b/base/libevent/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from support/libevent/centos/meta_patches/PATCH_ORDER
rename to base/libevent/centos/meta_patches/PATCH_ORDER
diff --git a/support/libevent/centos/meta_patches/spec-include-TiS-patches.patch b/base/libevent/centos/meta_patches/spec-include-TiS-patches.patch
similarity index 100%
rename from support/libevent/centos/meta_patches/spec-include-TiS-patches.patch
rename to base/libevent/centos/meta_patches/spec-include-TiS-patches.patch
diff --git a/support/libevent/centos/srpm_path b/base/libevent/centos/srpm_path
similarity index 100%
rename from support/libevent/centos/srpm_path
rename to base/libevent/centos/srpm_path
diff --git a/support/libevent/files/libevent-disable-tests.patch b/base/libevent/files/libevent-disable-tests.patch
similarity index 100%
rename from support/libevent/files/libevent-disable-tests.patch
rename to base/libevent/files/libevent-disable-tests.patch
diff --git a/support/libevent/files/libevent-ipv6-client-socket.patch b/base/libevent/files/libevent-ipv6-client-socket.patch
similarity index 100%
rename from support/libevent/files/libevent-ipv6-client-socket.patch
rename to base/libevent/files/libevent-ipv6-client-socket.patch
diff --git a/extended/lighttpd/PKG-INFO b/base/lighttpd/PKG-INFO
similarity index 100%
rename from extended/lighttpd/PKG-INFO
rename to base/lighttpd/PKG-INFO
diff --git a/extended/lighttpd/centos/build_srpm.data b/base/lighttpd/centos/build_srpm.data
similarity index 100%
rename from extended/lighttpd/centos/build_srpm.data
rename to base/lighttpd/centos/build_srpm.data
diff --git a/extended/lighttpd/centos/meta_patches/0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch b/base/lighttpd/centos/meta_patches/0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch
similarity index 100%
rename from extended/lighttpd/centos/meta_patches/0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch
rename to base/lighttpd/centos/meta_patches/0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch
diff --git a/extended/lighttpd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/lighttpd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/lighttpd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/lighttpd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/lighttpd/centos/meta_patches/PATCH_ORDER b/base/lighttpd/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/lighttpd/centos/meta_patches/PATCH_ORDER
rename to base/lighttpd/centos/meta_patches/PATCH_ORDER
diff --git a/extended/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch b/base/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch
similarity index 100%
rename from extended/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch
rename to base/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch
diff --git a/extended/lighttpd/centos/meta_patches/spec-check-content-length.patch b/base/lighttpd/centos/meta_patches/spec-check-content-length.patch
similarity index 100%
rename from extended/lighttpd/centos/meta_patches/spec-check-content-length.patch
rename to base/lighttpd/centos/meta_patches/spec-check-content-length.patch
diff --git a/extended/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch b/base/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch
similarity index 100%
rename from extended/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch
rename to base/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch
diff --git a/extended/lighttpd/centos/srpm_path b/base/lighttpd/centos/srpm_path
similarity index 100%
rename from extended/lighttpd/centos/srpm_path
rename to base/lighttpd/centos/srpm_path
diff --git a/extended/lighttpd/lighttpd-1.4.35/check-content-length.patch b/base/lighttpd/lighttpd-1.4.35/check-content-length.patch
similarity index 100%
rename from extended/lighttpd/lighttpd-1.4.35/check-content-length.patch
rename to base/lighttpd/lighttpd-1.4.35/check-content-length.patch
diff --git a/extended/lighttpd/lighttpd-1.4.35/index.html.lighttpd b/base/lighttpd/lighttpd-1.4.35/index.html.lighttpd
similarity index 100%
rename from extended/lighttpd/lighttpd-1.4.35/index.html.lighttpd
rename to base/lighttpd/lighttpd-1.4.35/index.html.lighttpd
diff --git a/extended/lighttpd/lighttpd-1.4.35/lighttpd-csr.conf b/base/lighttpd/lighttpd-1.4.35/lighttpd-csr.conf
similarity index 100%
rename from extended/lighttpd/lighttpd-1.4.35/lighttpd-csr.conf
rename to base/lighttpd/lighttpd-1.4.35/lighttpd-csr.conf
diff --git a/extended/lighttpd/lighttpd-1.4.35/lighttpd-inc.conf b/base/lighttpd/lighttpd-1.4.35/lighttpd-inc.conf
similarity index 100%
rename from extended/lighttpd/lighttpd-1.4.35/lighttpd-inc.conf
rename to base/lighttpd/lighttpd-1.4.35/lighttpd-inc.conf
diff --git a/extended/lighttpd/lighttpd-1.4.35/lighttpd-tpm-support.patch b/base/lighttpd/lighttpd-1.4.35/lighttpd-tpm-support.patch
similarity index 100%
rename from extended/lighttpd/lighttpd-1.4.35/lighttpd-tpm-support.patch
rename to base/lighttpd/lighttpd-1.4.35/lighttpd-tpm-support.patch
diff --git a/extended/lighttpd/lighttpd-1.4.35/lighttpd.conf b/base/lighttpd/lighttpd-1.4.35/lighttpd.conf
similarity index 100%
rename from extended/lighttpd/lighttpd-1.4.35/lighttpd.conf
rename to base/lighttpd/lighttpd-1.4.35/lighttpd.conf
diff --git a/extended/lighttpd/lighttpd-1.4.35/lighttpd.init b/base/lighttpd/lighttpd-1.4.35/lighttpd.init
similarity index 100%
rename from extended/lighttpd/lighttpd-1.4.35/lighttpd.init
rename to base/lighttpd/lighttpd-1.4.35/lighttpd.init
diff --git a/extended/lighttpd/lighttpd-1.4.35/lighttpd.logrotate b/base/lighttpd/lighttpd-1.4.35/lighttpd.logrotate
similarity index 100%
rename from extended/lighttpd/lighttpd-1.4.35/lighttpd.logrotate
rename to base/lighttpd/lighttpd-1.4.35/lighttpd.logrotate
diff --git a/extended/lighttpd/lighttpd-1.4.35/remote-ip-ipv6-support.patch b/base/lighttpd/lighttpd-1.4.35/remote-ip-ipv6-support.patch
similarity index 100%
rename from extended/lighttpd/lighttpd-1.4.35/remote-ip-ipv6-support.patch
rename to base/lighttpd/lighttpd-1.4.35/remote-ip-ipv6-support.patch
diff --git a/devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/build_srpm.data b/base/memcached/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/build_srpm.data
rename to base/memcached/centos/build_srpm.data
diff --git a/extended/memcached/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/memcached/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/memcached/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/memcached/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/memcached/centos/meta_patches/0002-always-restart-memcached-service.patch b/base/memcached/centos/meta_patches/0002-always-restart-memcached-service.patch
similarity index 100%
rename from extended/memcached/centos/meta_patches/0002-always-restart-memcached-service.patch
rename to base/memcached/centos/meta_patches/0002-always-restart-memcached-service.patch
diff --git a/extended/memcached/centos/meta_patches/0003-Add-dependencies-and-comment-out-incompatible-servic.patch b/base/memcached/centos/meta_patches/0003-Add-dependencies-and-comment-out-incompatible-servic.patch
similarity index 100%
rename from extended/memcached/centos/meta_patches/0003-Add-dependencies-and-comment-out-incompatible-servic.patch
rename to base/memcached/centos/meta_patches/0003-Add-dependencies-and-comment-out-incompatible-servic.patch
diff --git a/extended/memcached/centos/meta_patches/PATCH_ORDER b/base/memcached/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/memcached/centos/meta_patches/PATCH_ORDER
rename to base/memcached/centos/meta_patches/PATCH_ORDER
diff --git a/extended/memcached/centos/patches/0002-always-restart-memcached-service.patch b/base/memcached/centos/patches/0002-always-restart-memcached-service.patch
similarity index 100%
rename from extended/memcached/centos/patches/0002-always-restart-memcached-service.patch
rename to base/memcached/centos/patches/0002-always-restart-memcached-service.patch
diff --git a/extended/memcached/centos/patches/0003-Add-dependencies-and-comment-out-incompatible-servic.patch b/base/memcached/centos/patches/0003-Add-dependencies-and-comment-out-incompatible-servic.patch
similarity index 100%
rename from extended/memcached/centos/patches/0003-Add-dependencies-and-comment-out-incompatible-servic.patch
rename to base/memcached/centos/patches/0003-Add-dependencies-and-comment-out-incompatible-servic.patch
diff --git a/extended/memcached/centos/srpm_path b/base/memcached/centos/srpm_path
similarity index 100%
rename from extended/memcached/centos/srpm_path
rename to base/memcached/centos/srpm_path
diff --git a/networking/net-snmp/PKG-INFO b/base/net-snmp/PKG-INFO
similarity index 100%
rename from networking/net-snmp/PKG-INFO
rename to base/net-snmp/PKG-INFO
diff --git a/networking/net-snmp/centos/build_srpm.data b/base/net-snmp/centos/build_srpm.data
similarity index 100%
rename from networking/net-snmp/centos/build_srpm.data
rename to base/net-snmp/centos/build_srpm.data
diff --git a/networking/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/networking/net-snmp/centos/meta_patches/PATCH_ORDER b/base/net-snmp/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/PATCH_ORDER
rename to base/net-snmp/centos/meta_patches/PATCH_ORDER
diff --git a/networking/net-snmp/centos/meta_patches/fix-snmpd-initscript.patch b/base/net-snmp/centos/meta_patches/fix-snmpd-initscript.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/fix-snmpd-initscript.patch
rename to base/net-snmp/centos/meta_patches/fix-snmpd-initscript.patch
diff --git a/networking/net-snmp/centos/meta_patches/fix-snmpd-service-reload.patch b/base/net-snmp/centos/meta_patches/fix-snmpd-service-reload.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/fix-snmpd-service-reload.patch
rename to base/net-snmp/centos/meta_patches/fix-snmpd-service-reload.patch
diff --git a/networking/net-snmp/centos/meta_patches/fix-snmpd-service.patch b/base/net-snmp/centos/meta_patches/fix-snmpd-service.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/fix-snmpd-service.patch
rename to base/net-snmp/centos/meta_patches/fix-snmpd-service.patch
diff --git a/networking/net-snmp/centos/meta_patches/run-snmpd-as-non-root-user.patch b/base/net-snmp/centos/meta_patches/run-snmpd-as-non-root-user.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/run-snmpd-as-non-root-user.patch
rename to base/net-snmp/centos/meta_patches/run-snmpd-as-non-root-user.patch
diff --git a/networking/net-snmp/centos/meta_patches/snmp-spec-add-init-script.patch b/base/net-snmp/centos/meta_patches/snmp-spec-add-init-script.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/snmp-spec-add-init-script.patch
rename to base/net-snmp/centos/meta_patches/snmp-spec-add-init-script.patch
diff --git a/networking/net-snmp/centos/meta_patches/snmp-spec-add-snmp-config.patch b/base/net-snmp/centos/meta_patches/snmp-spec-add-snmp-config.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/snmp-spec-add-snmp-config.patch
rename to base/net-snmp/centos/meta_patches/snmp-spec-add-snmp-config.patch
diff --git a/networking/net-snmp/centos/meta_patches/snmp-spec-config-file-permission.patch b/base/net-snmp/centos/meta_patches/snmp-spec-config-file-permission.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/snmp-spec-config-file-permission.patch
rename to base/net-snmp/centos/meta_patches/snmp-spec-config-file-permission.patch
diff --git a/networking/net-snmp/centos/meta_patches/snmpd-service-OPTIONS.patch b/base/net-snmp/centos/meta_patches/snmpd-service-OPTIONS.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/snmpd-service-OPTIONS.patch
rename to base/net-snmp/centos/meta_patches/snmpd-service-OPTIONS.patch
diff --git a/networking/net-snmp/centos/meta_patches/spec-add-rpm-headerGetEntry-fix.patch b/base/net-snmp/centos/meta_patches/spec-add-rpm-headerGetEntry-fix.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/spec-add-rpm-headerGetEntry-fix.patch
rename to base/net-snmp/centos/meta_patches/spec-add-rpm-headerGetEntry-fix.patch
diff --git a/networking/net-snmp/centos/meta_patches/spec-configure-without-HOST-RESOURCES-MIB.patch b/base/net-snmp/centos/meta_patches/spec-configure-without-HOST-RESOURCES-MIB.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/spec-configure-without-HOST-RESOURCES-MIB.patch
rename to base/net-snmp/centos/meta_patches/spec-configure-without-HOST-RESOURCES-MIB.patch
diff --git a/networking/net-snmp/centos/meta_patches/spec-include-TiS-patches.patch b/base/net-snmp/centos/meta_patches/spec-include-TiS-patches.patch
similarity index 100%
rename from networking/net-snmp/centos/meta_patches/spec-include-TiS-patches.patch
rename to base/net-snmp/centos/meta_patches/spec-include-TiS-patches.patch
diff --git a/networking/net-snmp/centos/srpm_path b/base/net-snmp/centos/srpm_path
similarity index 100%
rename from networking/net-snmp/centos/srpm_path
rename to base/net-snmp/centos/srpm_path
diff --git a/networking/net-snmp/files/snmp.conf.cgcs b/base/net-snmp/files/snmp.conf.cgcs
similarity index 100%
rename from networking/net-snmp/files/snmp.conf.cgcs
rename to base/net-snmp/files/snmp.conf.cgcs
diff --git a/networking/net-snmp/files/snmpd.cgcs b/base/net-snmp/files/snmpd.cgcs
similarity index 100%
rename from networking/net-snmp/files/snmpd.cgcs
rename to base/net-snmp/files/snmpd.cgcs
diff --git a/networking/net-snmp/files/snmpd.conf.cgcs b/base/net-snmp/files/snmpd.conf.cgcs
similarity index 100%
rename from networking/net-snmp/files/snmpd.conf.cgcs
rename to base/net-snmp/files/snmpd.conf.cgcs
diff --git a/networking/net-snmp/patches/0001-rpm-headerGetEntry.patch b/base/net-snmp/patches/0001-rpm-headerGetEntry.patch
similarity index 100%
rename from networking/net-snmp/patches/0001-rpm-headerGetEntry.patch
rename to base/net-snmp/patches/0001-rpm-headerGetEntry.patch
diff --git a/devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/build_srpm.data b/base/novnc/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/build_srpm.data
rename to base/novnc/centos/build_srpm.data
diff --git a/extended/novnc/centos/meta_patches/0001-Update-package-0.6.2-versioning-for-TIS-format.patch b/base/novnc/centos/meta_patches/0001-Update-package-0.6.2-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/novnc/centos/meta_patches/0001-Update-package-0.6.2-versioning-for-TIS-format.patch
rename to base/novnc/centos/meta_patches/0001-Update-package-0.6.2-versioning-for-TIS-format.patch
diff --git a/extended/novnc/centos/meta_patches/PATCH_ORDER b/base/novnc/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/novnc/centos/meta_patches/PATCH_ORDER
rename to base/novnc/centos/meta_patches/PATCH_ORDER
diff --git a/extended/novnc/centos/srpm_path b/base/novnc/centos/srpm_path
similarity index 100%
rename from extended/novnc/centos/srpm_path
rename to base/novnc/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/build_srpm.data b/base/ntp/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/build_srpm.data
rename to base/ntp/centos/build_srpm.data
diff --git a/extended/ntp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/ntp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/ntp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/ntp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/ntp/centos/meta_patches/PATCH_ORDER b/base/ntp/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/ntp/centos/meta_patches/PATCH_ORDER
rename to base/ntp/centos/meta_patches/PATCH_ORDER
diff --git a/extended/ntp/centos/meta_patches/ntp-spec-add-TiS-custom-config-files.patch b/base/ntp/centos/meta_patches/ntp-spec-add-TiS-custom-config-files.patch
similarity index 100%
rename from extended/ntp/centos/meta_patches/ntp-spec-add-TiS-custom-config-files.patch
rename to base/ntp/centos/meta_patches/ntp-spec-add-TiS-custom-config-files.patch
diff --git a/extended/ntp/centos/meta_patches/ntpd-started-no-g-option.patch b/base/ntp/centos/meta_patches/ntpd-started-no-g-option.patch
similarity index 100%
rename from extended/ntp/centos/meta_patches/ntpd-started-no-g-option.patch
rename to base/ntp/centos/meta_patches/ntpd-started-no-g-option.patch
diff --git a/extended/ntp/centos/patches/ntp-cgcs.conf b/base/ntp/centos/patches/ntp-cgcs.conf
similarity index 100%
rename from extended/ntp/centos/patches/ntp-cgcs.conf
rename to base/ntp/centos/patches/ntp-cgcs.conf
diff --git a/extended/ntp/centos/srpm_path b/base/ntp/centos/srpm_path
similarity index 100%
rename from extended/ntp/centos/srpm_path
rename to base/ntp/centos/srpm_path
diff --git a/extended/ntp/ntp-4.2.6p5/ntp-cgcs.conf b/base/ntp/ntp-4.2.6p5/ntp-cgcs.conf
similarity index 100%
rename from extended/ntp/ntp-4.2.6p5/ntp-cgcs.conf
rename to base/ntp/ntp-4.2.6p5/ntp-cgcs.conf
diff --git a/extended/ntp/ntp-4.2.6p5/ntpd b/base/ntp/ntp-4.2.6p5/ntpd
similarity index 100%
rename from extended/ntp/ntp-4.2.6p5/ntpd
rename to base/ntp/ntp-4.2.6p5/ntpd
diff --git a/extended/ntp/ntp-4.2.8p6/ntp-cgcs.conf b/base/ntp/ntp-4.2.8p6/ntp-cgcs.conf
similarity index 100%
rename from extended/ntp/ntp-4.2.8p6/ntp-cgcs.conf
rename to base/ntp/ntp-4.2.8p6/ntp-cgcs.conf
diff --git a/extended/ntp/ntp-4.2.8p6/ntpd b/base/ntp/ntp-4.2.8p6/ntpd
similarity index 100%
rename from extended/ntp/ntp-4.2.8p6/ntpd
rename to base/ntp/ntp-4.2.8p6/ntpd
diff --git a/connectivity/openssh/PKG-INFO b/base/openssh/PKG-INFO
similarity index 100%
rename from connectivity/openssh/PKG-INFO
rename to base/openssh/PKG-INFO
diff --git a/connectivity/openssh/centos/build_srpm.data b/base/openssh/centos/build_srpm.data
similarity index 100%
rename from connectivity/openssh/centos/build_srpm.data
rename to base/openssh/centos/build_srpm.data
diff --git a/connectivity/openssh/centos/meta_patches/0001-Further-parallelize-openssh-build.patch b/base/openssh/centos/meta_patches/0001-Further-parallelize-openssh-build.patch
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/0001-Further-parallelize-openssh-build.patch
rename to base/openssh/centos/meta_patches/0001-Further-parallelize-openssh-build.patch
diff --git a/connectivity/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/openssh/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/connectivity/openssh/centos/meta_patches/PATCH_ORDER b/base/openssh/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/PATCH_ORDER
rename to base/openssh/centos/meta_patches/PATCH_ORDER
diff --git a/connectivity/openssh/centos/meta_patches/openssh-init-script-kill-old-instances-on-start.patch b/base/openssh/centos/meta_patches/openssh-init-script-kill-old-instances-on-start.patch
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/openssh-init-script-kill-old-instances-on-start.patch
rename to base/openssh/centos/meta_patches/openssh-init-script-kill-old-instances-on-start.patch
diff --git a/connectivity/openssh/centos/meta_patches/openssh-service-file.patch b/base/openssh/centos/meta_patches/openssh-service-file.patch
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/openssh-service-file.patch
rename to base/openssh/centos/meta_patches/openssh-service-file.patch
diff --git a/connectivity/openssh/centos/meta_patches/openssh-spec-file-add-init.patch b/base/openssh/centos/meta_patches/openssh-spec-file-add-init.patch
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/openssh-spec-file-add-init.patch
rename to base/openssh/centos/meta_patches/openssh-spec-file-add-init.patch
diff --git a/connectivity/openssh/centos/meta_patches/spec-harden-server-and-client-config.patch b/base/openssh/centos/meta_patches/spec-harden-server-and-client-config.patch
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/spec-harden-server-and-client-config.patch
rename to base/openssh/centos/meta_patches/spec-harden-server-and-client-config.patch
diff --git a/connectivity/openssh/centos/meta_patches/spec-include-TiS-config-files.patch b/base/openssh/centos/meta_patches/spec-include-TiS-config-files.patch
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/spec-include-TiS-config-files.patch
rename to base/openssh/centos/meta_patches/spec-include-TiS-config-files.patch
diff --git a/connectivity/openssh/centos/meta_patches/spec-remove-TC-config-files.patch b/base/openssh/centos/meta_patches/spec-remove-TC-config-files.patch
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/spec-remove-TC-config-files.patch
rename to base/openssh/centos/meta_patches/spec-remove-TC-config-files.patch
diff --git a/connectivity/openssh/centos/meta_patches/sshd-pam-use-common-includes.patch b/base/openssh/centos/meta_patches/sshd-pam-use-common-includes.patch
similarity index 100%
rename from connectivity/openssh/centos/meta_patches/sshd-pam-use-common-includes.patch
rename to base/openssh/centos/meta_patches/sshd-pam-use-common-includes.patch
diff --git a/connectivity/openssh/centos/patches/harden-server-and-client-config.patch b/base/openssh/centos/patches/harden-server-and-client-config.patch
similarity index 100%
rename from connectivity/openssh/centos/patches/harden-server-and-client-config.patch
rename to base/openssh/centos/patches/harden-server-and-client-config.patch
diff --git a/connectivity/openssh/centos/srpm_path b/base/openssh/centos/srpm_path
similarity index 100%
rename from connectivity/openssh/centos/srpm_path
rename to base/openssh/centos/srpm_path
diff --git a/extended/pam/centos/build_srpm.data b/base/pam/centos/build_srpm.data
similarity index 100%
rename from extended/pam/centos/build_srpm.data
rename to base/pam/centos/build_srpm.data
diff --git a/extended/pam/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/pam/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/pam/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/pam/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/pam/centos/meta_patches/PATCH_ORDER b/base/pam/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/pam/centos/meta_patches/PATCH_ORDER
rename to base/pam/centos/meta_patches/PATCH_ORDER
diff --git a/extended/pam/centos/meta_patches/pam-spec-add-custome-config-files.patch b/base/pam/centos/meta_patches/pam-spec-add-custome-config-files.patch
similarity index 100%
rename from extended/pam/centos/meta_patches/pam-spec-add-custome-config-files.patch
rename to base/pam/centos/meta_patches/pam-spec-add-custome-config-files.patch
diff --git a/extended/pam/centos/srpm_path b/base/pam/centos/srpm_path
similarity index 100%
rename from extended/pam/centos/srpm_path
rename to base/pam/centos/srpm_path
diff --git a/extended/pam/files/pam.d/common-account b/base/pam/files/pam.d/common-account
similarity index 100%
rename from extended/pam/files/pam.d/common-account
rename to base/pam/files/pam.d/common-account
diff --git a/extended/pam/files/pam.d/common-auth b/base/pam/files/pam.d/common-auth
similarity index 100%
rename from extended/pam/files/pam.d/common-auth
rename to base/pam/files/pam.d/common-auth
diff --git a/extended/pam/files/pam.d/common-password b/base/pam/files/pam.d/common-password
similarity index 100%
rename from extended/pam/files/pam.d/common-password
rename to base/pam/files/pam.d/common-password
diff --git a/extended/pam/files/pam.d/common-session b/base/pam/files/pam.d/common-session
similarity index 100%
rename from extended/pam/files/pam.d/common-session
rename to base/pam/files/pam.d/common-session
diff --git a/extended/pam/files/pam.d/common-session-noninteractive b/base/pam/files/pam.d/common-session-noninteractive
similarity index 100%
rename from extended/pam/files/pam.d/common-session-noninteractive
rename to base/pam/files/pam.d/common-session-noninteractive
diff --git a/extended/pam/files/pam.d/system-auth.pamd b/base/pam/files/pam.d/system-auth.pamd
similarity index 100%
rename from extended/pam/files/pam.d/system-auth.pamd
rename to base/pam/files/pam.d/system-auth.pamd
diff --git a/extended/procps/files/sysctl.conf b/base/procps/files/sysctl.conf
similarity index 100%
rename from extended/procps/files/sysctl.conf
rename to base/procps/files/sysctl.conf
diff --git a/devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/build_srpm.data b/base/sanlock/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/build_srpm.data
rename to base/sanlock/centos/build_srpm.data
diff --git a/extended/sanlock/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/sanlock/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/sanlock/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/sanlock/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/sanlock/centos/meta_patches/PATCH_ORDER b/base/sanlock/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/sanlock/centos/meta_patches/PATCH_ORDER
rename to base/sanlock/centos/meta_patches/PATCH_ORDER
diff --git a/extended/sanlock/centos/meta_patches/spec-sanlock-systemctl-post-enable-preun-disable.patch b/base/sanlock/centos/meta_patches/spec-sanlock-systemctl-post-enable-preun-disable.patch
similarity index 100%
rename from extended/sanlock/centos/meta_patches/spec-sanlock-systemctl-post-enable-preun-disable.patch
rename to base/sanlock/centos/meta_patches/spec-sanlock-systemctl-post-enable-preun-disable.patch
diff --git a/extended/sanlock/centos/meta_patches/spec-wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch b/base/sanlock/centos/meta_patches/spec-wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch
similarity index 100%
rename from extended/sanlock/centos/meta_patches/spec-wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch
rename to base/sanlock/centos/meta_patches/spec-wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch
diff --git a/extended/sanlock/centos/patches/wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch b/base/sanlock/centos/patches/wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch
similarity index 100%
rename from extended/sanlock/centos/patches/wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch
rename to base/sanlock/centos/patches/wdmd-Kernel-watchdog-enable-and-reboot-on-error.patch
diff --git a/extended/sanlock/centos/srpm_path b/base/sanlock/centos/srpm_path
similarity index 100%
rename from extended/sanlock/centos/srpm_path
rename to base/sanlock/centos/srpm_path
diff --git a/extended/shadow/centos/build_srpm.data b/base/shadow-utils/centos/build_srpm.data
similarity index 100%
rename from extended/shadow/centos/build_srpm.data
rename to base/shadow-utils/centos/build_srpm.data
diff --git a/extended/shadow/centos/files/clear_shadow_locks.service b/base/shadow-utils/centos/files/clear_shadow_locks.service
similarity index 100%
rename from extended/shadow/centos/files/clear_shadow_locks.service
rename to base/shadow-utils/centos/files/clear_shadow_locks.service
diff --git a/extended/shadow/centos/files/login.defs.cgcs b/base/shadow-utils/centos/files/login.defs.cgcs
similarity index 100%
rename from extended/shadow/centos/files/login.defs.cgcs
rename to base/shadow-utils/centos/files/login.defs.cgcs
diff --git a/extended/shadow/centos/meta_patches/0001-Further-parallelize-shadow-utils-build.patch b/base/shadow-utils/centos/meta_patches/0001-Further-parallelize-shadow-utils-build.patch
similarity index 100%
rename from extended/shadow/centos/meta_patches/0001-Further-parallelize-shadow-utils-build.patch
rename to base/shadow-utils/centos/meta_patches/0001-Further-parallelize-shadow-utils-build.patch
diff --git a/extended/shadow/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/shadow-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/shadow/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/shadow-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/shadow/centos/meta_patches/PATCH_ORDER b/base/shadow-utils/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/shadow/centos/meta_patches/PATCH_ORDER
rename to base/shadow-utils/centos/meta_patches/PATCH_ORDER
diff --git a/extended/shadow/centos/meta_patches/add-BuildRequires-systemd.patch b/base/shadow-utils/centos/meta_patches/add-BuildRequires-systemd.patch
similarity index 100%
rename from extended/shadow/centos/meta_patches/add-BuildRequires-systemd.patch
rename to base/shadow-utils/centos/meta_patches/add-BuildRequires-systemd.patch
diff --git a/extended/shadow/centos/meta_patches/add-clear-shadow-locs-service-in-spec.patch b/base/shadow-utils/centos/meta_patches/add-clear-shadow-locs-service-in-spec.patch
similarity index 100%
rename from extended/shadow/centos/meta_patches/add-clear-shadow-locs-service-in-spec.patch
rename to base/shadow-utils/centos/meta_patches/add-clear-shadow-locs-service-in-spec.patch
diff --git a/extended/shadow/centos/srpm_path b/base/shadow-utils/centos/srpm_path
similarity index 100%
rename from extended/shadow/centos/srpm_path
rename to base/shadow-utils/centos/srpm_path
diff --git a/extended/shadow/files/clear_shadow_locks b/base/shadow-utils/files/clear_shadow_locks
similarity index 100%
rename from extended/shadow/files/clear_shadow_locks
rename to base/shadow-utils/files/clear_shadow_locks
diff --git a/extended/shadow/files/pam.d/su b/base/shadow-utils/files/pam.d/su
similarity index 100%
rename from extended/shadow/files/pam.d/su
rename to base/shadow-utils/files/pam.d/su
diff --git a/devtools/python/python-2.7.5/centos/build_srpm.data b/base/sudo/centos/build_srpm.data
similarity index 100%
rename from devtools/python/python-2.7.5/centos/build_srpm.data
rename to base/sudo/centos/build_srpm.data
diff --git a/extended/sudo/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/sudo/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/sudo/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/sudo/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/sudo/centos/meta_patches/0002-spec-include-TiS-changes.patch b/base/sudo/centos/meta_patches/0002-spec-include-TiS-changes.patch
similarity index 100%
rename from extended/sudo/centos/meta_patches/0002-spec-include-TiS-changes.patch
rename to base/sudo/centos/meta_patches/0002-spec-include-TiS-changes.patch
diff --git a/extended/sudo/centos/meta_patches/0003-Further-parallelize-sudo-build.patch b/base/sudo/centos/meta_patches/0003-Further-parallelize-sudo-build.patch
similarity index 100%
rename from extended/sudo/centos/meta_patches/0003-Further-parallelize-sudo-build.patch
rename to base/sudo/centos/meta_patches/0003-Further-parallelize-sudo-build.patch
diff --git a/extended/sudo/centos/meta_patches/0004-remove-make-check.patch b/base/sudo/centos/meta_patches/0004-remove-make-check.patch
similarity index 100%
rename from extended/sudo/centos/meta_patches/0004-remove-make-check.patch
rename to base/sudo/centos/meta_patches/0004-remove-make-check.patch
diff --git a/extended/sudo/centos/meta_patches/PATCH_ORDER b/base/sudo/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/sudo/centos/meta_patches/PATCH_ORDER
rename to base/sudo/centos/meta_patches/PATCH_ORDER
diff --git a/extended/sudo/centos/srpm_path b/base/sudo/centos/srpm_path
similarity index 100%
rename from extended/sudo/centos/srpm_path
rename to base/sudo/centos/srpm_path
diff --git a/extended/sudo/files/sudo-CVE-2015-5602.patch b/base/sudo/files/sudo-CVE-2015-5602.patch
similarity index 100%
rename from extended/sudo/files/sudo-CVE-2015-5602.patch
rename to base/sudo/files/sudo-CVE-2015-5602.patch
diff --git a/extended/systemd/centos/build_srpm.data b/base/systemd/centos/build_srpm.data
similarity index 100%
rename from extended/systemd/centos/build_srpm.data
rename to base/systemd/centos/build_srpm.data
diff --git a/extended/systemd/centos/meta_patches/0001-update-package-versioning-for-TIS-format.patch b/base/systemd/centos/meta_patches/0001-update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0001-update-package-versioning-for-TIS-format.patch
rename to base/systemd/centos/meta_patches/0001-update-package-versioning-for-TIS-format.patch
diff --git a/extended/systemd/centos/meta_patches/0003-spec-expand-_udevrulesdir-macro.patch b/base/systemd/centos/meta_patches/0003-spec-expand-_udevrulesdir-macro.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0003-spec-expand-_udevrulesdir-macro.patch
rename to base/systemd/centos/meta_patches/0003-spec-expand-_udevrulesdir-macro.patch
diff --git a/extended/systemd/centos/meta_patches/0004-Protect-sections-of-systemd-post-from-running-on-pat.patch b/base/systemd/centos/meta_patches/0004-Protect-sections-of-systemd-post-from-running-on-pat.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0004-Protect-sections-of-systemd-post-from-running-on-pat.patch
rename to base/systemd/centos/meta_patches/0004-Protect-sections-of-systemd-post-from-running-on-pat.patch
diff --git a/extended/systemd/centos/meta_patches/0005-spec-millisec-in-syslog-date.patch b/base/systemd/centos/meta_patches/0005-spec-millisec-in-syslog-date.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0005-spec-millisec-in-syslog-date.patch
rename to base/systemd/centos/meta_patches/0005-spec-millisec-in-syslog-date.patch
diff --git a/extended/systemd/centos/meta_patches/0007-Add-patch-for-journald-config.patch b/base/systemd/centos/meta_patches/0007-Add-patch-for-journald-config.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0007-Add-patch-for-journald-config.patch
rename to base/systemd/centos/meta_patches/0007-Add-patch-for-journald-config.patch
diff --git a/extended/systemd/centos/meta_patches/0008-Add-patch-for-journald-config-rate-limit.patch b/base/systemd/centos/meta_patches/0008-Add-patch-for-journald-config-rate-limit.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0008-Add-patch-for-journald-config-rate-limit.patch
rename to base/systemd/centos/meta_patches/0008-Add-patch-for-journald-config-rate-limit.patch
diff --git a/extended/systemd/centos/meta_patches/0009-Add-patch-to-remove-ID_SAS_PATH-rule.patch b/base/systemd/centos/meta_patches/0009-Add-patch-to-remove-ID_SAS_PATH-rule.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0009-Add-patch-to-remove-ID_SAS_PATH-rule.patch
rename to base/systemd/centos/meta_patches/0009-Add-patch-to-remove-ID_SAS_PATH-rule.patch
diff --git a/extended/systemd/centos/meta_patches/0010-fix-ACL-warnings-from-systemd-tmpfiles-set.patch b/base/systemd/centos/meta_patches/0010-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0010-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
rename to base/systemd/centos/meta_patches/0010-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
diff --git a/extended/systemd/centos/meta_patches/0011-Add-patch-for-moving-vartmp-to-tmpfs.patch b/base/systemd/centos/meta_patches/0011-Add-patch-for-moving-vartmp-to-tmpfs.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0011-Add-patch-for-moving-vartmp-to-tmpfs.patch
rename to base/systemd/centos/meta_patches/0011-Add-patch-for-moving-vartmp-to-tmpfs.patch
diff --git a/extended/systemd/centos/meta_patches/0012-Add-patch-for-restricting-tmpfs-size.patch b/base/systemd/centos/meta_patches/0012-Add-patch-for-restricting-tmpfs-size.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0012-Add-patch-for-restricting-tmpfs-size.patch
rename to base/systemd/centos/meta_patches/0012-Add-patch-for-restricting-tmpfs-size.patch
diff --git a/extended/systemd/centos/meta_patches/0013-fix-systemd-tmpfiles-ACL-warnings.patch b/base/systemd/centos/meta_patches/0013-fix-systemd-tmpfiles-ACL-warnings.patch
similarity index 100%
rename from extended/systemd/centos/meta_patches/0013-fix-systemd-tmpfiles-ACL-warnings.patch
rename to base/systemd/centos/meta_patches/0013-fix-systemd-tmpfiles-ACL-warnings.patch
diff --git a/extended/systemd/centos/meta_patches/PATCH_ORDER b/base/systemd/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/systemd/centos/meta_patches/PATCH_ORDER
rename to base/systemd/centos/meta_patches/PATCH_ORDER
diff --git a/extended/systemd/centos/patches/0501-inject-millisec-in-syslog-date.patch b/base/systemd/centos/patches/0501-inject-millisec-in-syslog-date.patch
similarity index 100%
rename from extended/systemd/centos/patches/0501-inject-millisec-in-syslog-date.patch
rename to base/systemd/centos/patches/0501-inject-millisec-in-syslog-date.patch
diff --git a/extended/systemd/centos/patches/0503-Configure-journald-to-forward-to-syslog.patch b/base/systemd/centos/patches/0503-Configure-journald-to-forward-to-syslog.patch
similarity index 100%
rename from extended/systemd/centos/patches/0503-Configure-journald-to-forward-to-syslog.patch
rename to base/systemd/centos/patches/0503-Configure-journald-to-forward-to-syslog.patch
diff --git a/extended/systemd/centos/patches/0504-Configure-journald-rate-limit.patch b/base/systemd/centos/patches/0504-Configure-journald-rate-limit.patch
similarity index 100%
rename from extended/systemd/centos/patches/0504-Configure-journald-rate-limit.patch
rename to base/systemd/centos/patches/0504-Configure-journald-rate-limit.patch
diff --git a/extended/systemd/centos/patches/0505-remove-id-sas-path-symlink.patch b/base/systemd/centos/patches/0505-remove-id-sas-path-symlink.patch
similarity index 100%
rename from extended/systemd/centos/patches/0505-remove-id-sas-path-symlink.patch
rename to base/systemd/centos/patches/0505-remove-id-sas-path-symlink.patch
diff --git a/extended/systemd/centos/patches/0506-fix-ACL-warnings-from-systemd-tmpfiles-set.patch b/base/systemd/centos/patches/0506-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
similarity index 100%
rename from extended/systemd/centos/patches/0506-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
rename to base/systemd/centos/patches/0506-fix-ACL-warnings-from-systemd-tmpfiles-set.patch
diff --git a/extended/systemd/centos/patches/0507-move-vartmp-to-tmpfs.patch b/base/systemd/centos/patches/0507-move-vartmp-to-tmpfs.patch
similarity index 100%
rename from extended/systemd/centos/patches/0507-move-vartmp-to-tmpfs.patch
rename to base/systemd/centos/patches/0507-move-vartmp-to-tmpfs.patch
diff --git a/extended/systemd/centos/patches/0508-set-a-1GB-size-restriction-on-tpmfs.patch b/base/systemd/centos/patches/0508-set-a-1GB-size-restriction-on-tpmfs.patch
similarity index 100%
rename from extended/systemd/centos/patches/0508-set-a-1GB-size-restriction-on-tpmfs.patch
rename to base/systemd/centos/patches/0508-set-a-1GB-size-restriction-on-tpmfs.patch
diff --git a/extended/systemd/centos/patches/0509-fix-systemd-tmpfiles-ACL-warnings.patch b/base/systemd/centos/patches/0509-fix-systemd-tmpfiles-ACL-warnings.patch
similarity index 100%
rename from extended/systemd/centos/patches/0509-fix-systemd-tmpfiles-ACL-warnings.patch
rename to base/systemd/centos/patches/0509-fix-systemd-tmpfiles-ACL-warnings.patch
diff --git a/extended/systemd/centos/srpm_path b/base/systemd/centos/srpm_path
similarity index 100%
rename from extended/systemd/centos/srpm_path
rename to base/systemd/centos/srpm_path
diff --git a/base/util-linux/centos/build_srpm.data b/base/util-linux/centos/build_srpm.data
new file mode 100644
index 000000000..e31319932
--- /dev/null
+++ b/base/util-linux/centos/build_srpm.data
@@ -0,0 +1,2 @@
+COPY_LIST="$GIT_BASE/base/shadow-utils/files/pam.d/su"
+TIS_PATCH_VER=3
diff --git a/core/util-linux/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/util-linux/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from core/util-linux/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/util-linux/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/core/util-linux/centos/meta_patches/0003-util-linux-login-pamd.patch b/base/util-linux/centos/meta_patches/0003-util-linux-login-pamd.patch
similarity index 100%
rename from core/util-linux/centos/meta_patches/0003-util-linux-login-pamd.patch
rename to base/util-linux/centos/meta_patches/0003-util-linux-login-pamd.patch
diff --git a/core/util-linux/centos/meta_patches/PATCH_ORDER b/base/util-linux/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from core/util-linux/centos/meta_patches/PATCH_ORDER
rename to base/util-linux/centos/meta_patches/PATCH_ORDER
diff --git a/core/util-linux/centos/meta_patches/spec-use-su-file-from-shadow.patch b/base/util-linux/centos/meta_patches/spec-use-su-file-from-shadow.patch
similarity index 100%
rename from core/util-linux/centos/meta_patches/spec-use-su-file-from-shadow.patch
rename to base/util-linux/centos/meta_patches/spec-use-su-file-from-shadow.patch
diff --git a/core/util-linux/centos/srpm_path b/base/util-linux/centos/srpm_path
similarity index 100%
rename from core/util-linux/centos/srpm_path
rename to base/util-linux/centos/srpm_path
diff --git a/devtools/update-motd/centos/build_srpm.data b/base/vim/centos/build_srpm.data
similarity index 100%
rename from devtools/update-motd/centos/build_srpm.data
rename to base/vim/centos/build_srpm.data
diff --git a/devtools/vim/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/vim/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/vim/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/vim/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/PATCH_ORDER b/base/vim/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/PATCH_ORDER
rename to base/vim/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/vim/centos/srpm_path b/base/vim/centos/srpm_path
similarity index 100%
rename from devtools/vim/centos/srpm_path
rename to base/vim/centos/srpm_path
diff --git a/devtools/vim/files/vimrc b/base/vim/files/vimrc
similarity index 100%
rename from devtools/vim/files/vimrc
rename to base/vim/files/vimrc
diff --git a/support/libevent/centos/build_srpm.data b/base/watchdog/centos/build_srpm.data
similarity index 100%
rename from support/libevent/centos/build_srpm.data
rename to base/watchdog/centos/build_srpm.data
diff --git a/extended/watchdog/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/watchdog/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/watchdog/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/watchdog/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/watchdog/centos/meta_patches/PATCH_ORDER b/base/watchdog/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/watchdog/centos/meta_patches/PATCH_ORDER
rename to base/watchdog/centos/meta_patches/PATCH_ORDER
diff --git a/extended/watchdog/centos/meta_patches/spec-TiS-changes.patch b/base/watchdog/centos/meta_patches/spec-TiS-changes.patch
similarity index 100%
rename from extended/watchdog/centos/meta_patches/spec-TiS-changes.patch
rename to base/watchdog/centos/meta_patches/spec-TiS-changes.patch
diff --git a/extended/watchdog/centos/srpm_path b/base/watchdog/centos/srpm_path
similarity index 100%
rename from extended/watchdog/centos/srpm_path
rename to base/watchdog/centos/srpm_path
diff --git a/extended/watchdog/files/fix-ping-failure.patch b/base/watchdog/files/fix-ping-failure.patch
similarity index 100%
rename from extended/watchdog/files/fix-ping-failure.patch
rename to base/watchdog/files/fix-ping-failure.patch
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index f042e00bd..8b3688680 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,53 +1,51 @@
-vm-topology
-core/initscripts
-core/util-linux
+tools/vm-topology
+base/initscripts
+base/util-linux
 base/setup
 base/lshell
-base/namespace-utils
-base/nss-pam-ldapd
+utilities/namespace-utils
+ldap/nss-pam-ldapd
 base/centos-release
-connectivity/nfs-utils
-connectivity/dhcp
-connectivity/openssh
-devtools/facter
-devtools/qemu
-devtools/nfscheck/recipes-common/nfscheck
-devtools/update-motd
-devtools/vim
-devtools/python/python-2.7.5
-devtools/python/python-django
-devtools/python-setuptools
-extended/e2fsprogs
-extended/libvirt
-extended/libvirt-python
-extended/lighttpd
-extended/python-cephclient
-extended/python-ryu
-extended/python-smartpm
-extended/python-voluptuous
-extended/lldpd
-extended/logrotate
-extended/nova-utils
-extended/ntp
-extended/pam
-extended/shadow
-extended/shim-unsigned
-extended/shim-signed
-extended/syslog-ng
-extended/novnc
-extended/sanlock
-extended/sudo
-extended/cloud-init
-extended/irqbalance
-extended/watchdog
-networking/net-snmp
-networking/openldap
-networking/mlx4-config
+filesystem/nfs-utils
+base/dhcp
+base/openssh
+config/facter
+virt/qemu
+filesystem/nfscheck
+utilities/update-motd
+base/vim
+python/python-2.7.5
+python/python-django
+python/python-setuptools
+filesystem/e2fsprogs
+virt/libvirt
+virt/libvirt-python
+base/lighttpd
+ceph/python-cephclient
+networking/python-ryu
+python/python-smartpm
+python/python-voluptuous
+networking/lldpd
+logging/logrotate
+utilities/nova-utils
+base/ntp
+base/pam
+base/shadow-utils
+security/shim-unsigned
+security/shim-signed
+logging/syslog-ng
+base/novnc
+base/sanlock
+base/sudo
+virt/cloud-init
+base/watchdog
+base/net-snmp
+ldap/openldap
+networking/mellanox/mlx4-config
 networking/openvswitch
 networking/scapy
 restapi-doc
-support/libevent
-support/tgt
+base/libevent
 security/wrs-ssl
 security/tss2
 security/tpm2-tools
@@ -56,54 +54,54 @@ security/libtpms
 security/swtpm
 security/audit
 security/spectre-meltdown-checker
-kernel-std
-devtools/puppet-4.8.2
-devtools/puppet-modules/puppet-boolean-1.0.2
-devtools/puppet-modules/puppet-create_resources
-devtools/puppet-modules/puppet-dnsmasq
-devtools/puppet-modules/puppet-drbd-0.3.1
-devtools/puppet-modules/puppet-filemapper
-devtools/puppet-modules/puppet-haproxy-1.5.0
-devtools/puppet-modules/puppet-ldap
-devtools/puppet-modules/puppet-lvm
-devtools/puppet-modules/puppet-network
-devtools/puppet-modules/puppet-nslcd
-devtools/puppet-modules/puppet-postgresql-4.8.0
-devtools/puppet-modules/puppet-puppi
-devtools/puppet-modules/puppet-rabbitmq-5.5.0
-devtools/puppet-modules/puppet-staging
-devtools/puppet-modules/puppet-stdlib-4.12.0
-devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0
-devtools/puppet-modules/openstack/puppet-ceph-2.2.0
-devtools/puppet-modules/openstack/puppet-cinder-11.3.0
-devtools/puppet-modules/openstack/puppet-glance-11.3.0
-devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0
-devtools/puppet-modules/openstack/puppet-heat-11.3.0
-devtools/puppet-modules/openstack/puppet-ironic-11.3.0
-devtools/puppet-modules/openstack/puppet-keystone-11.3.0
-devtools/puppet-modules/openstack/puppet-murano-11.3.0
-devtools/puppet-modules/openstack/puppet-magnum-11.3.0
-devtools/puppet-modules/openstack/puppet-neutron-11.3.0
-devtools/puppet-modules/openstack/puppet-nova-11.4.0
-devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0
-devtools/puppet-modules/openstack/puppet-panko-11.3.0
-base/tis-extensions
+kernel/kernel-std
+config/puppet-4.8.2
+config/puppet-modules/puppet-boolean-1.0.2
+config/puppet-modules/puppet-create_resources
+config/puppet-modules/puppet-dnsmasq
+config/puppet-modules/puppet-drbd-0.3.1
+config/puppet-modules/puppet-filemapper
+config/puppet-modules/puppet-haproxy-1.5.0
+config/puppet-modules/puppet-ldap
+config/puppet-modules/puppet-lvm
+config/puppet-modules/puppet-network
+config/puppet-modules/puppet-nslcd
+config/puppet-modules/puppet-postgresql-4.8.0
+config/puppet-modules/puppet-puppi
+config/puppet-modules/puppet-rabbitmq-5.5.0
+config/puppet-modules/puppet-staging
+config/puppet-modules/puppet-stdlib-4.12.0
+config/puppet-modules/openstack/puppet-ceilometer-11.3.0
+config/puppet-modules/openstack/puppet-ceph-2.2.0
+config/puppet-modules/openstack/puppet-cinder-11.3.0
+config/puppet-modules/openstack/puppet-glance-11.3.0
+config/puppet-modules/openstack/puppet-gnocchi-11.3.0
+config/puppet-modules/openstack/puppet-heat-11.3.0
+config/puppet-modules/openstack/puppet-ironic-11.3.0
+config/puppet-modules/openstack/puppet-keystone-11.3.0
+config/puppet-modules/openstack/puppet-murano-11.3.0
+config/puppet-modules/openstack/puppet-magnum-11.3.0
+config/puppet-modules/openstack/puppet-neutron-11.3.0
+config/puppet-modules/openstack/puppet-nova-11.4.0
+config/puppet-modules/openstack/puppet-openstacklib-11.3.0
+config/puppet-modules/openstack/puppet-panko-11.3.0
+utilities/tis-extensions
 python/python-eventlet
 python/python-requests
-extended/systemd
-extended/python-gunicorn
-devtools/puppet-modules/openstack/puppet-oslo-11.3.0
-python/python-3parclient
-python/python-lefthandclient
-extended/iproute
-extended/tboot
-mellanox/libibverbs
-mellanox/mlnx-ofa_kernel
-mellanox/rdma-core
-extended/memcached
-devtools/puppet-modules/openstack/puppet-memcached-3.0.2
-devtools/puppet-modules/openstack/puppet-horizon-9.5.0
-devtools/puppet-modules/openstack/puppet-swift-11.3.0
+base/systemd
+python/python-gunicorn
+config/puppet-modules/openstack/puppet-oslo-11.3.0
+strorage-drivers/python-3parclient
+strorage-drivers/python-lefthandclient
+networking/iproute
+security/tboot
+networking/mellanox/libibverbs
+kernel/kernel-modules/mlnx-ofa_kernel
+networking/mellanox/rdma-core
+base/memcached
+config/puppet-modules/openstack/puppet-memcached-3.0.2
+config/puppet-modules/openstack/puppet-horizon-9.5.0
+config/puppet-modules/openstack/puppet-swift-11.3.0
 monitoring/collectd-extensions
 monitoring/influxdb-extensions
 kubernetes/kubernetes
diff --git a/centos_pkg_dirs_rt b/centos_pkg_dirs_rt
index db351e246..513608f44 100644
--- a/centos_pkg_dirs_rt
+++ b/centos_pkg_dirs_rt
@@ -1,4 +1,4 @@
-kernel-rt
-mellanox/libibverbs
-mellanox/mlnx-ofa_kernel
-mellanox/rdma-core
+kernel/kernel-rt
+networking/mellanox/libibverbs
+kernel/kernel-modules/mlnx-ofa_kernel
+networking/mellanox/rdma-core
diff --git a/extended/python-cephclient/centos/build_srpm.data b/ceph/python-cephclient/centos/build_srpm.data
similarity index 100%
rename from extended/python-cephclient/centos/build_srpm.data
rename to ceph/python-cephclient/centos/build_srpm.data
diff --git a/extended/python-cephclient/centos/python-cephclient.spec b/ceph/python-cephclient/centos/python-cephclient.spec
similarity index 100%
rename from extended/python-cephclient/centos/python-cephclient.spec
rename to ceph/python-cephclient/centos/python-cephclient.spec
diff --git a/extended/python-cephclient/python-cephclient/0001-US63903-Ceph-Rebase-Update-REST-API-to-0.94.2.patch b/ceph/python-cephclient/python-cephclient/0001-US63903-Ceph-Rebase-Update-REST-API-to-0.94.2.patch
similarity index 100%
rename from extended/python-cephclient/python-cephclient/0001-US63903-Ceph-Rebase-Update-REST-API-to-0.94.2.patch
rename to ceph/python-cephclient/python-cephclient/0001-US63903-Ceph-Rebase-Update-REST-API-to-0.94.2.patch
diff --git a/extended/python-cephclient/python-cephclient/0001-US70398-Ceph-Rebase-Update-REST-API-to-0.94.5.patch b/ceph/python-cephclient/python-cephclient/0001-US70398-Ceph-Rebase-Update-REST-API-to-0.94.5.patch
similarity index 100%
rename from extended/python-cephclient/python-cephclient/0001-US70398-Ceph-Rebase-Update-REST-API-to-0.94.5.patch
rename to ceph/python-cephclient/python-cephclient/0001-US70398-Ceph-Rebase-Update-REST-API-to-0.94.5.patch
diff --git a/extended/python-cephclient/python-cephclient/US92424-Ceph-Rebase-Update-REST-API-to-10.2.4.patch b/ceph/python-cephclient/python-cephclient/US92424-Ceph-Rebase-Update-REST-API-to-10.2.4.patch
similarity index 100%
rename from extended/python-cephclient/python-cephclient/US92424-Ceph-Rebase-Update-REST-API-to-10.2.4.patch
rename to ceph/python-cephclient/python-cephclient/US92424-Ceph-Rebase-Update-REST-API-to-10.2.4.patch
diff --git a/extended/python-cephclient/python-cephclient/add-osd-get-pool-quota.patch b/ceph/python-cephclient/python-cephclient/add-osd-get-pool-quota.patch
similarity index 100%
rename from extended/python-cephclient/python-cephclient/add-osd-get-pool-quota.patch
rename to ceph/python-cephclient/python-cephclient/add-osd-get-pool-quota.patch
diff --git a/extended/python-cephclient/python-cephclient/fix-osd-crush-remove.patch b/ceph/python-cephclient/python-cephclient/fix-osd-crush-remove.patch
similarity index 100%
rename from extended/python-cephclient/python-cephclient/fix-osd-crush-remove.patch
rename to ceph/python-cephclient/python-cephclient/fix-osd-crush-remove.patch
diff --git a/extended/python-cephclient/python-cephclient/fix-osd-tier-add.patch b/ceph/python-cephclient/python-cephclient/fix-osd-tier-add.patch
similarity index 100%
rename from extended/python-cephclient/python-cephclient/fix-osd-tier-add.patch
rename to ceph/python-cephclient/python-cephclient/fix-osd-tier-add.patch
diff --git a/extended/python-cephclient/python-cephclient/set-default-endpoint.patch b/ceph/python-cephclient/python-cephclient/set-default-endpoint.patch
similarity index 100%
rename from extended/python-cephclient/python-cephclient/set-default-endpoint.patch
rename to ceph/python-cephclient/python-cephclient/set-default-endpoint.patch
diff --git a/devtools/facter/centos/build_srpm.data b/config/facter/centos/build_srpm.data
similarity index 100%
rename from devtools/facter/centos/build_srpm.data
rename to config/facter/centos/build_srpm.data
diff --git a/devtools/facter/centos/meta_patches/0001-spec-include-TiS-paches.patch b/config/facter/centos/meta_patches/0001-spec-include-TiS-paches.patch
similarity index 100%
rename from devtools/facter/centos/meta_patches/0001-spec-include-TiS-paches.patch
rename to config/facter/centos/meta_patches/0001-spec-include-TiS-paches.patch
diff --git a/devtools/facter/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch b/config/facter/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/facter/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch
rename to config/facter/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/facter/centos/meta_patches/0003-Add-ipaddress-patch.patch b/config/facter/centos/meta_patches/0003-Add-ipaddress-patch.patch
similarity index 100%
rename from devtools/facter/centos/meta_patches/0003-Add-ipaddress-patch.patch
rename to config/facter/centos/meta_patches/0003-Add-ipaddress-patch.patch
diff --git a/devtools/facter/centos/meta_patches/PATCH_ORDER b/config/facter/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/facter/centos/meta_patches/PATCH_ORDER
rename to config/facter/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/facter/centos/patches/0001-ps.patch b/config/facter/centos/patches/0001-ps.patch
similarity index 100%
rename from devtools/facter/centos/patches/0001-ps.patch
rename to config/facter/centos/patches/0001-ps.patch
diff --git a/devtools/facter/centos/patches/0002-personality.patch b/config/facter/centos/patches/0002-personality.patch
similarity index 100%
rename from devtools/facter/centos/patches/0002-personality.patch
rename to config/facter/centos/patches/0002-personality.patch
diff --git a/devtools/facter/centos/patches/0003-centos_remove-net-commands-that-can-timeout.patch b/config/facter/centos/patches/0003-centos_remove-net-commands-that-can-timeout.patch
similarity index 100%
rename from devtools/facter/centos/patches/0003-centos_remove-net-commands-that-can-timeout.patch
rename to config/facter/centos/patches/0003-centos_remove-net-commands-that-can-timeout.patch
diff --git a/devtools/facter/centos/patches/0004-centos_fix-ipv6-regex.patch b/config/facter/centos/patches/0004-centos_fix-ipv6-regex.patch
similarity index 100%
rename from devtools/facter/centos/patches/0004-centos_fix-ipv6-regex.patch
rename to config/facter/centos/patches/0004-centos_fix-ipv6-regex.patch
diff --git a/devtools/facter/centos/patches/0005-Hardcode-ipaddress-fact-to-localhost.patch b/config/facter/centos/patches/0005-Hardcode-ipaddress-fact-to-localhost.patch
similarity index 100%
rename from devtools/facter/centos/patches/0005-Hardcode-ipaddress-fact-to-localhost.patch
rename to config/facter/centos/patches/0005-Hardcode-ipaddress-fact-to-localhost.patch
diff --git a/devtools/facter/centos/srpm_path b/config/facter/centos/srpm_path
similarity index 100%
rename from devtools/facter/centos/srpm_path
rename to config/facter/centos/srpm_path
diff --git a/devtools/puppet-4.8.2/centos/build_srpm.data b/config/puppet-4.8.2/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-4.8.2/centos/build_srpm.data
rename to config/puppet-4.8.2/centos/build_srpm.data
diff --git a/devtools/puppet-4.8.2/centos/meta_patches/0000-Update-package-versioning-for-TIS-format.patch b/config/puppet-4.8.2/centos/meta_patches/0000-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-4.8.2/centos/meta_patches/0000-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-4.8.2/centos/meta_patches/0000-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-4.8.2/centos/meta_patches/0001-Add-WRS-Patches.patch b/config/puppet-4.8.2/centos/meta_patches/0001-Add-WRS-Patches.patch
similarity index 100%
rename from devtools/puppet-4.8.2/centos/meta_patches/0001-Add-WRS-Patches.patch
rename to config/puppet-4.8.2/centos/meta_patches/0001-Add-WRS-Patches.patch
diff --git a/devtools/puppet-4.8.2/centos/meta_patches/PATCH_ORDER b/config/puppet-4.8.2/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-4.8.2/centos/meta_patches/PATCH_ORDER
rename to config/puppet-4.8.2/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-4.8.2/centos/patches/1001-Add-timestamps-to-logs.patch b/config/puppet-4.8.2/centos/patches/1001-Add-timestamps-to-logs.patch
similarity index 100%
rename from devtools/puppet-4.8.2/centos/patches/1001-Add-timestamps-to-logs.patch
rename to config/puppet-4.8.2/centos/patches/1001-Add-timestamps-to-logs.patch
diff --git a/devtools/puppet-4.8.2/centos/patches/1002-Set-hasstatus-to-false-by-default.patch b/config/puppet-4.8.2/centos/patches/1002-Set-hasstatus-to-false-by-default.patch
similarity index 100%
rename from devtools/puppet-4.8.2/centos/patches/1002-Set-hasstatus-to-false-by-default.patch
rename to config/puppet-4.8.2/centos/patches/1002-Set-hasstatus-to-false-by-default.patch
diff --git a/devtools/puppet-4.8.2/centos/patches/1003-Update-getpid-function.patch b/config/puppet-4.8.2/centos/patches/1003-Update-getpid-function.patch
similarity index 100%
rename from devtools/puppet-4.8.2/centos/patches/1003-Update-getpid-function.patch
rename to config/puppet-4.8.2/centos/patches/1003-Update-getpid-function.patch
diff --git a/devtools/puppet-4.8.2/centos/patches/1004-Block-enabling-of-services.patch b/config/puppet-4.8.2/centos/patches/1004-Block-enabling-of-services.patch
similarity index 100%
rename from devtools/puppet-4.8.2/centos/patches/1004-Block-enabling-of-services.patch
rename to config/puppet-4.8.2/centos/patches/1004-Block-enabling-of-services.patch
diff --git a/devtools/puppet-4.8.2/centos/patches/1005-Set-strict_variables-and-basemodulepath-in-puppet.co.patch b/config/puppet-4.8.2/centos/patches/1005-Set-strict_variables-and-basemodulepath-in-puppet.co.patch
similarity index 100%
rename from devtools/puppet-4.8.2/centos/patches/1005-Set-strict_variables-and-basemodulepath-in-puppet.co.patch
rename to config/puppet-4.8.2/centos/patches/1005-Set-strict_variables-and-basemodulepath-in-puppet.co.patch
diff --git a/devtools/puppet-4.8.2/centos/srpm_path b/config/puppet-4.8.2/centos/srpm_path
similarity index 100%
rename from devtools/puppet-4.8.2/centos/srpm_path
rename to config/puppet-4.8.2/centos/srpm_path
diff --git a/extended/e2fsprogs/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/build_srpm.data
similarity index 100%
rename from extended/e2fsprogs/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0002-Add-Rebase-Patches.patch b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0002-Add-Rebase-Patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0002-Add-Rebase-Patches.patch
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0002-Add-Rebase-Patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0003-meta-fix-ceilometer-puppet-warnings.patch b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0003-meta-fix-ceilometer-puppet-warnings.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0003-meta-fix-ceilometer-puppet-warnings.patch
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0003-meta-fix-ceilometer-puppet-warnings.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0004-meta-remove-reseller-admin-role.patch b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0004-meta-remove-reseller-admin-role.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0004-meta-remove-reseller-admin-role.patch
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0004-meta-remove-reseller-admin-role.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0005-meta-remove-the-oslo-cache-configuration.patch b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0005-meta-remove-the-oslo-cache-configuration.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0005-meta-remove-the-oslo-cache-configuration.patch
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0005-meta-remove-the-oslo-cache-configuration.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0002-Fix-ceilometer-puppet-warnings.patch b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0002-Fix-ceilometer-puppet-warnings.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0002-Fix-ceilometer-puppet-warnings.patch
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0002-Fix-ceilometer-puppet-warnings.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0003-remove-reseller-admin-role.patch b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0003-remove-reseller-admin-role.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0003-remove-reseller-admin-role.patch
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0003-remove-reseller-admin-role.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0004-remove-the-oslo-cache-configuration.patch b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0004-remove-the-oslo-cache-configuration.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0004-remove-the-oslo-cache-configuration.patch
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0004-remove-the-oslo-cache-configuration.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0002-Add-TIS-patches.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0002-Add-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0002-Add-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0002-Add-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0003-Ceph-Jewel-rebase.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0003-Ceph-Jewel-rebase.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0003-Ceph-Jewel-rebase.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0003-Ceph-Jewel-rebase.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0004-Add-OSD-support-for-persistent-naming.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0004-Add-OSD-support-for-persistent-naming.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0004-Add-OSD-support-for-persistent-naming.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0004-Add-OSD-support-for-persistent-naming.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0005-meta-patch-for-patch5.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0005-meta-patch-for-patch5.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0005-meta-patch-for-patch5.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0005-meta-patch-for-patch5.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0002-Newton-rebase-fixes.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0002-Newton-rebase-fixes.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0002-Newton-rebase-fixes.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0002-Newton-rebase-fixes.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0003-Ceph-Jewel-rebase.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0003-Ceph-Jewel-rebase.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0003-Ceph-Jewel-rebase.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0003-Ceph-Jewel-rebase.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0004-US92424-Add-OSD-support-for-persistent-naming.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0004-US92424-Add-OSD-support-for-persistent-naming.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0004-US92424-Add-OSD-support-for-persistent-naming.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0004-US92424-Add-OSD-support-for-persistent-naming.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0005-Remove-puppetlabs-apt-as-ceph-requirement.patch b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0005-Remove-puppetlabs-apt-as-ceph-requirement.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0005-Remove-puppetlabs-apt-as-ceph-requirement.patch
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0005-Remove-puppetlabs-apt-as-ceph-requirement.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ceph-2.2.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0002-Add-TIS-patches.patch b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0002-Add-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0002-Add-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0002-Add-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0003-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0003-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0003-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0003-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0004-CGTS-9191-Fix-cinder-calling-nova-over-public-ip.patch b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0004-CGTS-9191-Fix-cinder-calling-nova-over-public-ip.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0004-CGTS-9191-Fix-cinder-calling-nova-over-public-ip.patch
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0004-CGTS-9191-Fix-cinder-calling-nova-over-public-ip.patch
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0005-Patch-for-removal-of-default_volume_type-from-API.patch b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0005-Patch-for-removal-of-default_volume_type-from-API.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0005-Patch-for-removal-of-default_volume_type-from-API.patch
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0005-Patch-for-removal-of-default_volume_type-from-API.patch
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0003-CGTS-9191-Add-nova-interface-config-option.patch b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0003-CGTS-9191-Add-nova-interface-config-option.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0003-CGTS-9191-Add-nova-interface-config-option.patch
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0003-CGTS-9191-Add-nova-interface-config-option.patch
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0004-CGTS-9219-Remove-default_volume_type-from-api-class.patch b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0004-CGTS-9219-Remove-default_volume_type-from-api-class.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0004-CGTS-9219-Remove-default_volume_type-from-api-class.patch
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0004-CGTS-9219-Remove-default_volume_type-from-api-class.patch
diff --git a/devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-cinder-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0003-Add-region-cache-support.patch b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0003-Add-region-cache-support.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0003-Add-region-cache-support.patch
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0003-Add-region-cache-support.patch
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0004-add-username-password-authentication-support-to-api.patch b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0004-add-username-password-authentication-support-to-api.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0004-add-username-password-authentication-support-to-api.patch
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0004-add-username-password-authentication-support-to-api.patch
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0002-Add-region-cache-support.patch b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0002-Add-region-cache-support.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0002-Add-region-cache-support.patch
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0002-Add-region-cache-support.patch
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0003-add-username-password-authentication-support-to-api.patch b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0003-add-username-password-authentication-support-to-api.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0003-add-username-password-authentication-support-to-api.patch
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0003-add-username-password-authentication-support-to-api.patch
diff --git a/devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-glance-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-glance-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/0001-meta-fix-gnocchi-puppet-warning.patch b/config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/0001-meta-fix-gnocchi-puppet-warning.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/0001-meta-fix-gnocchi-puppet-warning.patch
rename to config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/0001-meta-fix-gnocchi-puppet-warning.patch
diff --git a/devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/patches/0001-fix-puppet-gnocchi-warning.patch b/config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/patches/0001-fix-puppet-gnocchi-warning.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/patches/0001-fix-puppet-gnocchi-warning.patch
rename to config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/patches/0001-fix-puppet-gnocchi-warning.patch
diff --git a/devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-memcached-3.0.2/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-heat-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-memcached-3.0.2/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-heat-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0002-Add-TIS-Patches.patch b/config/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0002-Add-TIS-Patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0002-Add-TIS-Patches.patch
rename to config/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0002-Add-TIS-Patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-heat-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-heat-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-heat-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-heat-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-heat-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch b/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
rename to config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0002-update-memcached-dependency.patch b/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0002-update-memcached-dependency.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0002-update-memcached-dependency.patch
rename to config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/0002-update-memcached-dependency.patch
diff --git a/devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/patches/0001-update-memcached-dependency.patch b/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/patches/0001-update-memcached-dependency.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/patches/0001-update-memcached-dependency.patch
rename to config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/patches/0001-update-memcached-dependency.patch
diff --git a/devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-horizon-9.5.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-horizon-9.5.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0002-Ironic-dbsync-NeutronGlance-dep.patch b/config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0002-Ironic-dbsync-NeutronGlance-dep.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0002-Ironic-dbsync-NeutronGlance-dep.patch
rename to config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0002-Ironic-dbsync-NeutronGlance-dep.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0003-Apply-xinetd-patch.patch b/config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0003-Apply-xinetd-patch.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0003-Apply-xinetd-patch.patch
rename to config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0003-Apply-xinetd-patch.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0001-Ironic-dbsync-NeutronGlance-dep-resolution.patch b/config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0001-Ironic-dbsync-NeutronGlance-dep-resolution.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0001-Ironic-dbsync-NeutronGlance-dep-resolution.patch
rename to config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0001-Ironic-dbsync-NeutronGlance-dep-resolution.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0002-Dont-complain-about-xinetd-2.0.0.patch b/config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0002-Dont-complain-about-xinetd-2.0.0.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0002-Dont-complain-about-xinetd-2.0.0.patch
rename to config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0002-Dont-complain-about-xinetd-2.0.0.patch
diff --git a/devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-ironic-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0002-squash-titanium-patches.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0002-squash-titanium-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0002-squash-titanium-patches.patch
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0002-squash-titanium-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0003-remove-the-keystone-admin-app.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0003-remove-the-keystone-admin-app.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0003-remove-the-keystone-admin-app.patch
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0003-remove-the-keystone-admin-app.patch
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0004-remove-eventlet_and_bindhost-from-keystoneconf.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0004-remove-eventlet_and_bindhost-from-keystoneconf.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0004-remove-eventlet_and_bindhost-from-keystoneconf.patch
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0004-remove-eventlet_and_bindhost-from-keystoneconf.patch
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0005-escape-special-characters-in-bootstrap.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0005-escape-special-characters-in-bootstrap.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0005-escape-special-characters-in-bootstrap.patch
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0005-escape-special-characters-in-bootstrap.patch
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0001-pike-rebase-squash-titanium-patches.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0001-pike-rebase-squash-titanium-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0001-pike-rebase-squash-titanium-patches.patch
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0001-pike-rebase-squash-titanium-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0002-remove-the-Keystone-admin-app.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0002-remove-the-Keystone-admin-app.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0002-remove-the-Keystone-admin-app.patch
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0002-remove-the-Keystone-admin-app.patch
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0003-remove-eventlet_bindhost-from-Keystoneconf.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0003-remove-eventlet_bindhost-from-Keystoneconf.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0003-remove-eventlet_bindhost-from-Keystoneconf.patch
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0003-remove-eventlet_bindhost-from-Keystoneconf.patch
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0004-escape-special-characters-in-bootstrap.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0004-escape-special-characters-in-bootstrap.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0004-escape-special-characters-in-bootstrap.patch
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0004-escape-special-characters-in-bootstrap.patch
diff --git a/devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-keystone-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch b/config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch
rename to config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch
diff --git a/devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch b/config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch
rename to config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch
diff --git a/devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0001-Pike-Rebase.patch b/config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0001-Pike-Rebase.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0001-Pike-Rebase.patch
rename to config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0001-Pike-Rebase.patch
diff --git a/devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch b/config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch
rename to config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch
diff --git a/devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-magnum-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/vim/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/vim/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-memcached-3.0.2/centos/srpm_path b/config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-memcached-3.0.2/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-memcached-3.0.2/centos/srpm_path
diff --git a/extended/ntp/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-murano-11.3.0/centos/build_srpm.data
similarity index 100%
rename from extended/ntp/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-murano-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch b/config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch
rename to config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch
diff --git a/devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch b/config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch
rename to config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch
diff --git a/devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0003-meta-expose-heat-and-neutron-endpoint-type.patch b/config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0003-meta-expose-heat-and-neutron-endpoint-type.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0003-meta-expose-heat-and-neutron-endpoint-type.patch
rename to config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0003-meta-expose-heat-and-neutron-endpoint-type.patch
diff --git a/devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0001-Pike-Rebase.patch b/config/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0001-Pike-Rebase.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0001-Pike-Rebase.patch
rename to config/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0001-Pike-Rebase.patch
diff --git a/devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch b/config/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch
rename to config/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch
diff --git a/devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0003-expose-heat-and-neutron-endpoint-type.patch b/config/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0003-expose-heat-and-neutron-endpoint-type.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0003-expose-heat-and-neutron-endpoint-type.patch
rename to config/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0003-expose-heat-and-neutron-endpoint-type.patch
diff --git a/devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-murano-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-murano-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-murano-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0002-Add-TiS-patches.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0002-Add-TiS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0002-Add-TiS-patches.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0002-Add-TiS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0003-add-support-for-networking-sfc.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0003-add-support-for-networking-sfc.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0003-add-support-for-networking-sfc.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0003-add-support-for-networking-sfc.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0004-restore-ovs-service-parameters.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0004-restore-ovs-service-parameters.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0004-restore-ovs-service-parameters.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0004-restore-ovs-service-parameters.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0005-unset-tunnel_types-when-tunnelling-disabled.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0005-unset-tunnel_types-when-tunnelling-disabled.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0005-unset-tunnel_types-when-tunnelling-disabled.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0005-unset-tunnel_types-when-tunnelling-disabled.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0002-Remove-broken-authtoken-references.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0002-Remove-broken-authtoken-references.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0002-Remove-broken-authtoken-references.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0002-Remove-broken-authtoken-references.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0003-control-provider-network-testing-state.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0003-control-provider-network-testing-state.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0003-control-provider-network-testing-state.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0003-control-provider-network-testing-state.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0004-set-wsgi-pool-size-to-10-from-100.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0004-set-wsgi-pool-size-to-10-from-100.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0004-set-wsgi-pool-size-to-10-from-100.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0004-set-wsgi-pool-size-to-10-from-100.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0005-Add-support-for-neutron-bgp-dragent.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0005-Add-support-for-neutron-bgp-dragent.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0005-Add-support-for-neutron-bgp-dragent.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0005-Add-support-for-neutron-bgp-dragent.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0006-Add-parameters-to-classes.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0006-Add-parameters-to-classes.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0006-Add-parameters-to-classes.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0006-Add-parameters-to-classes.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0007-update-neutron-bgp-to-use-class-variables.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0007-update-neutron-bgp-to-use-class-variables.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0007-update-neutron-bgp-to-use-class-variables.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0007-update-neutron-bgp-to-use-class-variables.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0008-dvr-allow-base-mac-address-to-be-configured.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0008-dvr-allow-base-mac-address-to-be-configured.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0008-dvr-allow-base-mac-address-to-be-configured.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0008-dvr-allow-base-mac-address-to-be-configured.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0009-add-support-for-networking-sfc.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0009-add-support-for-networking-sfc.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0009-add-support-for-networking-sfc.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0009-add-support-for-networking-sfc.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0010-restore-ovs-service-parameters.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0010-restore-ovs-service-parameters.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0010-restore-ovs-service-parameters.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0010-restore-ovs-service-parameters.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0011-unset-tunnel_types-when-tunneling-disabled.patch b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0011-unset-tunnel_types-when-tunneling-disabled.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0011-unset-tunnel_types-when-tunneling-disabled.patch
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0011-unset-tunnel_types-when-tunneling-disabled.patch
diff --git a/devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-neutron-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0002-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0002-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0002-Roll-up-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0002-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0003-upstreamable-fix-syntax-error-for-until_complete_rea.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0003-upstreamable-fix-syntax-error-for-until_complete_rea.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0003-upstreamable-fix-syntax-error-for-until_complete_rea.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0003-upstreamable-fix-syntax-error-for-until_complete_rea.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0004-Setup-simple-cell.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0004-Setup-simple-cell.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0004-Setup-simple-cell.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0004-Setup-simple-cell.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0005-fix-pci-and-compute-pci.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0005-fix-pci-and-compute-pci.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0005-fix-pci-and-compute-pci.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0005-fix-pci-and-compute-pci.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0006-Create-Nova-ironic-conf.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0006-Create-Nova-ironic-conf.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0006-Create-Nova-ironic-conf.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0006-Create-Nova-ironic-conf.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0007-remove-joshuabaird-ipaclient-requirement.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0007-remove-joshuabaird-ipaclient-requirement.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0007-remove-joshuabaird-ipaclient-requirement.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0007-remove-joshuabaird-ipaclient-requirement.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0008-Add-pci_weight_multiple-to-scheduler-filter.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0008-Add-pci_weight_multiple-to-scheduler-filter.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0008-Add-pci_weight_multiple-to-scheduler-filter.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0008-Add-pci_weight_multiple-to-scheduler-filter.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0009-Remove-SerialConsole-from-NovaConf.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0009-Remove-SerialConsole-from-NovaConf.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0009-Remove-SerialConsole-from-NovaConf.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0009-Remove-SerialConsole-from-NovaConf.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0010-Remove-compute-huge.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0010-Remove-compute-huge.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0010-Remove-compute-huge.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0010-Remove-compute-huge.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0002-upstreamable-fix-syntax-error-for-until_complete_rea.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0002-upstreamable-fix-syntax-error-for-until_complete_rea.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0002-upstreamable-fix-syntax-error-for-until_complete_rea.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0002-upstreamable-fix-syntax-error-for-until_complete_rea.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0003-Create-nova_cell0-database.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0003-Create-nova_cell0-database.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0003-Create-nova_cell0-database.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0003-Create-nova_cell0-database.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0004-Filter-out-warnings-in-nova-manage-cell_v2-list_cell.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0004-Filter-out-warnings-in-nova-manage-cell_v2-list_cell.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0004-Filter-out-warnings-in-nova-manage-cell_v2-list_cell.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0004-Filter-out-warnings-in-nova-manage-cell_v2-list_cell.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0005-fix-pci-and-compute-pci.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0005-fix-pci-and-compute-pci.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0005-fix-pci-and-compute-pci.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0005-fix-pci-and-compute-pci.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0006-Create-Nova-ironic-conf.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0006-Create-Nova-ironic-conf.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0006-Create-Nova-ironic-conf.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0006-Create-Nova-ironic-conf.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0007-Remove-joshuabaird-ipaclient-from-puppet-nova-requir.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0007-Remove-joshuabaird-ipaclient-from-puppet-nova-requir.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0007-Remove-joshuabaird-ipaclient-from-puppet-nova-requir.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0007-Remove-joshuabaird-ipaclient-from-puppet-nova-requir.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0008-Adding-pci_weight_multiple-to-nova-scheduler-filter.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0008-Adding-pci_weight_multiple-to-nova-scheduler-filter.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0008-Adding-pci_weight_multiple-to-nova-scheduler-filter.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0008-Adding-pci_weight_multiple-to-nova-scheduler-filter.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0009-Remove-SerialConsole-from-NovaConf.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0009-Remove-SerialConsole-from-NovaConf.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0009-Remove-SerialConsole-from-NovaConf.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0009-Remove-SerialConsole-from-NovaConf.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0010-Remove-compute-huge.patch b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0010-Remove-compute-huge.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0010-Remove-compute-huge.patch
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0010-Remove-compute-huge.patch
diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-nova-11.4.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-nova-11.4.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0003-Add-os-region-name-option-for-system-controller.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0003-Add-os-region-name-option-for-system-controller.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0003-Add-os-region-name-option-for-system-controller.patch
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0003-Add-os-region-name-option-for-system-controller.patch
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0004-distributed-keystone-in-system-controller.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0004-distributed-keystone-in-system-controller.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0004-distributed-keystone-in-system-controller.patch
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0004-distributed-keystone-in-system-controller.patch
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0002-Add-os-region-name-option-for-system-controller.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0002-Add-os-region-name-option-for-system-controller.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0002-Add-os-region-name-option-for-system-controller.patch
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0002-Add-os-region-name-option-for-system-controller.patch
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch
diff --git a/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0002-Add-WRS-patch.patch b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0002-Add-WRS-patch.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0002-Add-WRS-patch.patch
rename to config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0002-Add-WRS-patch.patch
diff --git a/devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0003-psycopg2-drivername-for-postgres.patch b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0003-psycopg2-drivername-for-postgres.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0003-psycopg2-drivername-for-postgres.patch
rename to config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/0003-psycopg2-drivername-for-postgres.patch
diff --git a/devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/patches/0001-Remove-log_dir-from-conf-files.patch b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/patches/0001-Remove-log_dir-from-conf-files.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/patches/0001-Remove-log_dir-from-conf-files.patch
rename to config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/patches/0001-Remove-log_dir-from-conf-files.patch
diff --git a/devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/patches/0002-add-psycopg2-drivername-to-postgresql-settings.patch b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/patches/0002-add-psycopg2-drivername-to-postgresql-settings.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/patches/0002-add-psycopg2-drivername-to-postgresql-settings.patch
rename to config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/patches/0002-add-psycopg2-drivername-to-postgresql-settings.patch
diff --git a/devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-oslo-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-oslo-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/puppet-staging/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-panko-11.3.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-staging/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-panko-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/meta_patches/0001-meta-fix-panko-puppet-warning.patch b/config/puppet-modules/openstack/puppet-panko-11.3.0/centos/meta_patches/0001-meta-fix-panko-puppet-warning.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/meta_patches/0001-meta-fix-panko-puppet-warning.patch
rename to config/puppet-modules/openstack/puppet-panko-11.3.0/centos/meta_patches/0001-meta-fix-panko-puppet-warning.patch
diff --git a/devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-panko-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-panko-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/patches/0001-Fix-panko-puppet-warning.patch b/config/puppet-modules/openstack/puppet-panko-11.3.0/centos/patches/0001-Fix-panko-puppet-warning.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/patches/0001-Fix-panko-puppet-warning.patch
rename to config/puppet-modules/openstack/puppet-panko-11.3.0/centos/patches/0001-Fix-panko-puppet-warning.patch
diff --git a/devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-panko-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-panko-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-panko-11.3.0/centos/srpm_path
diff --git a/extended/libvirt-python/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-swift-11.3.0/centos/build_srpm.data
similarity index 100%
rename from extended/libvirt-python/centos/build_srpm.data
rename to config/puppet-modules/openstack/puppet-swift-11.3.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch b/config/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
rename to config/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-Titanium-format.patch
diff --git a/devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/0002-update-memcached-dependency.patch b/config/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/0002-update-memcached-dependency.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/0002-update-memcached-dependency.patch
rename to config/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/0002-update-memcached-dependency.patch
diff --git a/devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/openstack/puppet-swift-11.3.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/patches/0001-update-memcached-dependency.patch b/config/puppet-modules/openstack/puppet-swift-11.3.0/centos/patches/0001-update-memcached-dependency.patch
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/patches/0001-update-memcached-dependency.patch
rename to config/puppet-modules/openstack/puppet-swift-11.3.0/centos/patches/0001-update-memcached-dependency.patch
diff --git a/devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/srpm_path b/config/puppet-modules/openstack/puppet-swift-11.3.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/openstack/puppet-swift-11.3.0/centos/srpm_path
rename to config/puppet-modules/openstack/puppet-swift-11.3.0/centos/srpm_path
diff --git a/devtools/puppet-modules/puppet-boolean-1.0.2/centos/build_srpm.data b/config/puppet-modules/puppet-boolean-1.0.2/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-boolean-1.0.2/centos/build_srpm.data
rename to config/puppet-modules/puppet-boolean-1.0.2/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-boolean-1.0.2/centos/puppet-boolean.spec b/config/puppet-modules/puppet-boolean-1.0.2/centos/puppet-boolean.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-boolean-1.0.2/centos/puppet-boolean.spec
rename to config/puppet-modules/puppet-boolean-1.0.2/centos/puppet-boolean.spec
diff --git a/devtools/puppet-modules/puppet-create_resources/centos/build_srpm.data b/config/puppet-modules/puppet-create_resources/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-create_resources/centos/build_srpm.data
rename to config/puppet-modules/puppet-create_resources/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-create_resources/centos/puppet-create_resources.spec b/config/puppet-modules/puppet-create_resources/centos/puppet-create_resources.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-create_resources/centos/puppet-create_resources.spec
rename to config/puppet-modules/puppet-create_resources/centos/puppet-create_resources.spec
diff --git a/devtools/puppet-modules/puppet-dnsmasq/centos/build_srpm.data b/config/puppet-modules/puppet-dnsmasq/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-dnsmasq/centos/build_srpm.data
rename to config/puppet-modules/puppet-dnsmasq/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-dnsmasq/centos/files/0001-puppet-dnsmasq-Kilo-quilt-patches.patch b/config/puppet-modules/puppet-dnsmasq/centos/files/0001-puppet-dnsmasq-Kilo-quilt-patches.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-dnsmasq/centos/files/0001-puppet-dnsmasq-Kilo-quilt-patches.patch
rename to config/puppet-modules/puppet-dnsmasq/centos/files/0001-puppet-dnsmasq-Kilo-quilt-patches.patch
diff --git a/devtools/puppet-modules/puppet-dnsmasq/centos/files/0002-Fixing-mismatched-permission-on-dnsmasq-conf.patch b/config/puppet-modules/puppet-dnsmasq/centos/files/0002-Fixing-mismatched-permission-on-dnsmasq-conf.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-dnsmasq/centos/files/0002-Fixing-mismatched-permission-on-dnsmasq-conf.patch
rename to config/puppet-modules/puppet-dnsmasq/centos/files/0002-Fixing-mismatched-permission-on-dnsmasq-conf.patch
diff --git a/devtools/puppet-modules/puppet-dnsmasq/centos/files/0003-Support-management-of-tftp_max-option.patch b/config/puppet-modules/puppet-dnsmasq/centos/files/0003-Support-management-of-tftp_max-option.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-dnsmasq/centos/files/0003-Support-management-of-tftp_max-option.patch
rename to config/puppet-modules/puppet-dnsmasq/centos/files/0003-Support-management-of-tftp_max-option.patch
diff --git a/devtools/puppet-modules/puppet-dnsmasq/centos/files/0004-Enable-clear-DNS-cache-on-reload.patch b/config/puppet-modules/puppet-dnsmasq/centos/files/0004-Enable-clear-DNS-cache-on-reload.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-dnsmasq/centos/files/0004-Enable-clear-DNS-cache-on-reload.patch
rename to config/puppet-modules/puppet-dnsmasq/centos/files/0004-Enable-clear-DNS-cache-on-reload.patch
diff --git a/devtools/puppet-modules/puppet-dnsmasq/centos/puppet-dnsmasq.spec b/config/puppet-modules/puppet-dnsmasq/centos/puppet-dnsmasq.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-dnsmasq/centos/puppet-dnsmasq.spec
rename to config/puppet-modules/puppet-dnsmasq/centos/puppet-dnsmasq.spec
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/build_srpm.data b/config/puppet-modules/puppet-drbd-0.3.1/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/build_srpm.data
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0001-TIS-Patches.patch b/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0001-TIS-Patches.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0001-TIS-Patches.patch
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/files/0001-TIS-Patches.patch
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0002-Disable-timeout-for-mkfs-command.patch b/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0002-Disable-timeout-for-mkfs-command.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0002-Disable-timeout-for-mkfs-command.patch
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/files/0002-Disable-timeout-for-mkfs-command.patch
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0003-drbd-parallel-to-serial-synchronization.patch b/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0003-drbd-parallel-to-serial-synchronization.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0003-drbd-parallel-to-serial-synchronization.patch
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/files/0003-drbd-parallel-to-serial-synchronization.patch
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0004-US-96914-reuse-existing-drbd-cinder-resource.patch b/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0004-US-96914-reuse-existing-drbd-cinder-resource.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0004-US-96914-reuse-existing-drbd-cinder-resource.patch
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/files/0004-US-96914-reuse-existing-drbd-cinder-resource.patch
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0005-Add-PausedSync-states-to-acceptable-cstate.patch b/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0005-Add-PausedSync-states-to-acceptable-cstate.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0005-Add-PausedSync-states-to-acceptable-cstate.patch
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/files/0005-Add-PausedSync-states-to-acceptable-cstate.patch
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0006-CGTS-7164-Add-resource-options-cpu-mask-to-affine-drbd-kernel-threads.patch b/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0006-CGTS-7164-Add-resource-options-cpu-mask-to-affine-drbd-kernel-threads.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0006-CGTS-7164-Add-resource-options-cpu-mask-to-affine-drbd-kernel-threads.patch
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/files/0006-CGTS-7164-Add-resource-options-cpu-mask-to-affine-drbd-kernel-threads.patch
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0007-Add-disk-by-path-test.patch b/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0007-Add-disk-by-path-test.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0007-Add-disk-by-path-test.patch
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/files/0007-Add-disk-by-path-test.patch
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0008-CGTS-7953-support-for-new-drbd-resources.patch b/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0008-CGTS-7953-support-for-new-drbd-resources.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0008-CGTS-7953-support-for-new-drbd-resources.patch
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/files/0008-CGTS-7953-support-for-new-drbd-resources.patch
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0009-drbd-slow-before-swact.patch b/config/puppet-modules/puppet-drbd-0.3.1/centos/files/0009-drbd-slow-before-swact.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/files/0009-drbd-slow-before-swact.patch
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/files/0009-drbd-slow-before-swact.patch
diff --git a/devtools/puppet-modules/puppet-drbd-0.3.1/centos/puppet-drbd.spec b/config/puppet-modules/puppet-drbd-0.3.1/centos/puppet-drbd.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-drbd-0.3.1/centos/puppet-drbd.spec
rename to config/puppet-modules/puppet-drbd-0.3.1/centos/puppet-drbd.spec
diff --git a/devtools/puppet-modules/puppet-filemapper/centos/build_srpm.data b/config/puppet-modules/puppet-filemapper/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-filemapper/centos/build_srpm.data
rename to config/puppet-modules/puppet-filemapper/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-filemapper/centos/puppet-filemapper.spec b/config/puppet-modules/puppet-filemapper/centos/puppet-filemapper.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-filemapper/centos/puppet-filemapper.spec
rename to config/puppet-modules/puppet-filemapper/centos/puppet-filemapper.spec
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/build_srpm.data b/config/puppet-modules/puppet-haproxy-1.5.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/build_srpm.data
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0002-Add-TIS-patch.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0002-Add-TIS-patch.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0002-Add-TIS-patch.patch
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0002-Add-TIS-patch.patch
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0003-disable-config-validation-prechecks.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0003-disable-config-validation-prechecks.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0003-disable-config-validation-prechecks.patch
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0003-disable-config-validation-prechecks.patch
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0004-Add-global_options-patch.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0004-Add-global_options-patch.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0004-Add-global_options-patch.patch
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/0004-Add-global_options-patch.patch
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0002-disable-config-validation-prechecks.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0002-disable-config-validation-prechecks.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0002-disable-config-validation-prechecks.patch
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0002-disable-config-validation-prechecks.patch
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0003-Fix-global_options-log-default-value.patch b/config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0003-Fix-global_options-log-default-value.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0003-Fix-global_options-log-default-value.patch
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/patches/0003-Fix-global_options-log-default-value.patch
diff --git a/devtools/puppet-modules/puppet-haproxy-1.5.0/centos/srpm_path b/config/puppet-modules/puppet-haproxy-1.5.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/puppet-haproxy-1.5.0/centos/srpm_path
rename to config/puppet-modules/puppet-haproxy-1.5.0/centos/srpm_path
diff --git a/devtools/puppet-modules/puppet-ldap/centos/build_srpm.data b/config/puppet-modules/puppet-ldap/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-ldap/centos/build_srpm.data
rename to config/puppet-modules/puppet-ldap/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-ldap/centos/puppet-ldap.spec b/config/puppet-modules/puppet-ldap/centos/puppet-ldap.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-ldap/centos/puppet-ldap.spec
rename to config/puppet-modules/puppet-ldap/centos/puppet-ldap.spec
diff --git a/devtools/puppet-modules/puppet-ldap/puppet_downloader.sh b/config/puppet-modules/puppet-ldap/puppet_downloader.sh
similarity index 100%
rename from devtools/puppet-modules/puppet-ldap/puppet_downloader.sh
rename to config/puppet-modules/puppet-ldap/puppet_downloader.sh
diff --git a/devtools/puppet-modules/puppet-lvm/centos/build_srpm.data b/config/puppet-modules/puppet-lvm/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-lvm/centos/build_srpm.data
rename to config/puppet-modules/puppet-lvm/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-lvm/centos/files/0001-puppet-lvm-kilo-quilt-changes.patch b/config/puppet-modules/puppet-lvm/centos/files/0001-puppet-lvm-kilo-quilt-changes.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-lvm/centos/files/0001-puppet-lvm-kilo-quilt-changes.patch
rename to config/puppet-modules/puppet-lvm/centos/files/0001-puppet-lvm-kilo-quilt-changes.patch
diff --git a/devtools/puppet-modules/puppet-lvm/centos/files/0002-UEFI-pvcreate-fix.patch b/config/puppet-modules/puppet-lvm/centos/files/0002-UEFI-pvcreate-fix.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-lvm/centos/files/0002-UEFI-pvcreate-fix.patch
rename to config/puppet-modules/puppet-lvm/centos/files/0002-UEFI-pvcreate-fix.patch
diff --git a/devtools/puppet-modules/puppet-lvm/centos/files/0003-US94222-Persistent-Dev-Naming.patch b/config/puppet-modules/puppet-lvm/centos/files/0003-US94222-Persistent-Dev-Naming.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-lvm/centos/files/0003-US94222-Persistent-Dev-Naming.patch
rename to config/puppet-modules/puppet-lvm/centos/files/0003-US94222-Persistent-Dev-Naming.patch
diff --git a/devtools/puppet-modules/puppet-lvm/centos/files/0004-extendind-nuke_fs_on_resize_failure-functionality.patch b/config/puppet-modules/puppet-lvm/centos/files/0004-extendind-nuke_fs_on_resize_failure-functionality.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-lvm/centos/files/0004-extendind-nuke_fs_on_resize_failure-functionality.patch
rename to config/puppet-modules/puppet-lvm/centos/files/0004-extendind-nuke_fs_on_resize_failure-functionality.patch
diff --git a/devtools/puppet-modules/puppet-lvm/centos/puppet-lvm.spec b/config/puppet-modules/puppet-lvm/centos/puppet-lvm.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-lvm/centos/puppet-lvm.spec
rename to config/puppet-modules/puppet-lvm/centos/puppet-lvm.spec
diff --git a/devtools/puppet-modules/puppet-network/centos/build_srpm.data b/config/puppet-modules/puppet-network/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-network/centos/build_srpm.data
rename to config/puppet-modules/puppet-network/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-network/centos/files/Don-t-write-absent-to-redhat-route-files-and-test-fo.patch b/config/puppet-modules/puppet-network/centos/files/Don-t-write-absent-to-redhat-route-files-and-test-fo.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-network/centos/files/Don-t-write-absent-to-redhat-route-files-and-test-fo.patch
rename to config/puppet-modules/puppet-network/centos/files/Don-t-write-absent-to-redhat-route-files-and-test-fo.patch
diff --git a/devtools/puppet-modules/puppet-network/centos/files/fix-absent-options.patch b/config/puppet-modules/puppet-network/centos/files/fix-absent-options.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-network/centos/files/fix-absent-options.patch
rename to config/puppet-modules/puppet-network/centos/files/fix-absent-options.patch
diff --git a/devtools/puppet-modules/puppet-network/centos/files/ipv6-static-route-support.patch b/config/puppet-modules/puppet-network/centos/files/ipv6-static-route-support.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-network/centos/files/ipv6-static-route-support.patch
rename to config/puppet-modules/puppet-network/centos/files/ipv6-static-route-support.patch
diff --git a/devtools/puppet-modules/puppet-network/centos/files/permit-inservice-update-of-static-routes.patch b/config/puppet-modules/puppet-network/centos/files/permit-inservice-update-of-static-routes.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-network/centos/files/permit-inservice-update-of-static-routes.patch
rename to config/puppet-modules/puppet-network/centos/files/permit-inservice-update-of-static-routes.patch
diff --git a/devtools/puppet-modules/puppet-network/centos/files/puppet-network-Kilo-quilt-changes.patch b/config/puppet-modules/puppet-network/centos/files/puppet-network-Kilo-quilt-changes.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-network/centos/files/puppet-network-Kilo-quilt-changes.patch
rename to config/puppet-modules/puppet-network/centos/files/puppet-network-Kilo-quilt-changes.patch
diff --git a/devtools/puppet-modules/puppet-network/centos/files/puppet-network-support-ipv6.patch b/config/puppet-modules/puppet-network/centos/files/puppet-network-support-ipv6.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-network/centos/files/puppet-network-support-ipv6.patch
rename to config/puppet-modules/puppet-network/centos/files/puppet-network-support-ipv6.patch
diff --git a/devtools/puppet-modules/puppet-network/centos/files/route-options-support.patch b/config/puppet-modules/puppet-network/centos/files/route-options-support.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-network/centos/files/route-options-support.patch
rename to config/puppet-modules/puppet-network/centos/files/route-options-support.patch
diff --git a/devtools/puppet-modules/puppet-network/centos/puppet-network.spec b/config/puppet-modules/puppet-network/centos/puppet-network.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-network/centos/puppet-network.spec
rename to config/puppet-modules/puppet-network/centos/puppet-network.spec
diff --git a/devtools/puppet-modules/puppet-nslcd/centos/build_srpm.data b/config/puppet-modules/puppet-nslcd/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-nslcd/centos/build_srpm.data
rename to config/puppet-modules/puppet-nslcd/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-nslcd/centos/puppet-nslcd.spec b/config/puppet-modules/puppet-nslcd/centos/puppet-nslcd.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-nslcd/centos/puppet-nslcd.spec
rename to config/puppet-modules/puppet-nslcd/centos/puppet-nslcd.spec
diff --git a/devtools/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data b/config/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data
rename to config/puppet-modules/puppet-postgresql-4.8.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-postgresql-4.8.0/centos/files/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-postgresql-4.8.0/centos/files/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/puppet-postgresql-4.8.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch b/config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-postgresql-4.8.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch
rename to config/puppet-modules/puppet-postgresql-4.8.0/centos/files/0002-remove-puppetlabs-apt-as-a-requirement.patch
diff --git a/devtools/puppet-modules/puppet-postgresql-4.8.0/centos/puppet-postgresql.spec b/config/puppet-modules/puppet-postgresql-4.8.0/centos/puppet-postgresql.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-postgresql-4.8.0/centos/puppet-postgresql.spec
rename to config/puppet-modules/puppet-postgresql-4.8.0/centos/puppet-postgresql.spec
diff --git a/devtools/puppet-modules/puppet-puppi/centos/build_srpm.data b/config/puppet-modules/puppet-puppi/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-puppi/centos/build_srpm.data
rename to config/puppet-modules/puppet-puppi/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-puppi/centos/puppet-puppi.spec b/config/puppet-modules/puppet-puppi/centos/puppet-puppi.spec
similarity index 100%
rename from devtools/puppet-modules/puppet-puppi/centos/puppet-puppi.spec
rename to config/puppet-modules/puppet-puppi/centos/puppet-puppi.spec
diff --git a/devtools/puppet-modules/puppet-puppi/puppet_downloader.sh b/config/puppet-modules/puppet-puppi/puppet_downloader.sh
similarity index 100%
rename from devtools/puppet-modules/puppet-puppi/puppet_downloader.sh
rename to config/puppet-modules/puppet-puppi/puppet_downloader.sh
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/build_srpm.data b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/build_srpm.data
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0002-Add-TIS-patch.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0002-Add-TIS-patch.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0002-Add-TIS-patch.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0002-Add-TIS-patch.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0003-meta-Changed-cipher-specification-to-openssl-format.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0003-meta-Changed-cipher-specification-to-openssl-format.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0003-meta-Changed-cipher-specification-to-openssl-format.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0003-meta-Changed-cipher-specification-to-openssl-format.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0004-Add-deprecation-patch-to-spec.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0004-Add-deprecation-patch-to-spec.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0004-Add-deprecation-patch-to-spec.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0004-Add-deprecation-patch-to-spec.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0005-metapatch-for-revert.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0005-metapatch-for-revert.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0005-metapatch-for-revert.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0005-metapatch-for-revert.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0006-metapatch-for-fact-removal.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0006-metapatch-for-fact-removal.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0006-metapatch-for-fact-removal.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/0006-metapatch-for-fact-removal.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0001-Roll-up-TIS-patches.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0001-Roll-up-TIS-patches.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0001-Roll-up-TIS-patches.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0001-Roll-up-TIS-patches.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0002-Changed-cipher-specification-to-openssl-format.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0002-Changed-cipher-specification-to-openssl-format.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0002-Changed-cipher-specification-to-openssl-format.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0002-Changed-cipher-specification-to-openssl-format.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0003-Eliminate-Puppet-4-deprecation-warnings.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0003-Eliminate-Puppet-4-deprecation-warnings.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0003-Eliminate-Puppet-4-deprecation-warnings.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0003-Eliminate-Puppet-4-deprecation-warnings.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0004-Partially-revert-upstream-commit-f7c3a4a637d59f3065d.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0004-Partially-revert-upstream-commit-f7c3a4a637d59f3065d.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0004-Partially-revert-upstream-commit-f7c3a4a637d59f3065d.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0004-Partially-revert-upstream-commit-f7c3a4a637d59f3065d.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0005-Remove-the-rabbitmq_nodename-fact.patch b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0005-Remove-the-rabbitmq_nodename-fact.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0005-Remove-the-rabbitmq_nodename-fact.patch
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0005-Remove-the-rabbitmq_nodename-fact.patch
diff --git a/devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/srpm_path b/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/puppet-rabbitmq-5.5.0/centos/srpm_path
rename to config/puppet-modules/puppet-rabbitmq-5.5.0/centos/srpm_path
diff --git a/extended/memcached/centos/build_srpm.data b/config/puppet-modules/puppet-staging/centos/build_srpm.data
similarity index 100%
rename from extended/memcached/centos/build_srpm.data
rename to config/puppet-modules/puppet-staging/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-staging/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/puppet-staging/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-staging/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/puppet-staging/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/puppet-staging/centos/meta_patches/0002-Apply-rename-patch.patch b/config/puppet-modules/puppet-staging/centos/meta_patches/0002-Apply-rename-patch.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-staging/centos/meta_patches/0002-Apply-rename-patch.patch
rename to config/puppet-modules/puppet-staging/centos/meta_patches/0002-Apply-rename-patch.patch
diff --git a/devtools/puppet-modules/puppet-staging/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/puppet-staging/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/puppet-staging/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/puppet-staging/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/puppet-staging/centos/patches/0001-Rename-nanliu-staging-to-puppet-staging.patch b/config/puppet-modules/puppet-staging/centos/patches/0001-Rename-nanliu-staging-to-puppet-staging.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-staging/centos/patches/0001-Rename-nanliu-staging-to-puppet-staging.patch
rename to config/puppet-modules/puppet-staging/centos/patches/0001-Rename-nanliu-staging-to-puppet-staging.patch
diff --git a/devtools/puppet-modules/puppet-staging/centos/srpm_path b/config/puppet-modules/puppet-staging/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/puppet-staging/centos/srpm_path
rename to config/puppet-modules/puppet-staging/centos/srpm_path
diff --git a/devtools/puppet-modules/puppet-stdlib-4.12.0/centos/build_srpm.data b/config/puppet-modules/puppet-stdlib-4.12.0/centos/build_srpm.data
similarity index 100%
rename from devtools/puppet-modules/puppet-stdlib-4.12.0/centos/build_srpm.data
rename to config/puppet-modules/puppet-stdlib-4.12.0/centos/build_srpm.data
diff --git a/devtools/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0002-Add-TIS-Patches.patch b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0002-Add-TIS-Patches.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0002-Add-TIS-Patches.patch
rename to config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0002-Add-TIS-Patches.patch
diff --git a/devtools/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0003-Improve-ipv6-support-for-type.patch b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0003-Improve-ipv6-support-for-type.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0003-Improve-ipv6-support-for-type.patch
rename to config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0003-Improve-ipv6-support-for-type.patch
diff --git a/devtools/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/PATCH_ORDER
rename to config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0001-Filter-password-in-logs.patch b/config/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0001-Filter-password-in-logs.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0001-Filter-password-in-logs.patch
rename to config/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0001-Filter-password-in-logs.patch
diff --git a/devtools/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0002-Improve-ipv6-support-for-type.patch b/config/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0002-Improve-ipv6-support-for-type.patch
similarity index 100%
rename from devtools/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0002-Improve-ipv6-support-for-type.patch
rename to config/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0002-Improve-ipv6-support-for-type.patch
diff --git a/devtools/puppet-modules/puppet-stdlib-4.12.0/centos/srpm_path b/config/puppet-modules/puppet-stdlib-4.12.0/centos/srpm_path
similarity index 100%
rename from devtools/puppet-modules/puppet-stdlib-4.12.0/centos/srpm_path
rename to config/puppet-modules/puppet-stdlib-4.12.0/centos/srpm_path
diff --git a/core/initscripts/centos/build_srpm.data b/core/initscripts/centos/build_srpm.data
deleted file mode 100644
index 6500abc26..000000000
--- a/core/initscripts/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="$FILES_BASE/* $GIT_BASE/extended/procps/files/sysctl.conf"
-TIS_PATCH_VER=16
diff --git a/core/util-linux/centos/build_srpm.data b/core/util-linux/centos/build_srpm.data
deleted file mode 100644
index dd92c8771..000000000
--- a/core/util-linux/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="$GIT_BASE/extended/shadow/files/pam.d/su"
-TIS_PATCH_VER=3
diff --git a/extended/irqbalance/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/extended/irqbalance/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
deleted file mode 100644
index 573c6ddc6..000000000
--- a/extended/irqbalance/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f2d3ca9a2b62632b9d783b3448c0e04eb0dade74 Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Mon, 2 Oct 2017 16:57:43 -0400
-Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch
-
-Conflicts:
-	SPECS/irqbalance.spec
----
- SPECS/irqbalance.spec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SPECS/irqbalance.spec b/SPECS/irqbalance.spec
-index 3e70224..15a42c3 100644
---- a/SPECS/irqbalance.spec
-+++ b/SPECS/irqbalance.spec
-@@ -1,6 +1,6 @@
- Name:           irqbalance
- Version:        1.0.7
--Release:        10%{?dist}
-+Release:        10.el7%{?_tis_dist}.%{tis_patch_ver}
- Epoch:          3
- Summary:        IRQ balancing daemon
- 
--- 
-1.9.1
-
diff --git a/extended/irqbalance/centos/meta_patches/PATCH_ORDER b/extended/irqbalance/centos/meta_patches/PATCH_ORDER
deleted file mode 100644
index 97fa73602..000000000
--- a/extended/irqbalance/centos/meta_patches/PATCH_ORDER
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Update-package-versioning-for-TIS-format.patch
-spec-disable-irqbalance-service.patch
diff --git a/extended/irqbalance/centos/meta_patches/spec-disable-irqbalance-service.patch b/extended/irqbalance/centos/meta_patches/spec-disable-irqbalance-service.patch
deleted file mode 100644
index 62f3b622c..000000000
--- a/extended/irqbalance/centos/meta_patches/spec-disable-irqbalance-service.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4a6da18465135333b470cc3f1817b78e6177886a Mon Sep 17 00:00:00 2001
-From: Scott Little <scott.little@windriver.com>
-Date: Mon, 2 Oct 2017 16:57:43 -0400
-Subject: [PATCH 1/3] WRS: spec-disable-irqbalance-service.patch
-
----
- SPECS/irqbalance.spec | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/SPECS/irqbalance.spec b/SPECS/irqbalance.spec
-index 9d4e948..3e70224 100644
---- a/SPECS/irqbalance.spec
-+++ b/SPECS/irqbalance.spec
-@@ -89,21 +89,6 @@ install -p -m 0644 ./irqbalance.1 %{buildroot}%{_mandir}/man1/
- %{_mandir}/man1/*
- %config(noreplace) %{_sysconfdir}/sysconfig/irqbalance
- 
--%post
--%systemd_post irqbalance.service
--
--%preun
--%systemd_preun irqbalance.service
--
--%postun
--%systemd_postun_with_restart irqbalance.service
--
--%triggerun -- irqbalance < 2:0.56-3
--if /sbin/chkconfig --level 3 irqbalance ; then
--    /bin/systemctl enable irqbalance.service >/dev/null 2>&1 || :
--fi
--/sbin/chkconfig --del irqbalance >/dev/null 2>&1 || :
--
- %changelog
- * Tue May 16 2017 Petr Oros <poros@redhat.com> - 3:1.0.7-10
- - irqbalance node package patch
--- 
-1.9.1
-
diff --git a/extended/irqbalance/centos/srpm_path b/extended/irqbalance/centos/srpm_path
deleted file mode 100644
index 8efe7876a..000000000
--- a/extended/irqbalance/centos/srpm_path
+++ /dev/null
@@ -1 +0,0 @@
-mirror:Source/irqbalance-1.0.7-10.el7.src.rpm
diff --git a/extended/sanlock/centos/build_srpm.data b/filesystem/e2fsprogs/centos/build_srpm.data
similarity index 100%
rename from extended/sanlock/centos/build_srpm.data
rename to filesystem/e2fsprogs/centos/build_srpm.data
diff --git a/extended/e2fsprogs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/filesystem/e2fsprogs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/e2fsprogs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to filesystem/e2fsprogs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/e2fsprogs/centos/meta_patches/0002-SPEC-tamper-proof-bash-log.patch b/filesystem/e2fsprogs/centos/meta_patches/0002-SPEC-tamper-proof-bash-log.patch
similarity index 100%
rename from extended/e2fsprogs/centos/meta_patches/0002-SPEC-tamper-proof-bash-log.patch
rename to filesystem/e2fsprogs/centos/meta_patches/0002-SPEC-tamper-proof-bash-log.patch
diff --git a/extended/e2fsprogs/centos/meta_patches/PATCH_ORDER b/filesystem/e2fsprogs/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/e2fsprogs/centos/meta_patches/PATCH_ORDER
rename to filesystem/e2fsprogs/centos/meta_patches/PATCH_ORDER
diff --git a/extended/e2fsprogs/centos/meta_patches/meta-e2fsprogs-disable-tests.patch b/filesystem/e2fsprogs/centos/meta_patches/meta-e2fsprogs-disable-tests.patch
similarity index 100%
rename from extended/e2fsprogs/centos/meta_patches/meta-e2fsprogs-disable-tests.patch
rename to filesystem/e2fsprogs/centos/meta_patches/meta-e2fsprogs-disable-tests.patch
diff --git a/extended/e2fsprogs/centos/patches/0100-tamper-proof-bash-log.patch b/filesystem/e2fsprogs/centos/patches/0100-tamper-proof-bash-log.patch
similarity index 100%
rename from extended/e2fsprogs/centos/patches/0100-tamper-proof-bash-log.patch
rename to filesystem/e2fsprogs/centos/patches/0100-tamper-proof-bash-log.patch
diff --git a/extended/e2fsprogs/centos/patches/0101-e2fsprogs-disable-tests.patch b/filesystem/e2fsprogs/centos/patches/0101-e2fsprogs-disable-tests.patch
similarity index 100%
rename from extended/e2fsprogs/centos/patches/0101-e2fsprogs-disable-tests.patch
rename to filesystem/e2fsprogs/centos/patches/0101-e2fsprogs-disable-tests.patch
diff --git a/extended/e2fsprogs/centos/srpm_path b/filesystem/e2fsprogs/centos/srpm_path
similarity index 100%
rename from extended/e2fsprogs/centos/srpm_path
rename to filesystem/e2fsprogs/centos/srpm_path
diff --git a/base/nss-pam-ldapd/centos/build_srpm.data b/filesystem/nfs-utils/centos/build_srpm.data
similarity index 100%
rename from base/nss-pam-ldapd/centos/build_srpm.data
rename to filesystem/nfs-utils/centos/build_srpm.data
diff --git a/connectivity/nfs-utils/centos/meta_patches/0001-TiS-nfs-utils-spec-add-scripts.patch b/filesystem/nfs-utils/centos/meta_patches/0001-TiS-nfs-utils-spec-add-scripts.patch
similarity index 100%
rename from connectivity/nfs-utils/centos/meta_patches/0001-TiS-nfs-utils-spec-add-scripts.patch
rename to filesystem/nfs-utils/centos/meta_patches/0001-TiS-nfs-utils-spec-add-scripts.patch
diff --git a/connectivity/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/filesystem/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from connectivity/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to filesystem/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/connectivity/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch b/filesystem/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch
similarity index 100%
rename from connectivity/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch
rename to filesystem/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch
diff --git a/connectivity/nfs-utils/centos/meta_patches/0002-Add-nfs-utils-update-nfsmount.conf-with-required-con.patch b/filesystem/nfs-utils/centos/meta_patches/0002-Add-nfs-utils-update-nfsmount.conf-with-required-con.patch
similarity index 100%
rename from connectivity/nfs-utils/centos/meta_patches/0002-Add-nfs-utils-update-nfsmount.conf-with-required-con.patch
rename to filesystem/nfs-utils/centos/meta_patches/0002-Add-nfs-utils-update-nfsmount.conf-with-required-con.patch
diff --git a/connectivity/nfs-utils/centos/meta_patches/PATCH_ORDER b/filesystem/nfs-utils/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from connectivity/nfs-utils/centos/meta_patches/PATCH_ORDER
rename to filesystem/nfs-utils/centos/meta_patches/PATCH_ORDER
diff --git a/connectivity/nfs-utils/centos/meta_patches/nfs-utils-spec-file-disable-statd-service.patch b/filesystem/nfs-utils/centos/meta_patches/nfs-utils-spec-file-disable-statd-service.patch
similarity index 100%
rename from connectivity/nfs-utils/centos/meta_patches/nfs-utils-spec-file-disable-statd-service.patch
rename to filesystem/nfs-utils/centos/meta_patches/nfs-utils-spec-file-disable-statd-service.patch
diff --git a/connectivity/nfs-utils/centos/patches/nfs-utils-do-not-pass-CFLAGS-to-native.patch b/filesystem/nfs-utils/centos/patches/nfs-utils-do-not-pass-CFLAGS-to-native.patch
similarity index 100%
rename from connectivity/nfs-utils/centos/patches/nfs-utils-do-not-pass-CFLAGS-to-native.patch
rename to filesystem/nfs-utils/centos/patches/nfs-utils-do-not-pass-CFLAGS-to-native.patch
diff --git a/connectivity/nfs-utils/centos/patches/nfs-utils-support-mountprog-and-nfsprog-options.patch b/filesystem/nfs-utils/centos/patches/nfs-utils-support-mountprog-and-nfsprog-options.patch
similarity index 100%
rename from connectivity/nfs-utils/centos/patches/nfs-utils-support-mountprog-and-nfsprog-options.patch
rename to filesystem/nfs-utils/centos/patches/nfs-utils-support-mountprog-and-nfsprog-options.patch
diff --git a/connectivity/nfs-utils/centos/patches/nfs-utils-update-nfsmount.conf-with-required-config.patch b/filesystem/nfs-utils/centos/patches/nfs-utils-update-nfsmount.conf-with-required-config.patch
similarity index 100%
rename from connectivity/nfs-utils/centos/patches/nfs-utils-update-nfsmount.conf-with-required-config.patch
rename to filesystem/nfs-utils/centos/patches/nfs-utils-update-nfsmount.conf-with-required-config.patch
diff --git a/connectivity/nfs-utils/centos/srpm_path b/filesystem/nfs-utils/centos/srpm_path
similarity index 100%
rename from connectivity/nfs-utils/centos/srpm_path
rename to filesystem/nfs-utils/centos/srpm_path
diff --git a/connectivity/nfs-utils/files/nfs-mountd.service b/filesystem/nfs-utils/files/nfs-mountd.service
similarity index 100%
rename from connectivity/nfs-utils/files/nfs-mountd.service
rename to filesystem/nfs-utils/files/nfs-mountd.service
diff --git a/connectivity/nfs-utils/files/nfs-server.service b/filesystem/nfs-utils/files/nfs-server.service
similarity index 100%
rename from connectivity/nfs-utils/files/nfs-server.service
rename to filesystem/nfs-utils/files/nfs-server.service
diff --git a/connectivity/nfs-utils/files/nfs-statd.service b/filesystem/nfs-utils/files/nfs-statd.service
similarity index 100%
rename from connectivity/nfs-utils/files/nfs-statd.service
rename to filesystem/nfs-utils/files/nfs-statd.service
diff --git a/connectivity/nfs-utils/files/nfs-utils-do-not-pass-CFLAGS-to-native.patch b/filesystem/nfs-utils/files/nfs-utils-do-not-pass-CFLAGS-to-native.patch
similarity index 100%
rename from connectivity/nfs-utils/files/nfs-utils-do-not-pass-CFLAGS-to-native.patch
rename to filesystem/nfs-utils/files/nfs-utils-do-not-pass-CFLAGS-to-native.patch
diff --git a/connectivity/nfs-utils/files/nfs-utils-support-mountprog-and-nfsprog-options.patch b/filesystem/nfs-utils/files/nfs-utils-support-mountprog-and-nfsprog-options.patch
similarity index 100%
rename from connectivity/nfs-utils/files/nfs-utils-support-mountprog-and-nfsprog-options.patch
rename to filesystem/nfs-utils/files/nfs-utils-support-mountprog-and-nfsprog-options.patch
diff --git a/connectivity/nfs-utils/files/nfs-utils.conf b/filesystem/nfs-utils/files/nfs-utils.conf
similarity index 100%
rename from connectivity/nfs-utils/files/nfs-utils.conf
rename to filesystem/nfs-utils/files/nfs-utils.conf
diff --git a/connectivity/nfs-utils/files/nfscommon b/filesystem/nfs-utils/files/nfscommon
similarity index 100%
rename from connectivity/nfs-utils/files/nfscommon
rename to filesystem/nfs-utils/files/nfscommon
diff --git a/connectivity/nfs-utils/files/nfscommon.service b/filesystem/nfs-utils/files/nfscommon.service
similarity index 100%
rename from connectivity/nfs-utils/files/nfscommon.service
rename to filesystem/nfs-utils/files/nfscommon.service
diff --git a/connectivity/nfs-utils/files/nfsserver b/filesystem/nfs-utils/files/nfsserver
similarity index 100%
rename from connectivity/nfs-utils/files/nfsserver
rename to filesystem/nfs-utils/files/nfsserver
diff --git a/connectivity/nfs-utils/files/nfsserver.service b/filesystem/nfs-utils/files/nfsserver.service
similarity index 100%
rename from connectivity/nfs-utils/files/nfsserver.service
rename to filesystem/nfs-utils/files/nfsserver.service
diff --git a/base/namespace-utils/LICENSE b/filesystem/nfscheck/LICENSE
similarity index 100%
rename from base/namespace-utils/LICENSE
rename to filesystem/nfscheck/LICENSE
diff --git a/devtools/nfscheck/recipes-common/nfscheck/PKG-INFO b/filesystem/nfscheck/PKG-INFO
similarity index 100%
rename from devtools/nfscheck/recipes-common/nfscheck/PKG-INFO
rename to filesystem/nfscheck/PKG-INFO
diff --git a/devtools/nfscheck/recipes-common/nfscheck/centos/build_srpm.data b/filesystem/nfscheck/centos/build_srpm.data
similarity index 100%
rename from devtools/nfscheck/recipes-common/nfscheck/centos/build_srpm.data
rename to filesystem/nfscheck/centos/build_srpm.data
diff --git a/devtools/nfscheck/recipes-common/nfscheck/centos/nfscheck.spec b/filesystem/nfscheck/centos/nfscheck.spec
similarity index 100%
rename from devtools/nfscheck/recipes-common/nfscheck/centos/nfscheck.spec
rename to filesystem/nfscheck/centos/nfscheck.spec
diff --git a/base/namespace-utils/namespace-utils/LICENSE b/filesystem/nfscheck/files/LICENSE
similarity index 100%
rename from base/namespace-utils/namespace-utils/LICENSE
rename to filesystem/nfscheck/files/LICENSE
diff --git a/devtools/nfscheck/recipes-common/nfscheck/files/nfscheck-init.sh b/filesystem/nfscheck/files/nfscheck-init.sh
similarity index 100%
rename from devtools/nfscheck/recipes-common/nfscheck/files/nfscheck-init.sh
rename to filesystem/nfscheck/files/nfscheck-init.sh
diff --git a/devtools/nfscheck/recipes-common/nfscheck/files/nfscheck.service b/filesystem/nfscheck/files/nfscheck.service
similarity index 100%
rename from devtools/nfscheck/recipes-common/nfscheck/files/nfscheck.service
rename to filesystem/nfscheck/files/nfscheck.service
diff --git a/devtools/nfscheck/recipes-common/nfscheck/files/nfscheck.sh b/filesystem/nfscheck/files/nfscheck.sh
similarity index 100%
rename from devtools/nfscheck/recipes-common/nfscheck/files/nfscheck.sh
rename to filesystem/nfscheck/files/nfscheck.sh
diff --git a/mellanox/mlnx-ofa_kernel/centos/build_srpm.data b/kernel/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data
similarity index 100%
rename from mellanox/mlnx-ofa_kernel/centos/build_srpm.data
rename to kernel/kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data
diff --git a/mellanox/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch b/kernel/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch
similarity index 100%
rename from mellanox/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch
rename to kernel/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/0001-Support-TiS-system.patch
diff --git a/mellanox/mlnx-ofa_kernel/centos/meta_patches/PATCH_ORDER b/kernel/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from mellanox/mlnx-ofa_kernel/centos/meta_patches/PATCH_ORDER
rename to kernel/kernel-modules/mlnx-ofa_kernel/centos/meta_patches/PATCH_ORDER
diff --git a/mellanox/mlnx-ofa_kernel/centos/patches/0001-neuter-HAVE_IEEE_GETQCN.patch b/kernel/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-neuter-HAVE_IEEE_GETQCN.patch
similarity index 100%
rename from mellanox/mlnx-ofa_kernel/centos/patches/0001-neuter-HAVE_IEEE_GETQCN.patch
rename to kernel/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-neuter-HAVE_IEEE_GETQCN.patch
diff --git a/mellanox/mlnx-ofa_kernel/centos/patches/0001-neuter-a-bunch-of-ks-stuff.patch b/kernel/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-neuter-a-bunch-of-ks-stuff.patch
similarity index 100%
rename from mellanox/mlnx-ofa_kernel/centos/patches/0001-neuter-a-bunch-of-ks-stuff.patch
rename to kernel/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-neuter-a-bunch-of-ks-stuff.patch
diff --git a/mellanox/mlnx-ofa_kernel/centos/patches/0001-neuter-some-stats-output.patch b/kernel/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-neuter-some-stats-output.patch
similarity index 100%
rename from mellanox/mlnx-ofa_kernel/centos/patches/0001-neuter-some-stats-output.patch
rename to kernel/kernel-modules/mlnx-ofa_kernel/centos/patches/0001-neuter-some-stats-output.patch
diff --git a/mellanox/mlnx-ofa_kernel/centos/srpm_path b/kernel/kernel-modules/mlnx-ofa_kernel/centos/srpm_path
similarity index 100%
rename from mellanox/mlnx-ofa_kernel/centos/srpm_path
rename to kernel/kernel-modules/mlnx-ofa_kernel/centos/srpm_path
diff --git a/mellanox/mlnx-ofa_kernel/files/modules-load.conf b/kernel/kernel-modules/mlnx-ofa_kernel/files/modules-load.conf
similarity index 100%
rename from mellanox/mlnx-ofa_kernel/files/modules-load.conf
rename to kernel/kernel-modules/mlnx-ofa_kernel/files/modules-load.conf
diff --git a/kernel-rt/centos/build_srpm.data b/kernel/kernel-rt/centos/build_srpm.data
similarity index 100%
rename from kernel-rt/centos/build_srpm.data
rename to kernel/kernel-rt/centos/build_srpm.data
diff --git a/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch b/kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
similarity index 100%
rename from kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
rename to kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
diff --git a/kernel-rt/centos/meta_patches/Compile-issues.patch b/kernel/kernel-rt/centos/meta_patches/Compile-issues.patch
similarity index 100%
rename from kernel-rt/centos/meta_patches/Compile-issues.patch
rename to kernel/kernel-rt/centos/meta_patches/Compile-issues.patch
diff --git a/kernel-rt/centos/meta_patches/Kernel-source-patches-for-TiC.patch b/kernel/kernel-rt/centos/meta_patches/Kernel-source-patches-for-TiC.patch
similarity index 100%
rename from kernel-rt/centos/meta_patches/Kernel-source-patches-for-TiC.patch
rename to kernel/kernel-rt/centos/meta_patches/Kernel-source-patches-for-TiC.patch
diff --git a/kernel-rt/centos/meta_patches/Lower-the-compiler-version-requirement.patch b/kernel/kernel-rt/centos/meta_patches/Lower-the-compiler-version-requirement.patch
similarity index 100%
rename from kernel-rt/centos/meta_patches/Lower-the-compiler-version-requirement.patch
rename to kernel/kernel-rt/centos/meta_patches/Lower-the-compiler-version-requirement.patch
diff --git a/kernel-rt/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch b/kernel/kernel-rt/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch
similarity index 100%
rename from kernel-rt/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch
rename to kernel/kernel-rt/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch
diff --git a/kernel-rt/centos/meta_patches/PATCH_ORDER b/kernel/kernel-rt/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from kernel-rt/centos/meta_patches/PATCH_ORDER
rename to kernel/kernel-rt/centos/meta_patches/PATCH_ORDER
diff --git a/kernel-rt/centos/patches/Add-missing-ifdef-around-max-latency-variable.patch b/kernel/kernel-rt/centos/patches/Add-missing-ifdef-around-max-latency-variable.patch
similarity index 100%
rename from kernel-rt/centos/patches/Add-missing-ifdef-around-max-latency-variable.patch
rename to kernel/kernel-rt/centos/patches/Add-missing-ifdef-around-max-latency-variable.patch
diff --git a/kernel-rt/centos/patches/Affine-irqs-and-workqueues-with-kthread_cpus.patch b/kernel/kernel-rt/centos/patches/Affine-irqs-and-workqueues-with-kthread_cpus.patch
similarity index 100%
rename from kernel-rt/centos/patches/Affine-irqs-and-workqueues-with-kthread_cpus.patch
rename to kernel/kernel-rt/centos/patches/Affine-irqs-and-workqueues-with-kthread_cpus.patch
diff --git a/kernel-rt/centos/patches/CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch b/kernel/kernel-rt/centos/patches/CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
similarity index 100%
rename from kernel-rt/centos/patches/CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
rename to kernel/kernel-rt/centos/patches/CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
diff --git a/kernel-rt/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch b/kernel/kernel-rt/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
similarity index 100%
rename from kernel-rt/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
rename to kernel/kernel-rt/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
diff --git a/kernel-rt/centos/patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch b/kernel/kernel-rt/centos/patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
similarity index 100%
rename from kernel-rt/centos/patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
rename to kernel/kernel-rt/centos/patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
diff --git a/kernel-rt/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch b/kernel/kernel-rt/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
similarity index 100%
rename from kernel-rt/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
rename to kernel/kernel-rt/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
diff --git a/kernel-rt/centos/patches/Fix-cacheinfo-compilation-issues-for-3.10.patch b/kernel/kernel-rt/centos/patches/Fix-cacheinfo-compilation-issues-for-3.10.patch
similarity index 100%
rename from kernel-rt/centos/patches/Fix-cacheinfo-compilation-issues-for-3.10.patch
rename to kernel/kernel-rt/centos/patches/Fix-cacheinfo-compilation-issues-for-3.10.patch
diff --git a/kernel-rt/centos/patches/Make-kernel-start-eth-devices-at-offset.patch b/kernel/kernel-rt/centos/patches/Make-kernel-start-eth-devices-at-offset.patch
similarity index 100%
rename from kernel-rt/centos/patches/Make-kernel-start-eth-devices-at-offset.patch
rename to kernel/kernel-rt/centos/patches/Make-kernel-start-eth-devices-at-offset.patch
diff --git a/kernel-rt/centos/patches/Notification-of-death-of-arbitrary-processes.patch b/kernel/kernel-rt/centos/patches/Notification-of-death-of-arbitrary-processes.patch
similarity index 100%
rename from kernel-rt/centos/patches/Notification-of-death-of-arbitrary-processes.patch
rename to kernel/kernel-rt/centos/patches/Notification-of-death-of-arbitrary-processes.patch
diff --git a/kernel-rt/centos/patches/PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch b/kernel/kernel-rt/centos/patches/PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
similarity index 100%
rename from kernel-rt/centos/patches/PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
rename to kernel/kernel-rt/centos/patches/PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
diff --git a/kernel-rt/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch b/kernel/kernel-rt/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch
similarity index 100%
rename from kernel-rt/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch
rename to kernel/kernel-rt/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch
diff --git a/kernel-rt/centos/patches/US101216-IMA-support-in-Titanium-kernel.patch b/kernel/kernel-rt/centos/patches/US101216-IMA-support-in-Titanium-kernel.patch
similarity index 100%
rename from kernel-rt/centos/patches/US101216-IMA-support-in-Titanium-kernel.patch
rename to kernel/kernel-rt/centos/patches/US101216-IMA-support-in-Titanium-kernel.patch
diff --git a/kernel-rt/centos/patches/US103091-IMA-System-Configuration.patch b/kernel/kernel-rt/centos/patches/US103091-IMA-System-Configuration.patch
similarity index 100%
rename from kernel-rt/centos/patches/US103091-IMA-System-Configuration.patch
rename to kernel/kernel-rt/centos/patches/US103091-IMA-System-Configuration.patch
diff --git a/kernel-rt/centos/patches/affine-compute-kernel-threads.patch b/kernel/kernel-rt/centos/patches/affine-compute-kernel-threads.patch
similarity index 100%
rename from kernel-rt/centos/patches/affine-compute-kernel-threads.patch
rename to kernel/kernel-rt/centos/patches/affine-compute-kernel-threads.patch
diff --git a/kernel-rt/centos/patches/aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch b/kernel/kernel-rt/centos/patches/aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
similarity index 100%
rename from kernel-rt/centos/patches/aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
rename to kernel/kernel-rt/centos/patches/aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
diff --git a/kernel-rt/centos/patches/cma-add-placement-specifier-for-cma-kernel-parameter.patch b/kernel/kernel-rt/centos/patches/cma-add-placement-specifier-for-cma-kernel-parameter.patch
similarity index 100%
rename from kernel-rt/centos/patches/cma-add-placement-specifier-for-cma-kernel-parameter.patch
rename to kernel/kernel-rt/centos/patches/cma-add-placement-specifier-for-cma-kernel-parameter.patch
diff --git a/kernel-rt/centos/patches/cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch b/kernel/kernel-rt/centos/patches/cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
similarity index 100%
rename from kernel-rt/centos/patches/cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
rename to kernel/kernel-rt/centos/patches/cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
diff --git a/kernel-rt/centos/patches/cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch b/kernel/kernel-rt/centos/patches/cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
similarity index 100%
rename from kernel-rt/centos/patches/cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
rename to kernel/kernel-rt/centos/patches/cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
diff --git a/kernel-rt/centos/patches/cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch b/kernel/kernel-rt/centos/patches/cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
similarity index 100%
rename from kernel-rt/centos/patches/cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
rename to kernel/kernel-rt/centos/patches/cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
diff --git a/kernel-rt/centos/patches/cpupower.config b/kernel/kernel-rt/centos/patches/cpupower.config
similarity index 100%
rename from kernel-rt/centos/patches/cpupower.config
rename to kernel/kernel-rt/centos/patches/cpupower.config
diff --git a/kernel-rt/centos/patches/cpupower.service b/kernel/kernel-rt/centos/patches/cpupower.service
similarity index 100%
rename from kernel-rt/centos/patches/cpupower.service
rename to kernel/kernel-rt/centos/patches/cpupower.service
diff --git a/kernel-rt/centos/patches/debrand-rh-i686-cpu.patch b/kernel/kernel-rt/centos/patches/debrand-rh-i686-cpu.patch
similarity index 100%
rename from kernel-rt/centos/patches/debrand-rh-i686-cpu.patch
rename to kernel/kernel-rt/centos/patches/debrand-rh-i686-cpu.patch
diff --git a/kernel-rt/centos/patches/debrand-rh_taint.patch b/kernel/kernel-rt/centos/patches/debrand-rh_taint.patch
similarity index 100%
rename from kernel-rt/centos/patches/debrand-rh_taint.patch
rename to kernel/kernel-rt/centos/patches/debrand-rh_taint.patch
diff --git a/kernel-rt/centos/patches/debrand-single-cpu.patch b/kernel/kernel-rt/centos/patches/debrand-single-cpu.patch
similarity index 100%
rename from kernel-rt/centos/patches/debrand-single-cpu.patch
rename to kernel/kernel-rt/centos/patches/debrand-single-cpu.patch
diff --git a/kernel-rt/centos/patches/dpt_i2o-fix-build-warning.patch b/kernel/kernel-rt/centos/patches/dpt_i2o-fix-build-warning.patch
similarity index 100%
rename from kernel-rt/centos/patches/dpt_i2o-fix-build-warning.patch
rename to kernel/kernel-rt/centos/patches/dpt_i2o-fix-build-warning.patch
diff --git a/kernel-rt/centos/patches/fix-compilation-issues.patch b/kernel/kernel-rt/centos/patches/fix-compilation-issues.patch
similarity index 100%
rename from kernel-rt/centos/patches/fix-compilation-issues.patch
rename to kernel/kernel-rt/centos/patches/fix-compilation-issues.patch
diff --git a/kernel-rt/centos/patches/intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch b/kernel/kernel-rt/centos/patches/intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
similarity index 100%
rename from kernel-rt/centos/patches/intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
rename to kernel/kernel-rt/centos/patches/intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
diff --git a/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt-debug.config.tis_extra b/kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt-debug.config.tis_extra
similarity index 100%
rename from kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt-debug.config.tis_extra
rename to kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt-debug.config.tis_extra
diff --git a/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt-trace.config.tis_extra b/kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt-trace.config.tis_extra
similarity index 100%
rename from kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt-trace.config.tis_extra
rename to kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt-trace.config.tis_extra
diff --git a/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt.config.tis_extra b/kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt.config.tis_extra
similarity index 100%
rename from kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt.config.tis_extra
rename to kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt.config.tis_extra
diff --git a/kernel-rt/centos/patches/memblock-introduce-memblock_alloc_range.patch b/kernel/kernel-rt/centos/patches/memblock-introduce-memblock_alloc_range.patch
similarity index 100%
rename from kernel-rt/centos/patches/memblock-introduce-memblock_alloc_range.patch
rename to kernel/kernel-rt/centos/patches/memblock-introduce-memblock_alloc_range.patch
diff --git a/kernel-rt/centos/patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch b/kernel/kernel-rt/centos/patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
similarity index 100%
rename from kernel-rt/centos/patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
rename to kernel/kernel-rt/centos/patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
diff --git a/kernel-rt/centos/patches/restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch b/kernel/kernel-rt/centos/patches/restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
similarity index 100%
rename from kernel-rt/centos/patches/restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
rename to kernel/kernel-rt/centos/patches/restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
diff --git a/kernel-rt/centos/patches/timer-Minimize-nohz-off-overhead.patch b/kernel/kernel-rt/centos/patches/timer-Minimize-nohz-off-overhead.patch
similarity index 100%
rename from kernel-rt/centos/patches/timer-Minimize-nohz-off-overhead.patch
rename to kernel/kernel-rt/centos/patches/timer-Minimize-nohz-off-overhead.patch
diff --git a/kernel-rt/centos/patches/timer-Reduce-timer-migration-overhead-if-disabled.patch b/kernel/kernel-rt/centos/patches/timer-Reduce-timer-migration-overhead-if-disabled.patch
similarity index 100%
rename from kernel-rt/centos/patches/timer-Reduce-timer-migration-overhead-if-disabled.patch
rename to kernel/kernel-rt/centos/patches/timer-Reduce-timer-migration-overhead-if-disabled.patch
diff --git a/kernel-rt/centos/patches/turn-off-write-same-in-smartqpi-driver.patch b/kernel/kernel-rt/centos/patches/turn-off-write-same-in-smartqpi-driver.patch
similarity index 100%
rename from kernel-rt/centos/patches/turn-off-write-same-in-smartqpi-driver.patch
rename to kernel/kernel-rt/centos/patches/turn-off-write-same-in-smartqpi-driver.patch
diff --git a/kernel-rt/centos/patches/x86-enable-DMA-CMA-with-swiotlb.patch b/kernel/kernel-rt/centos/patches/x86-enable-DMA-CMA-with-swiotlb.patch
similarity index 100%
rename from kernel-rt/centos/patches/x86-enable-DMA-CMA-with-swiotlb.patch
rename to kernel/kernel-rt/centos/patches/x86-enable-DMA-CMA-with-swiotlb.patch
diff --git a/kernel-rt/centos/patches/x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch b/kernel/kernel-rt/centos/patches/x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
similarity index 100%
rename from kernel-rt/centos/patches/x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
rename to kernel/kernel-rt/centos/patches/x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
diff --git a/kernel-rt/centos/srpm_path b/kernel/kernel-rt/centos/srpm_path
similarity index 100%
rename from kernel-rt/centos/srpm_path
rename to kernel/kernel-rt/centos/srpm_path
diff --git a/kernel-rt/files/centos.cer b/kernel/kernel-rt/files/centos.cer
similarity index 100%
rename from kernel-rt/files/centos.cer
rename to kernel/kernel-rt/files/centos.cer
diff --git a/kernel-rt/files/ima_signing_key.pub b/kernel/kernel-rt/files/ima_signing_key.pub
similarity index 100%
rename from kernel-rt/files/ima_signing_key.pub
rename to kernel/kernel-rt/files/ima_signing_key.pub
diff --git a/kernel-std/centos/build_srpm.data b/kernel/kernel-std/centos/build_srpm.data
similarity index 100%
rename from kernel-std/centos/build_srpm.data
rename to kernel/kernel-std/centos/build_srpm.data
diff --git a/kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch b/kernel/kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
similarity index 100%
rename from kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
rename to kernel/kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch
diff --git a/kernel-std/centos/meta_patches/Compile-issues.patch b/kernel/kernel-std/centos/meta_patches/Compile-issues.patch
similarity index 100%
rename from kernel-std/centos/meta_patches/Compile-issues.patch
rename to kernel/kernel-std/centos/meta_patches/Compile-issues.patch
diff --git a/kernel-std/centos/meta_patches/Kernel-source-patches-for-TiC.patch b/kernel/kernel-std/centos/meta_patches/Kernel-source-patches-for-TiC.patch
similarity index 100%
rename from kernel-std/centos/meta_patches/Kernel-source-patches-for-TiC.patch
rename to kernel/kernel-std/centos/meta_patches/Kernel-source-patches-for-TiC.patch
diff --git a/kernel-std/centos/meta_patches/Lower-the-compiler-version-requirement.patch b/kernel/kernel-std/centos/meta_patches/Lower-the-compiler-version-requirement.patch
similarity index 100%
rename from kernel-std/centos/meta_patches/Lower-the-compiler-version-requirement.patch
rename to kernel/kernel-std/centos/meta_patches/Lower-the-compiler-version-requirement.patch
diff --git a/kernel-std/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch b/kernel/kernel-std/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch
similarity index 100%
rename from kernel-std/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch
rename to kernel/kernel-std/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch
diff --git a/kernel-std/centos/meta_patches/PATCH_ORDER b/kernel/kernel-std/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from kernel-std/centos/meta_patches/PATCH_ORDER
rename to kernel/kernel-std/centos/meta_patches/PATCH_ORDER
diff --git a/kernel-std/centos/patches/Affine-irqs-and-workqueues-with-kthread_cpus.patch b/kernel/kernel-std/centos/patches/Affine-irqs-and-workqueues-with-kthread_cpus.patch
similarity index 100%
rename from kernel-std/centos/patches/Affine-irqs-and-workqueues-with-kthread_cpus.patch
rename to kernel/kernel-std/centos/patches/Affine-irqs-and-workqueues-with-kthread_cpus.patch
diff --git a/kernel-std/centos/patches/CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch b/kernel/kernel-std/centos/patches/CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
similarity index 100%
rename from kernel-std/centos/patches/CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
rename to kernel/kernel-std/centos/patches/CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
diff --git a/kernel-std/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch b/kernel/kernel-std/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
similarity index 100%
rename from kernel-std/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
rename to kernel/kernel-std/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
diff --git a/kernel-std/centos/patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch b/kernel/kernel-std/centos/patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
similarity index 100%
rename from kernel-std/centos/patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
rename to kernel/kernel-std/centos/patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
diff --git a/kernel-std/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch b/kernel/kernel-std/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
similarity index 100%
rename from kernel-std/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
rename to kernel/kernel-std/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
diff --git a/kernel-std/centos/patches/Fix-cacheinfo-compilation-issues-for-3.10.patch b/kernel/kernel-std/centos/patches/Fix-cacheinfo-compilation-issues-for-3.10.patch
similarity index 100%
rename from kernel-std/centos/patches/Fix-cacheinfo-compilation-issues-for-3.10.patch
rename to kernel/kernel-std/centos/patches/Fix-cacheinfo-compilation-issues-for-3.10.patch
diff --git a/kernel-std/centos/patches/Fix-compile-issue-when-transparent-hugepages-are-off.patch b/kernel/kernel-std/centos/patches/Fix-compile-issue-when-transparent-hugepages-are-off.patch
similarity index 100%
rename from kernel-std/centos/patches/Fix-compile-issue-when-transparent-hugepages-are-off.patch
rename to kernel/kernel-std/centos/patches/Fix-compile-issue-when-transparent-hugepages-are-off.patch
diff --git a/kernel-std/centos/patches/Make-kernel-start-eth-devices-at-offset.patch b/kernel/kernel-std/centos/patches/Make-kernel-start-eth-devices-at-offset.patch
similarity index 100%
rename from kernel-std/centos/patches/Make-kernel-start-eth-devices-at-offset.patch
rename to kernel/kernel-std/centos/patches/Make-kernel-start-eth-devices-at-offset.patch
diff --git a/kernel-std/centos/patches/Notification-of-death-of-arbitrary-processes.patch b/kernel/kernel-std/centos/patches/Notification-of-death-of-arbitrary-processes.patch
similarity index 100%
rename from kernel-std/centos/patches/Notification-of-death-of-arbitrary-processes.patch
rename to kernel/kernel-std/centos/patches/Notification-of-death-of-arbitrary-processes.patch
diff --git a/kernel-std/centos/patches/PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch b/kernel/kernel-std/centos/patches/PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
similarity index 100%
rename from kernel-std/centos/patches/PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
rename to kernel/kernel-std/centos/patches/PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
diff --git a/kernel-std/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch b/kernel/kernel-std/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch
similarity index 100%
rename from kernel-std/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch
rename to kernel/kernel-std/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch
diff --git a/kernel-std/centos/patches/US101216-IMA-support-in-Titanium-kernel.patch b/kernel/kernel-std/centos/patches/US101216-IMA-support-in-Titanium-kernel.patch
similarity index 100%
rename from kernel-std/centos/patches/US101216-IMA-support-in-Titanium-kernel.patch
rename to kernel/kernel-std/centos/patches/US101216-IMA-support-in-Titanium-kernel.patch
diff --git a/kernel-std/centos/patches/US103091-IMA-System-Configuration.patch b/kernel/kernel-std/centos/patches/US103091-IMA-System-Configuration.patch
similarity index 100%
rename from kernel-std/centos/patches/US103091-IMA-System-Configuration.patch
rename to kernel/kernel-std/centos/patches/US103091-IMA-System-Configuration.patch
diff --git a/kernel-std/centos/patches/affine-compute-kernel-threads.patch b/kernel/kernel-std/centos/patches/affine-compute-kernel-threads.patch
similarity index 100%
rename from kernel-std/centos/patches/affine-compute-kernel-threads.patch
rename to kernel/kernel-std/centos/patches/affine-compute-kernel-threads.patch
diff --git a/kernel-std/centos/patches/aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch b/kernel/kernel-std/centos/patches/aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
similarity index 100%
rename from kernel-std/centos/patches/aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
rename to kernel/kernel-std/centos/patches/aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
diff --git a/kernel-std/centos/patches/cma-add-placement-specifier-for-cma-kernel-parameter.patch b/kernel/kernel-std/centos/patches/cma-add-placement-specifier-for-cma-kernel-parameter.patch
similarity index 100%
rename from kernel-std/centos/patches/cma-add-placement-specifier-for-cma-kernel-parameter.patch
rename to kernel/kernel-std/centos/patches/cma-add-placement-specifier-for-cma-kernel-parameter.patch
diff --git a/kernel-std/centos/patches/cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch b/kernel/kernel-std/centos/patches/cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
similarity index 100%
rename from kernel-std/centos/patches/cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
rename to kernel/kernel-std/centos/patches/cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
diff --git a/kernel-std/centos/patches/cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch b/kernel/kernel-std/centos/patches/cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
similarity index 100%
rename from kernel-std/centos/patches/cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
rename to kernel/kernel-std/centos/patches/cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
diff --git a/kernel-std/centos/patches/cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch b/kernel/kernel-std/centos/patches/cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
similarity index 100%
rename from kernel-std/centos/patches/cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
rename to kernel/kernel-std/centos/patches/cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
diff --git a/kernel-std/centos/patches/dpt_i2o-fix-build-warning.patch b/kernel/kernel-std/centos/patches/dpt_i2o-fix-build-warning.patch
similarity index 100%
rename from kernel-std/centos/patches/dpt_i2o-fix-build-warning.patch
rename to kernel/kernel-std/centos/patches/dpt_i2o-fix-build-warning.patch
diff --git a/kernel-std/centos/patches/fix-compilation-issues.patch b/kernel/kernel-std/centos/patches/fix-compilation-issues.patch
similarity index 100%
rename from kernel-std/centos/patches/fix-compilation-issues.patch
rename to kernel/kernel-std/centos/patches/fix-compilation-issues.patch
diff --git a/kernel-std/centos/patches/intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch b/kernel/kernel-std/centos/patches/intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
similarity index 100%
rename from kernel-std/centos/patches/intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
rename to kernel/kernel-std/centos/patches/intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
diff --git a/kernel-std/centos/patches/kernel-3.10.0-x86_64.config.tis_extra b/kernel/kernel-std/centos/patches/kernel-3.10.0-x86_64.config.tis_extra
similarity index 100%
rename from kernel-std/centos/patches/kernel-3.10.0-x86_64.config.tis_extra
rename to kernel/kernel-std/centos/patches/kernel-3.10.0-x86_64.config.tis_extra
diff --git a/kernel-std/centos/patches/memblock-introduce-memblock_alloc_range.patch b/kernel/kernel-std/centos/patches/memblock-introduce-memblock_alloc_range.patch
similarity index 100%
rename from kernel-std/centos/patches/memblock-introduce-memblock_alloc_range.patch
rename to kernel/kernel-std/centos/patches/memblock-introduce-memblock_alloc_range.patch
diff --git a/kernel-std/centos/patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch b/kernel/kernel-std/centos/patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
similarity index 100%
rename from kernel-std/centos/patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
rename to kernel/kernel-std/centos/patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
diff --git a/kernel-std/centos/patches/turn-off-write-same-in-smartqpi-driver.patch b/kernel/kernel-std/centos/patches/turn-off-write-same-in-smartqpi-driver.patch
similarity index 100%
rename from kernel-std/centos/patches/turn-off-write-same-in-smartqpi-driver.patch
rename to kernel/kernel-std/centos/patches/turn-off-write-same-in-smartqpi-driver.patch
diff --git a/kernel-std/centos/patches/x86-enable-DMA-CMA-with-swiotlb.patch b/kernel/kernel-std/centos/patches/x86-enable-DMA-CMA-with-swiotlb.patch
similarity index 100%
rename from kernel-std/centos/patches/x86-enable-DMA-CMA-with-swiotlb.patch
rename to kernel/kernel-std/centos/patches/x86-enable-DMA-CMA-with-swiotlb.patch
diff --git a/kernel-std/centos/patches/x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch b/kernel/kernel-std/centos/patches/x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
similarity index 100%
rename from kernel-std/centos/patches/x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
rename to kernel/kernel-std/centos/patches/x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
diff --git a/kernel-std/centos/srpm_path b/kernel/kernel-std/centos/srpm_path
similarity index 100%
rename from kernel-std/centos/srpm_path
rename to kernel/kernel-std/centos/srpm_path
diff --git a/kernel-std/files/ima_signing_key.pub b/kernel/kernel-std/files/ima_signing_key.pub
similarity index 100%
rename from kernel-std/files/ima_signing_key.pub
rename to kernel/kernel-std/files/ima_signing_key.pub
diff --git a/connectivity/nfs-utils/centos/build_srpm.data b/ldap/nss-pam-ldapd/centos/build_srpm.data
similarity index 100%
rename from connectivity/nfs-utils/centos/build_srpm.data
rename to ldap/nss-pam-ldapd/centos/build_srpm.data
diff --git a/base/nss-pam-ldapd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/ldap/nss-pam-ldapd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from base/nss-pam-ldapd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to ldap/nss-pam-ldapd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/base/nss-pam-ldapd/centos/meta_patches/PATCH_ORDER b/ldap/nss-pam-ldapd/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from base/nss-pam-ldapd/centos/meta_patches/PATCH_ORDER
rename to ldap/nss-pam-ldapd/centos/meta_patches/PATCH_ORDER
diff --git a/base/nss-pam-ldapd/centos/meta_patches/remove-custom-nslcd-conf-file.patch b/ldap/nss-pam-ldapd/centos/meta_patches/remove-custom-nslcd-conf-file.patch
similarity index 100%
rename from base/nss-pam-ldapd/centos/meta_patches/remove-custom-nslcd-conf-file.patch
rename to ldap/nss-pam-ldapd/centos/meta_patches/remove-custom-nslcd-conf-file.patch
diff --git a/base/nss-pam-ldapd/centos/meta_patches/spec-TiS-changes.patch b/ldap/nss-pam-ldapd/centos/meta_patches/spec-TiS-changes.patch
similarity index 100%
rename from base/nss-pam-ldapd/centos/meta_patches/spec-TiS-changes.patch
rename to ldap/nss-pam-ldapd/centos/meta_patches/spec-TiS-changes.patch
diff --git a/base/nss-pam-ldapd/centos/meta_patches/spec-bind-nslcd-to-rootDN.patch b/ldap/nss-pam-ldapd/centos/meta_patches/spec-bind-nslcd-to-rootDN.patch
similarity index 100%
rename from base/nss-pam-ldapd/centos/meta_patches/spec-bind-nslcd-to-rootDN.patch
rename to ldap/nss-pam-ldapd/centos/meta_patches/spec-bind-nslcd-to-rootDN.patch
diff --git a/base/nss-pam-ldapd/centos/srpm_path b/ldap/nss-pam-ldapd/centos/srpm_path
similarity index 100%
rename from base/nss-pam-ldapd/centos/srpm_path
rename to ldap/nss-pam-ldapd/centos/srpm_path
diff --git a/base/nss-pam-ldapd/files/login b/ldap/nss-pam-ldapd/files/login
similarity index 100%
rename from base/nss-pam-ldapd/files/login
rename to ldap/nss-pam-ldapd/files/login
diff --git a/base/nss-pam-ldapd/files/nslcd.init b/ldap/nss-pam-ldapd/files/nslcd.init
similarity index 100%
rename from base/nss-pam-ldapd/files/nslcd.init
rename to ldap/nss-pam-ldapd/files/nslcd.init
diff --git a/networking/openldap/PKG-INFO b/ldap/openldap/PKG-INFO
similarity index 100%
rename from networking/openldap/PKG-INFO
rename to ldap/openldap/PKG-INFO
diff --git a/networking/openldap/centos/build_srpm.data b/ldap/openldap/centos/build_srpm.data
similarity index 100%
rename from networking/openldap/centos/build_srpm.data
rename to ldap/openldap/centos/build_srpm.data
diff --git a/networking/openldap/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/ldap/openldap/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from networking/openldap/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to ldap/openldap/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/networking/openldap/centos/meta_patches/PATCH_ORDER b/ldap/openldap/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from networking/openldap/centos/meta_patches/PATCH_ORDER
rename to ldap/openldap/centos/meta_patches/PATCH_ORDER
diff --git a/networking/openldap/centos/meta_patches/openldap-enable-password-policy.patch b/ldap/openldap/centos/meta_patches/openldap-enable-password-policy.patch
similarity index 100%
rename from networking/openldap/centos/meta_patches/openldap-enable-password-policy.patch
rename to ldap/openldap/centos/meta_patches/openldap-enable-password-policy.patch
diff --git a/networking/openldap/centos/meta_patches/openldap-remove-ldap-conf-cgcs-file.patch b/ldap/openldap/centos/meta_patches/openldap-remove-ldap-conf-cgcs-file.patch
similarity index 100%
rename from networking/openldap/centos/meta_patches/openldap-remove-ldap-conf-cgcs-file.patch
rename to ldap/openldap/centos/meta_patches/openldap-remove-ldap-conf-cgcs-file.patch
diff --git a/networking/openldap/centos/meta_patches/openldap-service-file.patch b/ldap/openldap/centos/meta_patches/openldap-service-file.patch
similarity index 100%
rename from networking/openldap/centos/meta_patches/openldap-service-file.patch
rename to ldap/openldap/centos/meta_patches/openldap-service-file.patch
diff --git a/networking/openldap/centos/meta_patches/openldap-spec-file.patch b/ldap/openldap/centos/meta_patches/openldap-spec-file.patch
similarity index 100%
rename from networking/openldap/centos/meta_patches/openldap-spec-file.patch
rename to ldap/openldap/centos/meta_patches/openldap-spec-file.patch
diff --git a/networking/openldap/centos/meta_patches/openldap-sysconfig-file.patch b/ldap/openldap/centos/meta_patches/openldap-sysconfig-file.patch
similarity index 100%
rename from networking/openldap/centos/meta_patches/openldap-sysconfig-file.patch
rename to ldap/openldap/centos/meta_patches/openldap-sysconfig-file.patch
diff --git a/networking/openldap/centos/srpm_path b/ldap/openldap/centos/srpm_path
similarity index 100%
rename from networking/openldap/centos/srpm_path
rename to ldap/openldap/centos/srpm_path
diff --git a/networking/openldap/files/initial_config.ldif b/ldap/openldap/files/initial_config.ldif
similarity index 100%
rename from networking/openldap/files/initial_config.ldif
rename to ldap/openldap/files/initial_config.ldif
diff --git a/networking/openldap/files/initscript b/ldap/openldap/files/initscript
similarity index 100%
rename from networking/openldap/files/initscript
rename to ldap/openldap/files/initscript
diff --git a/networking/openldap/files/rootdn-should-not-bypass-ppolicy.patch b/ldap/openldap/files/rootdn-should-not-bypass-ppolicy.patch
similarity index 100%
rename from networking/openldap/files/rootdn-should-not-bypass-ppolicy.patch
rename to ldap/openldap/files/rootdn-should-not-bypass-ppolicy.patch
diff --git a/networking/openldap/files/slapd.conf.cgcs b/ldap/openldap/files/slapd.conf.cgcs
similarity index 100%
rename from networking/openldap/files/slapd.conf.cgcs
rename to ldap/openldap/files/slapd.conf.cgcs
diff --git a/extended/logrotate/centos/build_srpm.data b/logging/logrotate/centos/build_srpm.data
similarity index 100%
rename from extended/logrotate/centos/build_srpm.data
rename to logging/logrotate/centos/build_srpm.data
diff --git a/extended/logrotate/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/logging/logrotate/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/logrotate/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to logging/logrotate/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/logrotate/centos/meta_patches/0002-crond-adjustment.patch b/logging/logrotate/centos/meta_patches/0002-crond-adjustment.patch
similarity index 100%
rename from extended/logrotate/centos/meta_patches/0002-crond-adjustment.patch
rename to logging/logrotate/centos/meta_patches/0002-crond-adjustment.patch
diff --git a/extended/logrotate/centos/meta_patches/0003-Add-upstream-patches.patch b/logging/logrotate/centos/meta_patches/0003-Add-upstream-patches.patch
similarity index 100%
rename from extended/logrotate/centos/meta_patches/0003-Add-upstream-patches.patch
rename to logging/logrotate/centos/meta_patches/0003-Add-upstream-patches.patch
diff --git a/extended/logrotate/centos/meta_patches/0004-Add-su-patch.patch b/logging/logrotate/centos/meta_patches/0004-Add-su-patch.patch
similarity index 100%
rename from extended/logrotate/centos/meta_patches/0004-Add-su-patch.patch
rename to logging/logrotate/centos/meta_patches/0004-Add-su-patch.patch
diff --git a/extended/logrotate/centos/meta_patches/PATCH_ORDER b/logging/logrotate/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/logrotate/centos/meta_patches/PATCH_ORDER
rename to logging/logrotate/centos/meta_patches/PATCH_ORDER
diff --git a/extended/logrotate/centos/patches/0001-createOutputFile-rename-already-existing-file.patch b/logging/logrotate/centos/patches/0001-createOutputFile-rename-already-existing-file.patch
similarity index 100%
rename from extended/logrotate/centos/patches/0001-createOutputFile-rename-already-existing-file.patch
rename to logging/logrotate/centos/patches/0001-createOutputFile-rename-already-existing-file.patch
diff --git a/extended/logrotate/centos/patches/0002-createOutputFile-eliminate-stat-open-TOCTOU-race.patch b/logging/logrotate/centos/patches/0002-createOutputFile-eliminate-stat-open-TOCTOU-race.patch
similarity index 100%
rename from extended/logrotate/centos/patches/0002-createOutputFile-eliminate-stat-open-TOCTOU-race.patch
rename to logging/logrotate/centos/patches/0002-createOutputFile-eliminate-stat-open-TOCTOU-race.patch
diff --git a/extended/logrotate/centos/patches/0003-Add-su-root-to-logrotate.conf.patch b/logging/logrotate/centos/patches/0003-Add-su-root-to-logrotate.conf.patch
similarity index 100%
rename from extended/logrotate/centos/patches/0003-Add-su-root-to-logrotate.conf.patch
rename to logging/logrotate/centos/patches/0003-Add-su-root-to-logrotate.conf.patch
diff --git a/extended/logrotate/centos/srpm_path b/logging/logrotate/centos/srpm_path
similarity index 100%
rename from extended/logrotate/centos/srpm_path
rename to logging/logrotate/centos/srpm_path
diff --git a/extended/logrotate/files/logrotate-cron.d b/logging/logrotate/files/logrotate-cron.d
similarity index 100%
rename from extended/logrotate/files/logrotate-cron.d
rename to logging/logrotate/files/logrotate-cron.d
diff --git a/extended/syslog-ng/centos/build_srpm.data b/logging/syslog-ng/centos/build_srpm.data
similarity index 100%
rename from extended/syslog-ng/centos/build_srpm.data
rename to logging/syslog-ng/centos/build_srpm.data
diff --git a/extended/syslog-ng/centos/files/fm_event_syslogger b/logging/syslog-ng/centos/files/fm_event_syslogger
similarity index 100%
rename from extended/syslog-ng/centos/files/fm_event_syslogger
rename to logging/syslog-ng/centos/files/fm_event_syslogger
diff --git a/extended/syslog-ng/centos/files/remotelogging.conf b/logging/syslog-ng/centos/files/remotelogging.conf
similarity index 100%
rename from extended/syslog-ng/centos/files/remotelogging.conf
rename to logging/syslog-ng/centos/files/remotelogging.conf
diff --git a/extended/syslog-ng/centos/files/syslog-ng.conf b/logging/syslog-ng/centos/files/syslog-ng.conf
similarity index 100%
rename from extended/syslog-ng/centos/files/syslog-ng.conf
rename to logging/syslog-ng/centos/files/syslog-ng.conf
diff --git a/extended/syslog-ng/centos/files/syslog-ng.logrotate b/logging/syslog-ng/centos/files/syslog-ng.logrotate
similarity index 100%
rename from extended/syslog-ng/centos/files/syslog-ng.logrotate
rename to logging/syslog-ng/centos/files/syslog-ng.logrotate
diff --git a/extended/syslog-ng/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/logging/syslog-ng/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/syslog-ng/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to logging/syslog-ng/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/syslog-ng/centos/meta_patches/0002-Add-TIS-content.patch b/logging/syslog-ng/centos/meta_patches/0002-Add-TIS-content.patch
similarity index 100%
rename from extended/syslog-ng/centos/meta_patches/0002-Add-TIS-content.patch
rename to logging/syslog-ng/centos/meta_patches/0002-Add-TIS-content.patch
diff --git a/extended/syslog-ng/centos/meta_patches/0003-add-fm-event-syslogger.patch b/logging/syslog-ng/centos/meta_patches/0003-add-fm-event-syslogger.patch
similarity index 100%
rename from extended/syslog-ng/centos/meta_patches/0003-add-fm-event-syslogger.patch
rename to logging/syslog-ng/centos/meta_patches/0003-add-fm-event-syslogger.patch
diff --git a/extended/syslog-ng/centos/meta_patches/PATCH_ORDER b/logging/syslog-ng/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/syslog-ng/centos/meta_patches/PATCH_ORDER
rename to logging/syslog-ng/centos/meta_patches/PATCH_ORDER
diff --git a/extended/syslog-ng/centos/patches/syslog-ng-service-pid-file-pmond.patch b/logging/syslog-ng/centos/patches/syslog-ng-service-pid-file-pmond.patch
similarity index 100%
rename from extended/syslog-ng/centos/patches/syslog-ng-service-pid-file-pmond.patch
rename to logging/syslog-ng/centos/patches/syslog-ng-service-pid-file-pmond.patch
diff --git a/extended/syslog-ng/centos/srpm_path b/logging/syslog-ng/centos/srpm_path
similarity index 100%
rename from extended/syslog-ng/centos/srpm_path
rename to logging/syslog-ng/centos/srpm_path
diff --git a/mellanox/libmlx5/centos/build_srpm.data b/mellanox/libmlx5/centos/build_srpm.data
deleted file mode 100644
index 70b4b5dcb..000000000
--- a/mellanox/libmlx5/centos/build_srpm.data
+++ /dev/null
@@ -1 +0,0 @@
-TIS_PATCH_VER=2
diff --git a/extended/iproute/centos/build_srpm.data b/networking/iproute/centos/build_srpm.data
similarity index 100%
rename from extended/iproute/centos/build_srpm.data
rename to networking/iproute/centos/build_srpm.data
diff --git a/extended/iproute/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/networking/iproute/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/iproute/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to networking/iproute/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/iproute/centos/meta_patches/Add-WRS-ip-maddr-fix-ifname.patch b/networking/iproute/centos/meta_patches/Add-WRS-ip-maddr-fix-ifname.patch
similarity index 100%
rename from extended/iproute/centos/meta_patches/Add-WRS-ip-maddr-fix-ifname.patch
rename to networking/iproute/centos/meta_patches/Add-WRS-ip-maddr-fix-ifname.patch
diff --git a/extended/iproute/centos/meta_patches/PATCH_ORDER b/networking/iproute/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/iproute/centos/meta_patches/PATCH_ORDER
rename to networking/iproute/centos/meta_patches/PATCH_ORDER
diff --git a/extended/iproute/centos/patches/ip-maddr-fix-ifname.patch b/networking/iproute/centos/patches/ip-maddr-fix-ifname.patch
similarity index 100%
rename from extended/iproute/centos/patches/ip-maddr-fix-ifname.patch
rename to networking/iproute/centos/patches/ip-maddr-fix-ifname.patch
diff --git a/extended/iproute/centos/srpm_path b/networking/iproute/centos/srpm_path
similarity index 100%
rename from extended/iproute/centos/srpm_path
rename to networking/iproute/centos/srpm_path
diff --git a/extended/lldpd/centos/build_srpm.data b/networking/lldpd/centos/build_srpm.data
similarity index 100%
rename from extended/lldpd/centos/build_srpm.data
rename to networking/lldpd/centos/build_srpm.data
diff --git a/extended/lldpd/centos/files/i40e-lldp-configure.sh b/networking/lldpd/centos/files/i40e-lldp-configure.sh
similarity index 100%
rename from extended/lldpd/centos/files/i40e-lldp-configure.sh
rename to networking/lldpd/centos/files/i40e-lldp-configure.sh
diff --git a/extended/lldpd/centos/files/lldpd-clear-station.patch b/networking/lldpd/centos/files/lldpd-clear-station.patch
similarity index 100%
rename from extended/lldpd/centos/files/lldpd-clear-station.patch
rename to networking/lldpd/centos/files/lldpd-clear-station.patch
diff --git a/extended/lldpd/centos/files/lldpd-create-run-dir.patch b/networking/lldpd/centos/files/lldpd-create-run-dir.patch
similarity index 100%
rename from extended/lldpd/centos/files/lldpd-create-run-dir.patch
rename to networking/lldpd/centos/files/lldpd-create-run-dir.patch
diff --git a/extended/lldpd/centos/files/lldpd-i40e-disable.patch b/networking/lldpd/centos/files/lldpd-i40e-disable.patch
similarity index 100%
rename from extended/lldpd/centos/files/lldpd-i40e-disable.patch
rename to networking/lldpd/centos/files/lldpd-i40e-disable.patch
diff --git a/extended/lldpd/centos/lldpd.spec b/networking/lldpd/centos/lldpd.spec
similarity index 100%
rename from extended/lldpd/centos/lldpd.spec
rename to networking/lldpd/centos/lldpd.spec
diff --git a/extended/lldpd/lldpd-0.9.0/lldpd-interface-show.patch b/networking/lldpd/lldpd-0.9.0/lldpd-interface-show.patch
similarity index 100%
rename from extended/lldpd/lldpd-0.9.0/lldpd-interface-show.patch
rename to networking/lldpd/lldpd-0.9.0/lldpd-interface-show.patch
diff --git a/extended/lldpd/lldpd-0.9.0/lldpd.default b/networking/lldpd/lldpd-0.9.0/lldpd.default
similarity index 100%
rename from extended/lldpd/lldpd-0.9.0/lldpd.default
rename to networking/lldpd/lldpd-0.9.0/lldpd.default
diff --git a/extended/lldpd/lldpd-0.9.0/lldpd.init b/networking/lldpd/lldpd-0.9.0/lldpd.init
similarity index 100%
rename from extended/lldpd/lldpd-0.9.0/lldpd.init
rename to networking/lldpd/lldpd-0.9.0/lldpd.init
diff --git a/extended/cloud-init/centos/build_srpm.data b/networking/mellanox/libibverbs/centos/build_srpm.data
similarity index 100%
rename from extended/cloud-init/centos/build_srpm.data
rename to networking/mellanox/libibverbs/centos/build_srpm.data
diff --git a/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER b/networking/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from mellanox/libibverbs/centos/meta_patches/PATCH_ORDER
rename to networking/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER
diff --git a/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch b/networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch
similarity index 100%
rename from mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch
rename to networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch
diff --git a/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch b/networking/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
similarity index 100%
rename from mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
rename to networking/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
diff --git a/mellanox/libibverbs/centos/srpm_path b/networking/mellanox/libibverbs/centos/srpm_path
similarity index 100%
rename from mellanox/libibverbs/centos/srpm_path
rename to networking/mellanox/libibverbs/centos/srpm_path
diff --git a/extended/sudo/centos/build_srpm.data b/networking/mellanox/libmlx4/centos/build_srpm.data
similarity index 100%
rename from extended/sudo/centos/build_srpm.data
rename to networking/mellanox/libmlx4/centos/build_srpm.data
diff --git a/mellanox/libmlx4/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/networking/mellanox/libmlx4/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from mellanox/libmlx4/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to networking/mellanox/libmlx4/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/libvirt-python/centos/meta_patches/PATCH_ORDER b/networking/mellanox/libmlx4/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/libvirt-python/centos/meta_patches/PATCH_ORDER
rename to networking/mellanox/libmlx4/centos/meta_patches/PATCH_ORDER
diff --git a/mellanox/libmlx4/centos/srpm_path b/networking/mellanox/libmlx4/centos/srpm_path
similarity index 100%
rename from mellanox/libmlx4/centos/srpm_path
rename to networking/mellanox/libmlx4/centos/srpm_path
diff --git a/extended/irqbalance/centos/build_srpm.data b/networking/mellanox/libmlx5/centos/build_srpm.data
similarity index 100%
rename from extended/irqbalance/centos/build_srpm.data
rename to networking/mellanox/libmlx5/centos/build_srpm.data
diff --git a/mellanox/libmlx5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/networking/mellanox/libmlx5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from mellanox/libmlx5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to networking/mellanox/libmlx5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/mellanox/libmlx4/centos/meta_patches/PATCH_ORDER b/networking/mellanox/libmlx5/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from mellanox/libmlx4/centos/meta_patches/PATCH_ORDER
rename to networking/mellanox/libmlx5/centos/meta_patches/PATCH_ORDER
diff --git a/mellanox/libmlx5/centos/srpm_path b/networking/mellanox/libmlx5/centos/srpm_path
similarity index 100%
rename from mellanox/libmlx5/centos/srpm_path
rename to networking/mellanox/libmlx5/centos/srpm_path
diff --git a/networking/mlx4-config/centos/build_srpm.data b/networking/mellanox/mlx4-config/centos/build_srpm.data
similarity index 100%
rename from networking/mlx4-config/centos/build_srpm.data
rename to networking/mellanox/mlx4-config/centos/build_srpm.data
diff --git a/networking/mlx4-config/centos/mlx4-config.spec b/networking/mellanox/mlx4-config/centos/mlx4-config.spec
similarity index 100%
rename from networking/mlx4-config/centos/mlx4-config.spec
rename to networking/mellanox/mlx4-config/centos/mlx4-config.spec
diff --git a/base/tis-extensions/files/LICENSE b/networking/mellanox/mlx4-config/files/LICENSE
similarity index 100%
rename from base/tis-extensions/files/LICENSE
rename to networking/mellanox/mlx4-config/files/LICENSE
diff --git a/networking/mlx4-config/files/mlx4-config.service b/networking/mellanox/mlx4-config/files/mlx4-config.service
similarity index 100%
rename from networking/mlx4-config/files/mlx4-config.service
rename to networking/mellanox/mlx4-config/files/mlx4-config.service
diff --git a/networking/mlx4-config/files/mlx4-configure.sh b/networking/mellanox/mlx4-config/files/mlx4-configure.sh
similarity index 100%
rename from networking/mlx4-config/files/mlx4-configure.sh
rename to networking/mellanox/mlx4-config/files/mlx4-configure.sh
diff --git a/networking/mlx4-config/files/mlx4_core_config.sh b/networking/mellanox/mlx4-config/files/mlx4_core_config.sh
similarity index 100%
rename from networking/mlx4-config/files/mlx4_core_config.sh
rename to networking/mellanox/mlx4-config/files/mlx4_core_config.sh
diff --git a/networking/mlx4-config/files/mlx4_core_goenabled.sh b/networking/mellanox/mlx4-config/files/mlx4_core_goenabled.sh
similarity index 100%
rename from networking/mlx4-config/files/mlx4_core_goenabled.sh
rename to networking/mellanox/mlx4-config/files/mlx4_core_goenabled.sh
diff --git a/extended/novnc/centos/build_srpm.data b/networking/mellanox/rdma-core/centos/build_srpm.data
similarity index 100%
rename from extended/novnc/centos/build_srpm.data
rename to networking/mellanox/rdma-core/centos/build_srpm.data
diff --git a/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch b/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch
similarity index 100%
rename from mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch
rename to networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch
diff --git a/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER b/networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from mellanox/rdma-core/centos/meta_patches/PATCH_ORDER
rename to networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER
diff --git a/mellanox/rdma-core/centos/srpm_path b/networking/mellanox/rdma-core/centos/srpm_path
similarity index 100%
rename from mellanox/rdma-core/centos/srpm_path
rename to networking/mellanox/rdma-core/centos/srpm_path
diff --git a/extended/python-ryu/centos/build_srpm.data b/networking/python-ryu/centos/build_srpm.data
similarity index 100%
rename from extended/python-ryu/centos/build_srpm.data
rename to networking/python-ryu/centos/build_srpm.data
diff --git a/extended/python-ryu/centos/python-ryu.spec b/networking/python-ryu/centos/python-ryu.spec
similarity index 100%
rename from extended/python-ryu/centos/python-ryu.spec
rename to networking/python-ryu/centos/python-ryu.spec
diff --git a/devtools/python/python-2.7.5/README b/python/python-2.7.5/README
similarity index 100%
rename from devtools/python/python-2.7.5/README
rename to python/python-2.7.5/README
diff --git a/mellanox/libmlx4/centos/build_srpm.data b/python/python-2.7.5/centos/build_srpm.data
similarity index 100%
rename from mellanox/libmlx4/centos/build_srpm.data
rename to python/python-2.7.5/centos/build_srpm.data
diff --git a/devtools/python/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/python/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/python/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to python/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/python/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch b/python/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch
similarity index 100%
rename from devtools/python/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch
rename to python/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch
diff --git a/devtools/python/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch b/python/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch
similarity index 100%
rename from devtools/python/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch
rename to python/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch
diff --git a/devtools/python/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch b/python/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch
similarity index 100%
rename from devtools/python/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch
rename to python/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch
diff --git a/devtools/python/python-2.7.5/centos/meta_patches/PATCH_ORDER b/python/python-2.7.5/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/python/python-2.7.5/centos/meta_patches/PATCH_ORDER
rename to python/python-2.7.5/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/python/python-2.7.5/centos/patches/Rollup-optimization-commits.patch b/python/python-2.7.5/centos/patches/Rollup-optimization-commits.patch
similarity index 100%
rename from devtools/python/python-2.7.5/centos/patches/Rollup-optimization-commits.patch
rename to python/python-2.7.5/centos/patches/Rollup-optimization-commits.patch
diff --git a/devtools/python/python-2.7.5/centos/srpm_path b/python/python-2.7.5/centos/srpm_path
similarity index 100%
rename from devtools/python/python-2.7.5/centos/srpm_path
rename to python/python-2.7.5/centos/srpm_path
diff --git a/devtools/python/python-django/centos/build_srpm.data b/python/python-django/centos/build_srpm.data
similarity index 100%
rename from devtools/python/python-django/centos/build_srpm.data
rename to python/python-django/centos/build_srpm.data
diff --git a/devtools/python/python-django/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/python/python-django/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from devtools/python/python-django/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to python/python-django/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/devtools/python/python-django/centos/meta_patches/PATCH_ORDER b/python/python-django/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from devtools/python/python-django/centos/meta_patches/PATCH_ORDER
rename to python/python-django/centos/meta_patches/PATCH_ORDER
diff --git a/devtools/python/python-django/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch b/python/python-django/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
similarity index 100%
rename from devtools/python/python-django/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
rename to python/python-django/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
diff --git a/devtools/python/python-django/centos/meta_patches/meta-size-number-format.patch b/python/python-django/centos/meta_patches/meta-size-number-format.patch
similarity index 100%
rename from devtools/python/python-django/centos/meta_patches/meta-size-number-format.patch
rename to python/python-django/centos/meta_patches/meta-size-number-format.patch
diff --git a/devtools/python/python-django/centos/meta_patches/spec-include-TiS-patches.patch b/python/python-django/centos/meta_patches/spec-include-TiS-patches.patch
similarity index 100%
rename from devtools/python/python-django/centos/meta_patches/spec-include-TiS-patches.patch
rename to python/python-django/centos/meta_patches/spec-include-TiS-patches.patch
diff --git a/devtools/python/python-django/centos/meta_patches/spec-patch-to-remove-SmartyPants.patch b/python/python-django/centos/meta_patches/spec-patch-to-remove-SmartyPants.patch
similarity index 100%
rename from devtools/python/python-django/centos/meta_patches/spec-patch-to-remove-SmartyPants.patch
rename to python/python-django/centos/meta_patches/spec-patch-to-remove-SmartyPants.patch
diff --git a/devtools/python/python-django/centos/patches/remove-SmartyPantsHTMLTranslator.patch b/python/python-django/centos/patches/remove-SmartyPantsHTMLTranslator.patch
similarity index 100%
rename from devtools/python/python-django/centos/patches/remove-SmartyPantsHTMLTranslator.patch
rename to python/python-django/centos/patches/remove-SmartyPantsHTMLTranslator.patch
diff --git a/devtools/python/python-django/centos/patches/size-number-format.patch b/python/python-django/centos/patches/size-number-format.patch
similarity index 100%
rename from devtools/python/python-django/centos/patches/size-number-format.patch
rename to python/python-django/centos/patches/size-number-format.patch
diff --git a/devtools/python/python-django/centos/srpm_path b/python/python-django/centos/srpm_path
similarity index 100%
rename from devtools/python/python-django/centos/srpm_path
rename to python/python-django/centos/srpm_path
diff --git a/devtools/python/python-django/files/session-filebase-backend-fix.patch b/python/python-django/files/session-filebase-backend-fix.patch
similarity index 100%
rename from devtools/python/python-django/files/session-filebase-backend-fix.patch
rename to python/python-django/files/session-filebase-backend-fix.patch
diff --git a/devtools/python/python-django/update-session-filebase-backend.patch b/python/python-django/update-session-filebase-backend.patch
similarity index 100%
rename from devtools/python/python-django/update-session-filebase-backend.patch
rename to python/python-django/update-session-filebase-backend.patch
diff --git a/extended/python-gunicorn/centos/build_srpm.data b/python/python-gunicorn/centos/build_srpm.data
similarity index 100%
rename from extended/python-gunicorn/centos/build_srpm.data
rename to python/python-gunicorn/centos/build_srpm.data
diff --git a/extended/python-gunicorn/centos/meta_patches/0001-TIS-gunicorn-19-upgrade.patch b/python/python-gunicorn/centos/meta_patches/0001-TIS-gunicorn-19-upgrade.patch
similarity index 100%
rename from extended/python-gunicorn/centos/meta_patches/0001-TIS-gunicorn-19-upgrade.patch
rename to python/python-gunicorn/centos/meta_patches/0001-TIS-gunicorn-19-upgrade.patch
diff --git a/extended/python-gunicorn/centos/meta_patches/0001-TIS-packaging.patch b/python/python-gunicorn/centos/meta_patches/0001-TIS-packaging.patch
similarity index 100%
rename from extended/python-gunicorn/centos/meta_patches/0001-TIS-packaging.patch
rename to python/python-gunicorn/centos/meta_patches/0001-TIS-packaging.patch
diff --git a/extended/python-gunicorn/centos/meta_patches/0001-add-worker-abort-patch.patch b/python/python-gunicorn/centos/meta_patches/0001-add-worker-abort-patch.patch
similarity index 100%
rename from extended/python-gunicorn/centos/meta_patches/0001-add-worker-abort-patch.patch
rename to python/python-gunicorn/centos/meta_patches/0001-add-worker-abort-patch.patch
diff --git a/extended/python-gunicorn/centos/meta_patches/PATCH_ORDER b/python/python-gunicorn/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/python-gunicorn/centos/meta_patches/PATCH_ORDER
rename to python/python-gunicorn/centos/meta_patches/PATCH_ORDER
diff --git a/extended/python-gunicorn/centos/patches/0001-add-worker-abort-hook.patch b/python/python-gunicorn/centos/patches/0001-add-worker-abort-hook.patch
similarity index 100%
rename from extended/python-gunicorn/centos/patches/0001-add-worker-abort-hook.patch
rename to python/python-gunicorn/centos/patches/0001-add-worker-abort-hook.patch
diff --git a/extended/python-gunicorn/centos/srpm_path b/python/python-gunicorn/centos/srpm_path
similarity index 100%
rename from extended/python-gunicorn/centos/srpm_path
rename to python/python-gunicorn/centos/srpm_path
diff --git a/devtools/python-setuptools/centos/build_srpm.data b/python/python-setuptools/centos/build_srpm.data
similarity index 100%
rename from devtools/python-setuptools/centos/build_srpm.data
rename to python/python-setuptools/centos/build_srpm.data
diff --git a/devtools/python-setuptools/centos/python-setuptools.spec b/python/python-setuptools/centos/python-setuptools.spec
similarity index 100%
rename from devtools/python-setuptools/centos/python-setuptools.spec
rename to python/python-setuptools/centos/python-setuptools.spec
diff --git a/devtools/python-setuptools/files/LICENSE b/python/python-setuptools/files/LICENSE
similarity index 100%
rename from devtools/python-setuptools/files/LICENSE
rename to python/python-setuptools/files/LICENSE
diff --git a/devtools/python-setuptools/files/LICENSE-2.0 b/python/python-setuptools/files/LICENSE-2.0
similarity index 100%
rename from devtools/python-setuptools/files/LICENSE-2.0
rename to python/python-setuptools/files/LICENSE-2.0
diff --git a/devtools/python-setuptools/files/LICENSE.txt b/python/python-setuptools/files/LICENSE.txt
similarity index 100%
rename from devtools/python-setuptools/files/LICENSE.txt
rename to python/python-setuptools/files/LICENSE.txt
diff --git a/extended/python-smartpm/centos/build_srpm.data b/python/python-smartpm/centos/build_srpm.data
similarity index 100%
rename from extended/python-smartpm/centos/build_srpm.data
rename to python/python-smartpm/centos/build_srpm.data
diff --git a/extended/python-smartpm/centos/centos.info b/python/python-smartpm/centos/centos.info
similarity index 100%
rename from extended/python-smartpm/centos/centos.info
rename to python/python-smartpm/centos/centos.info
diff --git a/extended/python-smartpm/centos/patches/smart-add-for-rpm-ignoresize-check.patch b/python/python-smartpm/centos/patches/smart-add-for-rpm-ignoresize-check.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-add-for-rpm-ignoresize-check.patch
rename to python/python-smartpm/centos/patches/smart-add-for-rpm-ignoresize-check.patch
diff --git a/extended/python-smartpm/centos/patches/smart-attempt.patch b/python/python-smartpm/centos/patches/smart-attempt.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-attempt.patch
rename to python/python-smartpm/centos/patches/smart-attempt.patch
diff --git a/extended/python-smartpm/centos/patches/smart-channelsdir.patch b/python/python-smartpm/centos/patches/smart-channelsdir.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-channelsdir.patch
rename to python/python-smartpm/centos/patches/smart-channelsdir.patch
diff --git a/extended/python-smartpm/centos/patches/smart-config-ignore-all-recommends.patch b/python/python-smartpm/centos/patches/smart-config-ignore-all-recommends.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-config-ignore-all-recommends.patch
rename to python/python-smartpm/centos/patches/smart-config-ignore-all-recommends.patch
diff --git a/extended/python-smartpm/centos/patches/smart-conflict-provider.patch b/python/python-smartpm/centos/patches/smart-conflict-provider.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-conflict-provider.patch
rename to python/python-smartpm/centos/patches/smart-conflict-provider.patch
diff --git a/extended/python-smartpm/centos/patches/smart-dflags.patch b/python/python-smartpm/centos/patches/smart-dflags.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-dflags.patch
rename to python/python-smartpm/centos/patches/smart-dflags.patch
diff --git a/extended/python-smartpm/centos/patches/smart-filename-NAME_MAX.patch b/python/python-smartpm/centos/patches/smart-filename-NAME_MAX.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-filename-NAME_MAX.patch
rename to python/python-smartpm/centos/patches/smart-filename-NAME_MAX.patch
diff --git a/extended/python-smartpm/centos/patches/smart-flag-exclude-packages.patch b/python/python-smartpm/centos/patches/smart-flag-exclude-packages.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-flag-exclude-packages.patch
rename to python/python-smartpm/centos/patches/smart-flag-exclude-packages.patch
diff --git a/extended/python-smartpm/centos/patches/smart-flag-ignore-recommends.patch b/python/python-smartpm/centos/patches/smart-flag-ignore-recommends.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-flag-ignore-recommends.patch
rename to python/python-smartpm/centos/patches/smart-flag-ignore-recommends.patch
diff --git a/extended/python-smartpm/centos/patches/smart-improve-error-reporting.patch b/python/python-smartpm/centos/patches/smart-improve-error-reporting.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-improve-error-reporting.patch
rename to python/python-smartpm/centos/patches/smart-improve-error-reporting.patch
diff --git a/extended/python-smartpm/centos/patches/smart-metadata-match.patch b/python/python-smartpm/centos/patches/smart-metadata-match.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-metadata-match.patch
rename to python/python-smartpm/centos/patches/smart-metadata-match.patch
diff --git a/extended/python-smartpm/centos/patches/smart-multilib-fixes.patch b/python/python-smartpm/centos/patches/smart-multilib-fixes.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-multilib-fixes.patch
rename to python/python-smartpm/centos/patches/smart-multilib-fixes.patch
diff --git a/extended/python-smartpm/centos/patches/smart-recommends.patch b/python/python-smartpm/centos/patches/smart-recommends.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-recommends.patch
rename to python/python-smartpm/centos/patches/smart-recommends.patch
diff --git a/extended/python-smartpm/centos/patches/smart-rpm-extra-macros.patch b/python/python-smartpm/centos/patches/smart-rpm-extra-macros.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-rpm-extra-macros.patch
rename to python/python-smartpm/centos/patches/smart-rpm-extra-macros.patch
diff --git a/extended/python-smartpm/centos/patches/smart-rpm-md-parse.patch b/python/python-smartpm/centos/patches/smart-rpm-md-parse.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-rpm-md-parse.patch
rename to python/python-smartpm/centos/patches/smart-rpm-md-parse.patch
diff --git a/extended/python-smartpm/centos/patches/smart-rpm-root.patch b/python/python-smartpm/centos/patches/smart-rpm-root.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-rpm-root.patch
rename to python/python-smartpm/centos/patches/smart-rpm-root.patch
diff --git a/extended/python-smartpm/centos/patches/smart-set-noprogress-for-pycurl.patch b/python/python-smartpm/centos/patches/smart-set-noprogress-for-pycurl.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-set-noprogress-for-pycurl.patch
rename to python/python-smartpm/centos/patches/smart-set-noprogress-for-pycurl.patch
diff --git a/extended/python-smartpm/centos/patches/smart-support-rpm4.patch b/python/python-smartpm/centos/patches/smart-support-rpm4.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-support-rpm4.patch
rename to python/python-smartpm/centos/patches/smart-support-rpm4.patch
diff --git a/extended/python-smartpm/centos/patches/smart-tmpdir.patch b/python/python-smartpm/centos/patches/smart-tmpdir.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-tmpdir.patch
rename to python/python-smartpm/centos/patches/smart-tmpdir.patch
diff --git a/extended/python-smartpm/centos/patches/smart-yaml-error.patch b/python/python-smartpm/centos/patches/smart-yaml-error.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smart-yaml-error.patch
rename to python/python-smartpm/centos/patches/smart-yaml-error.patch
diff --git a/extended/python-smartpm/centos/patches/smartpm-rpm5-nodig.patch b/python/python-smartpm/centos/patches/smartpm-rpm5-nodig.patch
similarity index 100%
rename from extended/python-smartpm/centos/patches/smartpm-rpm5-nodig.patch
rename to python/python-smartpm/centos/patches/smartpm-rpm5-nodig.patch
diff --git a/extended/python-smartpm/centos/python-smartpm.spec b/python/python-smartpm/centos/python-smartpm.spec
similarity index 100%
rename from extended/python-smartpm/centos/python-smartpm.spec
rename to python/python-smartpm/centos/python-smartpm.spec
diff --git a/extended/python-smartpm/files/commit_transaction_error_handling.patch b/python/python-smartpm/files/commit_transaction_error_handling.patch
similarity index 100%
rename from extended/python-smartpm/files/commit_transaction_error_handling.patch
rename to python/python-smartpm/files/commit_transaction_error_handling.patch
diff --git a/extended/python-voluptuous/centos/build_srpm.data b/python/python-voluptuous/centos/build_srpm.data
similarity index 100%
rename from extended/python-voluptuous/centos/build_srpm.data
rename to python/python-voluptuous/centos/build_srpm.data
diff --git a/extended/python-voluptuous/centos/meta_patches/0001-meta-add-NotIn-validation.patch b/python/python-voluptuous/centos/meta_patches/0001-meta-add-NotIn-validation.patch
similarity index 100%
rename from extended/python-voluptuous/centos/meta_patches/0001-meta-add-NotIn-validation.patch
rename to python/python-voluptuous/centos/meta_patches/0001-meta-add-NotIn-validation.patch
diff --git a/extended/python-voluptuous/centos/meta_patches/PATCH_ORDER b/python/python-voluptuous/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/python-voluptuous/centos/meta_patches/PATCH_ORDER
rename to python/python-voluptuous/centos/meta_patches/PATCH_ORDER
diff --git a/extended/python-voluptuous/centos/patches/0001-add-NotIn-validation.patch b/python/python-voluptuous/centos/patches/0001-add-NotIn-validation.patch
similarity index 100%
rename from extended/python-voluptuous/centos/patches/0001-add-NotIn-validation.patch
rename to python/python-voluptuous/centos/patches/0001-add-NotIn-validation.patch
diff --git a/extended/python-voluptuous/centos/srpm_path b/python/python-voluptuous/centos/srpm_path
similarity index 100%
rename from extended/python-voluptuous/centos/srpm_path
rename to python/python-voluptuous/centos/srpm_path
diff --git a/extended/shim-signed/centos/build_srpm.data b/security/shim-signed/centos/build_srpm.data
similarity index 100%
rename from extended/shim-signed/centos/build_srpm.data
rename to security/shim-signed/centos/build_srpm.data
diff --git a/extended/shim-signed/centos/meta_patches/0001-Titanium-release-info.patch b/security/shim-signed/centos/meta_patches/0001-Titanium-release-info.patch
similarity index 100%
rename from extended/shim-signed/centos/meta_patches/0001-Titanium-release-info.patch
rename to security/shim-signed/centos/meta_patches/0001-Titanium-release-info.patch
diff --git a/extended/shim-signed/centos/meta_patches/0002-Use-presigned-binaries.patch b/security/shim-signed/centos/meta_patches/0002-Use-presigned-binaries.patch
similarity index 100%
rename from extended/shim-signed/centos/meta_patches/0002-Use-presigned-binaries.patch
rename to security/shim-signed/centos/meta_patches/0002-Use-presigned-binaries.patch
diff --git a/extended/shim-signed/centos/meta_patches/PATCH_ORDER b/security/shim-signed/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/shim-signed/centos/meta_patches/PATCH_ORDER
rename to security/shim-signed/centos/meta_patches/PATCH_ORDER
diff --git a/extended/shim-signed/centos/srpm_path b/security/shim-signed/centos/srpm_path
similarity index 100%
rename from extended/shim-signed/centos/srpm_path
rename to security/shim-signed/centos/srpm_path
diff --git a/extended/shim-unsigned/centos/build_srpm.data b/security/shim-unsigned/centos/build_srpm.data
similarity index 100%
rename from extended/shim-unsigned/centos/build_srpm.data
rename to security/shim-unsigned/centos/build_srpm.data
diff --git a/extended/shim-unsigned/centos/meta_patches/0001-Ti-version-string.patch b/security/shim-unsigned/centos/meta_patches/0001-Ti-version-string.patch
similarity index 100%
rename from extended/shim-unsigned/centos/meta_patches/0001-Ti-version-string.patch
rename to security/shim-unsigned/centos/meta_patches/0001-Ti-version-string.patch
diff --git a/extended/shim-unsigned/centos/meta_patches/0002-Add-Ti-certificate.patch b/security/shim-unsigned/centos/meta_patches/0002-Add-Ti-certificate.patch
similarity index 100%
rename from extended/shim-unsigned/centos/meta_patches/0002-Add-Ti-certificate.patch
rename to security/shim-unsigned/centos/meta_patches/0002-Add-Ti-certificate.patch
diff --git a/extended/shim-unsigned/centos/meta_patches/PATCH_ORDER b/security/shim-unsigned/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/shim-unsigned/centos/meta_patches/PATCH_ORDER
rename to security/shim-unsigned/centos/meta_patches/PATCH_ORDER
diff --git a/extended/shim-unsigned/centos/patches/0001-Use-Titanium-certificate.patch b/security/shim-unsigned/centos/patches/0001-Use-Titanium-certificate.patch
similarity index 100%
rename from extended/shim-unsigned/centos/patches/0001-Use-Titanium-certificate.patch
rename to security/shim-unsigned/centos/patches/0001-Use-Titanium-certificate.patch
diff --git a/extended/shim-unsigned/centos/srpm_path b/security/shim-unsigned/centos/srpm_path
similarity index 100%
rename from extended/shim-unsigned/centos/srpm_path
rename to security/shim-unsigned/centos/srpm_path
diff --git a/extended/shim-unsigned/files/tis-shim.crt b/security/shim-unsigned/files/tis-shim.crt
similarity index 100%
rename from extended/shim-unsigned/files/tis-shim.crt
rename to security/shim-unsigned/files/tis-shim.crt
diff --git a/extended/tboot/centos/build_srpm.data b/security/tboot/centos/build_srpm.data
similarity index 100%
rename from extended/tboot/centos/build_srpm.data
rename to security/tboot/centos/build_srpm.data
diff --git a/extended/tboot/centos/meta_patches/0001-tboot-Update-package-versioning-for-TIS-format.patch b/security/tboot/centos/meta_patches/0001-tboot-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/tboot/centos/meta_patches/0001-tboot-Update-package-versioning-for-TIS-format.patch
rename to security/tboot/centos/meta_patches/0001-tboot-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/tboot/centos/meta_patches/0002-TiS-tboot.patch b/security/tboot/centos/meta_patches/0002-TiS-tboot.patch
similarity index 100%
rename from extended/tboot/centos/meta_patches/0002-TiS-tboot.patch
rename to security/tboot/centos/meta_patches/0002-TiS-tboot.patch
diff --git a/extended/tboot/centos/meta_patches/0003-security-set-immutable-attribute.patch b/security/tboot/centos/meta_patches/0003-security-set-immutable-attribute.patch
similarity index 100%
rename from extended/tboot/centos/meta_patches/0003-security-set-immutable-attribute.patch
rename to security/tboot/centos/meta_patches/0003-security-set-immutable-attribute.patch
diff --git a/extended/tboot/centos/meta_patches/PATCH_ORDER b/security/tboot/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/tboot/centos/meta_patches/PATCH_ORDER
rename to security/tboot/centos/meta_patches/PATCH_ORDER
diff --git a/extended/tboot/centos/patches/1000-tboot-for-tis.patch b/security/tboot/centos/patches/1000-tboot-for-tis.patch
similarity index 100%
rename from extended/tboot/centos/patches/1000-tboot-for-tis.patch
rename to security/tboot/centos/patches/1000-tboot-for-tis.patch
diff --git a/extended/tboot/centos/srpm_path b/security/tboot/centos/srpm_path
similarity index 100%
rename from extended/tboot/centos/srpm_path
rename to security/tboot/centos/srpm_path
diff --git a/python/python-3parclient/centos/build_srpm.data b/strorage-drivers/python-3parclient/centos/build_srpm.data
similarity index 100%
rename from python/python-3parclient/centos/build_srpm.data
rename to strorage-drivers/python-3parclient/centos/build_srpm.data
diff --git a/python/python-3parclient/centos/python-3parclient.spec b/strorage-drivers/python-3parclient/centos/python-3parclient.spec
similarity index 100%
rename from python/python-3parclient/centos/python-3parclient.spec
rename to strorage-drivers/python-3parclient/centos/python-3parclient.spec
diff --git a/python/python-lefthandclient/centos/build_srpm.data b/strorage-drivers/python-lefthandclient/centos/build_srpm.data
similarity index 100%
rename from python/python-lefthandclient/centos/build_srpm.data
rename to strorage-drivers/python-lefthandclient/centos/build_srpm.data
diff --git a/python/python-lefthandclient/centos/python-lefthandclient.spec b/strorage-drivers/python-lefthandclient/centos/python-lefthandclient.spec
similarity index 100%
rename from python/python-lefthandclient/centos/python-lefthandclient.spec
rename to strorage-drivers/python-lefthandclient/centos/python-lefthandclient.spec
diff --git a/support/tgt/centos/build_srpm.data b/support/tgt/centos/build_srpm.data
deleted file mode 100644
index f56f69c16..000000000
--- a/support/tgt/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
-COPY_LIST="$DISTRO/files/*"
-TIS_PATCH_VER=2
diff --git a/support/tgt/centos/files/tgtd.init b/support/tgt/centos/files/tgtd.init
deleted file mode 100644
index d221eeb5d..000000000
--- a/support/tgt/centos/files/tgtd.init
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2013-2014 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-### BEGIN INIT INFO
-# Provides: tgtd
-# Required-Start: $remote_fs $network $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start:
-# Default-Stop:
-# Short-Description: SCSI target daemon
-# Description: Linux SCSI target framework (tgt)
-### END INIT INFO
-
-DESC="tgtd"
-DAEMON="/usr/sbin/tgtd"
-TGTD_CONFIG=/etc/tgt/targets.conf
-
-start ()
-{
-    echo -n "Starting $DESC..."
-    tgt-admin -s >/dev/null 2>&1
-    RETVAL=$?
-    if [ "$RETVAL" -ne 107 ] ; then
-        echo "$DESC is already running"
-        # Ensure tgtd is in the "ready" state. Handles the case where the
-        # init script was killed while tgtd was offline.
-        tgtadm --op update --mode sys --name State -v ready
-        exit 0
-    fi
-
-    # Start tgtd first
-    $DAEMON &>/dev/null
-    RETVAL=$?
-    if [ "$RETVAL" -ne 0 ]; then
-        echo "failed."
-        exit 1
-    fi
-
-    # Put tgtd into "offline" state until all the targets are configured.
-    # We don't want initiators to (re)connect and fail the connection
-    # if it's not ready.
-    tgtadm --op update --mode sys --name State -v offline
-    # Configure the targets.
-    tgt-admin -e -c $TGTD_CONFIG
-    # Put tgtd into "ready" state.
-    tgtadm --op update --mode sys --name State -v ready
-
-    echo "done."
-}
-
-stop ()
-{
-    echo -n "Stopping $DESC..."
-
-    # Remove all targets. It only removes targets which are not in use.
-    tgt-admin --update ALL -c /dev/null &>/dev/null
-    # tgtd will exit if all targets were removed
-    tgtadm --op delete --mode system &>/dev/null
-    RETVAL=$?
-    if [ "$RETVAL" -eq 107 ] ; then
-        echo "$DESC is not running"
-        exit 0
-    elif [ "$RETVAL" -ne 0 ] ; then
-        echo "Some initiators are still connected - could not stop $DESC"
-        exit 2
-    fi
-    echo -n
-}
-
-forcedstop()
-{
-    # NOTE: Forced shutdown of the iscsi target may cause data corruption
-    # for initiators that are connected.
-    echo -n "Force stopping $DESC..."
-
-    # Offline everything first. May be needed if we're rebooting, but
-    # expect the initiators to reconnect cleanly when we boot again
-    # (i.e. we don't want them to reconnect to a tgtd which is still
-    # working, but the target is gone).
-    tgtadm --op update --mode sys --name State -v offline &>/dev/null
-    RETVAL=$?
-    if [ "$RETVAL" -eq 107 ] ; then
-        echo "$DESC is not running"
-        exit 0
-    else
-        tgt-admin --offline ALL
-        # Remove all targets, even if they are still in use.
-        tgt-admin --update ALL -c /dev/null -f
-        # It will shut down tgtd only after all targets were removed.
-        tgtadm --op delete --mode system
-        RETVAL=$?
-        if [ "$RETVAL" -ne 0 ] ; then
-            echo "Failed to shutdown $DESC"
-            exit 1
-        fi
-    fi
-    echo -n
-}
-
-reload()
-{
-        echo "Reloading configuration of $DESC" "$NAME"
-        # Update configuration for targets. Only targets which
-        # are not in use will be updated.
-        tgt-admin --update ALL -c $TGTD_CONFIG &>/dev/null
-        RETVAL=$?
-        if [ "$RETVAL" -eq 107 ] ; then
-                echo "$DESC is not running"
-                exit 1
-        fi
-}
-
-status()
-{
-        tgt-admin -s >/dev/null 2>&1
-	RETVAL=$?
-        if [ "$RETVAL" -eq 107 ] ; then
-                echo "$DESC is not running"
-                # For lsb compliance...
-                exit 3
-        else
-                echo "$DESC is running"
-        fi
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    forcedstop)
-        forcedstop
-        ;;
-    restart|force-reload)
-        stop
-        start
-        ;;
-    reload)
-        reload
-        ;;
-    status)
-        status
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|forcedstop|force-reload|restart|status|reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/support/tgt/centos/files/tgtd.service b/support/tgt/centos/files/tgtd.service
deleted file mode 100644
index 04c3a026a..000000000
--- a/support/tgt/centos/files/tgtd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=tgtd iSCSI target daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/etc/init.d/tgtd start
-ExecStop=/etc/init.d/tgtd stop
-ExecReload=/etc/init.d/tgtd reload
-#RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/support/tgt/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/support/tgt/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
deleted file mode 100644
index c05fe5fd7..000000000
--- a/support/tgt/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 61010c2ba23abfa0e69ab884f3fff0c252544c8b Mon Sep 17 00:00:00 2001
-From: Don Penney <don.penney@windriver.com>
-Date: Tue, 27 Sep 2016 11:00:04 -0400
-Subject: [PATCH] Update package versioning for TIS format
-
----
- SPECS/scsi-target-utils.spec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SPECS/scsi-target-utils.spec b/SPECS/scsi-target-utils.spec
-index c97ada4..1778e8f 100644
---- a/SPECS/scsi-target-utils.spec
-+++ b/SPECS/scsi-target-utils.spec
-@@ -14,7 +14,7 @@
- 
- Name:           scsi-target-utils
- Version:        1.0.55
--Release:        4%{?dist}
-+Release:        4.el7%{?_tis_dist}.%{tis_patch_ver}
- Summary:        The SCSI target daemon and utility programs
- 
- Group:          System Environment/Daemons
--- 
-1.8.3.1
-
diff --git a/support/tgt/centos/meta_patches/PATCH_ORDER b/support/tgt/centos/meta_patches/PATCH_ORDER
deleted file mode 100644
index bfcf5e008..000000000
--- a/support/tgt/centos/meta_patches/PATCH_ORDER
+++ /dev/null
@@ -1,2 +0,0 @@
-spec-to-use-custom-startup-script.patch
-0001-Update-package-versioning-for-TIS-format.patch
diff --git a/support/tgt/centos/meta_patches/spec-to-use-custom-startup-script.patch b/support/tgt/centos/meta_patches/spec-to-use-custom-startup-script.patch
deleted file mode 100644
index f34ac4ef9..000000000
--- a/support/tgt/centos/meta_patches/spec-to-use-custom-startup-script.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-scsi-target-utils: to use custom startup script
-
-CGCS has custom systemv startup script.  This patch enables spec file to
-to use CGCS custom startup script.  Also puppet packstack expects the
-original /etc/tgt/targets.conf file (not from fedora distro), so change
-spec file to use the original targets.conf instead.
-
-diff --git a/tmp/scsi-target-utils.spec.org b/SPECS/scsi-target-utils.spec
-index 4f134de..5394c3a 100644
---- a/tmp/scsi-target-utils.spec.org
-+++ b/SPECS/scsi-target-utils.spec
-@@ -26,6 +26,7 @@ Source2:        sysconfig.tgtd
- Source3:        targets.conf
- Source4:        sample.conf
- Source5:        tgtd.conf
-+Source6:        tgtd.init
- Patch0:         0001-redhatify-docs.patch
- Patch1:         0002-remove-check-for-xsltproc.patch
- Patch2:         0003-default-config.patch
-@@ -99,9 +100,11 @@ Adds support for the Gluster glfs backstore to scsi-target-utils.
- %{__install} -p -m 0644 doc/manpages/tgt-admin.8 %{buildroot}/%{_mandir}/man8
- %{__install} -p -m 0644 doc/manpages/tgt-setup-lun.8 %{buildroot}/%{_mandir}/man8
- %{__install} -p -m 0600 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/tgtd
--%{__install} -p -m 0600 %{SOURCE3} %{buildroot}%{_sysconfdir}/tgt
-+%{__install} -p -m 0600 conf/targets.conf %{buildroot}%{_sysconfdir}/tgt
- %{__install} -p -m 0600 %{SOURCE4} %{buildroot}%{_sysconfdir}/tgt/conf.d
--%{__install} -p -m 0600 %{SOURCE5} %{buildroot}%{_sysconfdir}/tgt
-+#%{__install} -p -m 0600 %{SOURCE5} %{buildroot}%{_sysconfdir}/tgt
-+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d/
-+%{__install} -p -m 0755 %{SOURCE6} %{buildroot}%{_sysconfdir}/rc.d/init.d/tgtd
- 
- pushd usr
- %{__make} install %{?with_rdma:ISCSI_RDMA=1} %{?with_rbd:CEPH_RBD=1} %{?with_glfs:GLFS_BD=1} SD_NOTIFY=1 DESTDIR=%{buildroot} sbindir=%{_sbindir} libdir=%{_libdir}/tgt
-@@ -132,8 +135,9 @@ pushd usr
- %{_unitdir}/tgtd.service
- %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/tgtd
- %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/tgt/targets.conf
--%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/tgt/tgtd.conf
-+#%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/tgt/tgtd.conf
- %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/tgt/conf.d/sample.conf
-+%attr(-,root,root) %{_sysconfdir}/rc.d/init.d/tgtd
- 
- %if 0%{?with_rbd}
- %files rbd
diff --git a/support/tgt/centos/srpm_path b/support/tgt/centos/srpm_path
deleted file mode 100644
index 694a9db57..000000000
--- a/support/tgt/centos/srpm_path
+++ /dev/null
@@ -1 +0,0 @@
-mirror:Source/scsi-target-utils-1.0.55-4.el7.src.rpm
diff --git a/support/tgt/files/0001-usr-Makefile-WARNING-fix.patch b/support/tgt/files/0001-usr-Makefile-WARNING-fix.patch
deleted file mode 100644
index 15f54820f..000000000
--- a/support/tgt/files/0001-usr-Makefile-WARNING-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2a336ec5bf939d86425570617471df60140d839e Mon Sep 17 00:00:00 2001
-From: Li xin <lixin.fnst@cn.fujitsu.com>
-Date: Sun, 26 Jul 2015 04:23:51 +0900
-Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt:
- /work/i586-oe-linux/tgt/1.0.60+gitAUTOINC+ab51727a36-r0/
- packages-split/tgt/usr/sbin/tgtd contains probably-redundant RPATH /usr/lib
- [useless-rpaths]
-
-Upstream-Status: pending
-
-Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
----
- usr/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usr/Makefile b/usr/Makefile
-index 1fae7e7..2db109c 100644
---- a/usr/Makefile
-+++ b/usr/Makefile
-@@ -63,7 +63,7 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
- 
- TGTD_DEP = $(TGTD_OBJS:.o=.d)
- 
--LDFLAGS = -Wl,-E,-rpath=$(libdir)
-+LDFLAGS = -Wl,-E
- 
- .PHONY:all
- all: $(PROGRAMS) $(MODULES)
--- 
-1.8.4.2
-
diff --git a/support/tgt/files/tgtd.init b/support/tgt/files/tgtd.init
deleted file mode 100644
index 466c27413..000000000
--- a/support/tgt/files/tgtd.init
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2013-2014 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-### BEGIN INIT INFO
-# Provides: tgtd
-# Required-Start: $remote_fs $network $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start:     3 5
-# Default-Stop:      0 1 2 6
-# Short-Description: SCSI target daemon
-# Description: Linux SCSI target framework (tgt)
-### END INIT INFO
-
-DESC="tgtd"
-DAEMON="/usr/sbin/tgtd"
-TGTD_CONFIG=/etc/tgt/targets.conf
-
-start ()
-{
-    echo -n "Starting $DESC..."
-    tgt-admin -s >/dev/null 2>&1
-    RETVAL=$?
-    if [ "$RETVAL" -ne 107 ] ; then
-        echo "$DESC is already running"
-        # Ensure tgtd is in the "ready" state. Handles the case where the
-        # init script was killed while tgtd was offline.
-        tgtadm --op update --mode sys --name State -v ready
-        exit 0
-    fi
-
-    # Start tgtd first
-    $DAEMON &>/dev/null
-    RETVAL=$?
-    if [ "$RETVAL" -ne 0 ]; then
-        echo "failed."
-        exit 1
-    fi
-
-    # Put tgtd into "offline" state until all the targets are configured.
-    # We don't want initiators to (re)connect and fail the connection
-    # if it's not ready.
-    tgtadm --op update --mode sys --name State -v offline
-    # Configure the targets.
-    tgt-admin -e -c $TGTD_CONFIG
-    # Put tgtd into "ready" state.
-    tgtadm --op update --mode sys --name State -v ready
-
-    echo "done."
-}
-
-stop ()
-{
-    echo -n "Stopping $DESC..."
-
-    # Remove all targets. It only removes targets which are not in use.
-    tgt-admin --update ALL -c /dev/null &>/dev/null
-    # tgtd will exit if all targets were removed
-    tgtadm --op delete --mode system &>/dev/null
-    RETVAL=$?
-    if [ "$RETVAL" -eq 107 ] ; then
-        echo "$DESC is not running"
-        exit 0
-    elif [ "$RETVAL" -ne 0 ] ; then
-        echo "Some initiators are still connected - could not stop $DESC"
-        exit 2
-    fi
-    echo -n
-}
-
-forcedstop()
-{
-    # NOTE: Forced shutdown of the iscsi target may cause data corruption
-    # for initiators that are connected.
-    echo -n "Force stopping $DESC..."
-
-    # Offline everything first. May be needed if we're rebooting, but
-    # expect the initiators to reconnect cleanly when we boot again
-    # (i.e. we don't want them to reconnect to a tgtd which is still
-    # working, but the target is gone).
-    tgtadm --op update --mode sys --name State -v offline &>/dev/null
-    RETVAL=$?
-    if [ "$RETVAL" -eq 107 ] ; then
-        echo "$DESC is not running"
-        exit 0
-    else
-        tgt-admin --offline ALL
-        # Remove all targets, even if they are still in use.
-        tgt-admin --update ALL -c /dev/null -f
-        # It will shut down tgtd only after all targets were removed.
-        tgtadm --op delete --mode system
-        RETVAL=$?
-        if [ "$RETVAL" -ne 0 ] ; then
-            echo "Failed to shutdown $DESC"
-            exit 1
-        fi
-    fi
-    echo -n
-}
-
-reload()
-{
-        echo "Reloading configuration of $DESC" "$NAME"
-        # Update configuration for targets. Only targets which
-        # are not in use will be updated.
-        tgt-admin --update ALL -c $TGTD_CONFIG &>/dev/null
-        RETVAL=$?
-        if [ "$RETVAL" -eq 107 ] ; then
-                echo "$DESC is not running"
-                exit 1
-        fi
-}
-
-status()
-{
-        tgt-admin -s >/dev/null 2>&1
-	RETVAL=$?
-        if [ "$RETVAL" -eq 107 ] ; then
-                echo "$DESC is not running"
-                # For lsb compliance...
-                exit 3
-        else
-                echo "$DESC is running"
-        fi
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    forcedstop)
-        forcedstop
-        ;;
-    restart|force-reload)
-        stop
-        start
-        ;;
-    reload)
-        reload
-        ;;
-    status)
-        status
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|forcedstop|force-reload|restart|status|reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/devtools/nfscheck/recipes-common/nfscheck/LICENSE b/tools/storage-topology/storage-topology/LICENSE
similarity index 100%
rename from devtools/nfscheck/recipes-common/nfscheck/LICENSE
rename to tools/storage-topology/storage-topology/LICENSE
diff --git a/storage-topology/storage-topology/setup.py b/tools/storage-topology/storage-topology/setup.py
similarity index 100%
rename from storage-topology/storage-topology/setup.py
rename to tools/storage-topology/storage-topology/setup.py
diff --git a/storage-topology/storage-topology/storage_topology/__init__.py b/tools/storage-topology/storage-topology/storage_topology/__init__.py
similarity index 100%
rename from storage-topology/storage-topology/storage_topology/__init__.py
rename to tools/storage-topology/storage-topology/storage_topology/__init__.py
diff --git a/storage-topology/storage-topology/storage_topology/exec/__init__.py b/tools/storage-topology/storage-topology/storage_topology/exec/__init__.py
similarity index 100%
rename from storage-topology/storage-topology/storage_topology/exec/__init__.py
rename to tools/storage-topology/storage-topology/storage_topology/exec/__init__.py
diff --git a/storage-topology/storage-topology/storage_topology/exec/storage_topology.py b/tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py
similarity index 100%
rename from storage-topology/storage-topology/storage_topology/exec/storage_topology.py
rename to tools/storage-topology/storage-topology/storage_topology/exec/storage_topology.py
diff --git a/vm-topology/centos/build_srpm.data b/tools/vm-topology/centos/build_srpm.data
similarity index 100%
rename from vm-topology/centos/build_srpm.data
rename to tools/vm-topology/centos/build_srpm.data
diff --git a/vm-topology/centos/vm-topology.spec b/tools/vm-topology/centos/vm-topology.spec
similarity index 100%
rename from vm-topology/centos/vm-topology.spec
rename to tools/vm-topology/centos/vm-topology.spec
diff --git a/devtools/nfscheck/recipes-common/nfscheck/files/LICENSE b/tools/vm-topology/vm-topology/LICENSE
similarity index 100%
rename from devtools/nfscheck/recipes-common/nfscheck/files/LICENSE
rename to tools/vm-topology/vm-topology/LICENSE
diff --git a/vm-topology/vm-topology/setup.py b/tools/vm-topology/vm-topology/setup.py
similarity index 100%
rename from vm-topology/vm-topology/setup.py
rename to tools/vm-topology/vm-topology/setup.py
diff --git a/vm-topology/vm-topology/vm_topology/__init__.py b/tools/vm-topology/vm-topology/vm_topology/__init__.py
similarity index 100%
rename from vm-topology/vm-topology/vm_topology/__init__.py
rename to tools/vm-topology/vm-topology/vm_topology/__init__.py
diff --git a/vm-topology/vm-topology/vm_topology/exec/__init__.py b/tools/vm-topology/vm-topology/vm_topology/exec/__init__.py
similarity index 100%
rename from vm-topology/vm-topology/vm_topology/exec/__init__.py
rename to tools/vm-topology/vm-topology/vm_topology/exec/__init__.py
diff --git a/vm-topology/vm-topology/vm_topology/exec/vm_topology.py b/tools/vm-topology/vm-topology/vm_topology/exec/vm_topology.py
similarity index 100%
rename from vm-topology/vm-topology/vm_topology/exec/vm_topology.py
rename to tools/vm-topology/vm-topology/vm_topology/exec/vm_topology.py
diff --git a/devtools/update-motd/LICENSE b/utilities/namespace-utils/LICENSE
similarity index 100%
rename from devtools/update-motd/LICENSE
rename to utilities/namespace-utils/LICENSE
diff --git a/base/namespace-utils/centos/build_srpm.data b/utilities/namespace-utils/centos/build_srpm.data
similarity index 100%
rename from base/namespace-utils/centos/build_srpm.data
rename to utilities/namespace-utils/centos/build_srpm.data
diff --git a/base/namespace-utils/centos/namespace-utils.spec b/utilities/namespace-utils/centos/namespace-utils.spec
similarity index 100%
rename from base/namespace-utils/centos/namespace-utils.spec
rename to utilities/namespace-utils/centos/namespace-utils.spec
diff --git a/devtools/update-motd/files/LICENSE b/utilities/namespace-utils/namespace-utils/LICENSE
similarity index 100%
rename from devtools/update-motd/files/LICENSE
rename to utilities/namespace-utils/namespace-utils/LICENSE
diff --git a/base/namespace-utils/namespace-utils/bashns.c b/utilities/namespace-utils/namespace-utils/bashns.c
similarity index 100%
rename from base/namespace-utils/namespace-utils/bashns.c
rename to utilities/namespace-utils/namespace-utils/bashns.c
diff --git a/base/namespace-utils/namespace-utils/umount-in-namespace b/utilities/namespace-utils/namespace-utils/umount-in-namespace
similarity index 100%
rename from base/namespace-utils/namespace-utils/umount-in-namespace
rename to utilities/namespace-utils/namespace-utils/umount-in-namespace
diff --git a/extended/nova-utils/centos/build_srpm.data b/utilities/nova-utils/centos/build_srpm.data
similarity index 100%
rename from extended/nova-utils/centos/build_srpm.data
rename to utilities/nova-utils/centos/build_srpm.data
diff --git a/extended/nova-utils/centos/nova-utils.spec b/utilities/nova-utils/centos/nova-utils.spec
similarity index 100%
rename from extended/nova-utils/centos/nova-utils.spec
rename to utilities/nova-utils/centos/nova-utils.spec
diff --git a/extended/nova-utils/nova-utils/LICENSE b/utilities/nova-utils/nova-utils/LICENSE
similarity index 100%
rename from extended/nova-utils/nova-utils/LICENSE
rename to utilities/nova-utils/nova-utils/LICENSE
diff --git a/extended/nova-utils/nova-utils/nova-sriov b/utilities/nova-utils/nova-utils/nova-sriov
similarity index 100%
rename from extended/nova-utils/nova-utils/nova-sriov
rename to utilities/nova-utils/nova-utils/nova-sriov
diff --git a/base/tis-extensions/PKG-INFO b/utilities/tis-extensions/PKG-INFO
similarity index 100%
rename from base/tis-extensions/PKG-INFO
rename to utilities/tis-extensions/PKG-INFO
diff --git a/base/tis-extensions/centos/build_srpm.data b/utilities/tis-extensions/centos/build_srpm.data
similarity index 100%
rename from base/tis-extensions/centos/build_srpm.data
rename to utilities/tis-extensions/centos/build_srpm.data
diff --git a/base/tis-extensions/centos/tis-extensions.spec b/utilities/tis-extensions/centos/tis-extensions.spec
similarity index 100%
rename from base/tis-extensions/centos/tis-extensions.spec
rename to utilities/tis-extensions/centos/tis-extensions.spec
diff --git a/networking/mlx4-config/files/LICENSE b/utilities/tis-extensions/files/LICENSE
similarity index 100%
rename from networking/mlx4-config/files/LICENSE
rename to utilities/tis-extensions/files/LICENSE
diff --git a/base/tis-extensions/files/coredump-sysctl.conf b/utilities/tis-extensions/files/coredump-sysctl.conf
similarity index 100%
rename from base/tis-extensions/files/coredump-sysctl.conf
rename to utilities/tis-extensions/files/coredump-sysctl.conf
diff --git a/base/tis-extensions/files/coredump.conf b/utilities/tis-extensions/files/coredump.conf
similarity index 100%
rename from base/tis-extensions/files/coredump.conf
rename to utilities/tis-extensions/files/coredump.conf
diff --git a/base/tis-extensions/files/modules-load-vfio.conf b/utilities/tis-extensions/files/modules-load-vfio.conf
similarity index 100%
rename from base/tis-extensions/files/modules-load-vfio.conf
rename to utilities/tis-extensions/files/modules-load-vfio.conf
diff --git a/base/tis-extensions/files/target b/utilities/tis-extensions/files/target
similarity index 100%
rename from base/tis-extensions/files/target
rename to utilities/tis-extensions/files/target
diff --git a/base/tis-extensions/files/target.service b/utilities/tis-extensions/files/target.service
similarity index 100%
rename from base/tis-extensions/files/target.service
rename to utilities/tis-extensions/files/target.service
diff --git a/storage-topology/storage-topology/LICENSE b/utilities/update-motd/LICENSE
similarity index 100%
rename from storage-topology/storage-topology/LICENSE
rename to utilities/update-motd/LICENSE
diff --git a/devtools/update-motd/PKG-INFO b/utilities/update-motd/PKG-INFO
similarity index 100%
rename from devtools/update-motd/PKG-INFO
rename to utilities/update-motd/PKG-INFO
diff --git a/devtools/vim/centos/build_srpm.data b/utilities/update-motd/centos/build_srpm.data
similarity index 100%
rename from devtools/vim/centos/build_srpm.data
rename to utilities/update-motd/centos/build_srpm.data
diff --git a/devtools/update-motd/centos/update-motd.spec b/utilities/update-motd/centos/update-motd.spec
similarity index 100%
rename from devtools/update-motd/centos/update-motd.spec
rename to utilities/update-motd/centos/update-motd.spec
diff --git a/vm-topology/vm-topology/LICENSE b/utilities/update-motd/files/LICENSE
similarity index 100%
rename from vm-topology/vm-topology/LICENSE
rename to utilities/update-motd/files/LICENSE
diff --git a/devtools/update-motd/files/apply_banner_customization b/utilities/update-motd/files/apply_banner_customization
similarity index 100%
rename from devtools/update-motd/files/apply_banner_customization
rename to utilities/update-motd/files/apply_banner_customization
diff --git a/devtools/update-motd/files/customize-banner b/utilities/update-motd/files/customize-banner
similarity index 100%
rename from devtools/update-motd/files/customize-banner
rename to utilities/update-motd/files/customize-banner
diff --git a/devtools/update-motd/files/install_banner_customization b/utilities/update-motd/files/install_banner_customization
similarity index 100%
rename from devtools/update-motd/files/install_banner_customization
rename to utilities/update-motd/files/install_banner_customization
diff --git a/devtools/update-motd/files/motd-footer b/utilities/update-motd/files/motd-footer
similarity index 100%
rename from devtools/update-motd/files/motd-footer
rename to utilities/update-motd/files/motd-footer
diff --git a/devtools/update-motd/files/motd-header b/utilities/update-motd/files/motd-header
similarity index 100%
rename from devtools/update-motd/files/motd-header
rename to utilities/update-motd/files/motd-header
diff --git a/devtools/update-motd/files/motd-update b/utilities/update-motd/files/motd-update
similarity index 100%
rename from devtools/update-motd/files/motd-update
rename to utilities/update-motd/files/motd-update
diff --git a/devtools/update-motd/files/motd-update.cron b/utilities/update-motd/files/motd-update.cron
similarity index 100%
rename from devtools/update-motd/files/motd-update.cron
rename to utilities/update-motd/files/motd-update.cron
diff --git a/mellanox/libibverbs/centos/build_srpm.data b/virt/cloud-init/centos/build_srpm.data
similarity index 100%
rename from mellanox/libibverbs/centos/build_srpm.data
rename to virt/cloud-init/centos/build_srpm.data
diff --git a/extended/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/virt/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to virt/cloud-init/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/extended/cloud-init/centos/meta_patches/PATCH_ORDER b/virt/cloud-init/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from extended/cloud-init/centos/meta_patches/PATCH_ORDER
rename to virt/cloud-init/centos/meta_patches/PATCH_ORDER
diff --git a/extended/cloud-init/centos/meta_patches/spec-include-tis-changes.patch b/virt/cloud-init/centos/meta_patches/spec-include-tis-changes.patch
similarity index 100%
rename from extended/cloud-init/centos/meta_patches/spec-include-tis-changes.patch
rename to virt/cloud-init/centos/meta_patches/spec-include-tis-changes.patch
diff --git a/extended/cloud-init/centos/patches/cloud-init-interactive-parted.patch b/virt/cloud-init/centos/patches/cloud-init-interactive-parted.patch
similarity index 100%
rename from extended/cloud-init/centos/patches/cloud-init-interactive-parted.patch
rename to virt/cloud-init/centos/patches/cloud-init-interactive-parted.patch
diff --git a/extended/cloud-init/centos/srpm_path b/virt/cloud-init/centos/srpm_path
similarity index 100%
rename from extended/cloud-init/centos/srpm_path
rename to virt/cloud-init/centos/srpm_path
diff --git a/extended/cloud-init/cloud-init/cloud-init-interactive-parted.patch b/virt/cloud-init/cloud-init/cloud-init-interactive-parted.patch
similarity index 100%
rename from extended/cloud-init/cloud-init/cloud-init-interactive-parted.patch
rename to virt/cloud-init/cloud-init/cloud-init-interactive-parted.patch
diff --git a/extended/cloud-init/cloud-init/find_candidate_devs_fix.patch b/virt/cloud-init/cloud-init/find_candidate_devs_fix.patch
similarity index 100%
rename from extended/cloud-init/cloud-init/find_candidate_devs_fix.patch
rename to virt/cloud-init/cloud-init/find_candidate_devs_fix.patch
diff --git a/extended/cloud-init/cloud-init/first_boot.patch b/virt/cloud-init/cloud-init/first_boot.patch
similarity index 100%
rename from extended/cloud-init/cloud-init/first_boot.patch
rename to virt/cloud-init/cloud-init/first_boot.patch
diff --git a/extended/libvirt-python/PKG-INFO b/virt/libvirt-python/PKG-INFO
similarity index 100%
rename from extended/libvirt-python/PKG-INFO
rename to virt/libvirt-python/PKG-INFO
diff --git a/mellanox/rdma-core/centos/build_srpm.data b/virt/libvirt-python/centos/build_srpm.data
similarity index 100%
rename from mellanox/rdma-core/centos/build_srpm.data
rename to virt/libvirt-python/centos/build_srpm.data
diff --git a/extended/libvirt-python/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/virt/libvirt-python/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from extended/libvirt-python/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to virt/libvirt-python/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
diff --git a/mellanox/libmlx5/centos/meta_patches/PATCH_ORDER b/virt/libvirt-python/centos/meta_patches/PATCH_ORDER
similarity index 100%
rename from mellanox/libmlx5/centos/meta_patches/PATCH_ORDER
rename to virt/libvirt-python/centos/meta_patches/PATCH_ORDER
diff --git a/extended/libvirt-python/centos/srpm_path b/virt/libvirt-python/centos/srpm_path
similarity index 100%
rename from extended/libvirt-python/centos/srpm_path
rename to virt/libvirt-python/centos/srpm_path
diff --git a/extended/libvirt/.gitignore b/virt/libvirt/.gitignore
similarity index 100%
rename from extended/libvirt/.gitignore
rename to virt/libvirt/.gitignore
diff --git a/extended/libvirt/PKG-INFO b/virt/libvirt/PKG-INFO
similarity index 100%
rename from extended/libvirt/PKG-INFO
rename to virt/libvirt/PKG-INFO
diff --git a/extended/libvirt/README b/virt/libvirt/README
similarity index 100%
rename from extended/libvirt/README
rename to virt/libvirt/README
diff --git a/extended/libvirt/centos/build_srpm.data b/virt/libvirt/centos/build_srpm.data
similarity index 100%
rename from extended/libvirt/centos/build_srpm.data
rename to virt/libvirt/centos/build_srpm.data
diff --git a/extended/libvirt/centos/libvirt.spec b/virt/libvirt/centos/libvirt.spec
similarity index 100%
rename from extended/libvirt/centos/libvirt.spec
rename to virt/libvirt/centos/libvirt.spec
diff --git a/extended/libvirt/libvirt-2.0.0/libvirt.logrotate b/virt/libvirt/libvirt-2.0.0/libvirt.logrotate
similarity index 100%
rename from extended/libvirt/libvirt-2.0.0/libvirt.logrotate
rename to virt/libvirt/libvirt-2.0.0/libvirt.logrotate
diff --git a/extended/libvirt/libvirt-2.0.0/libvirt.lxc b/virt/libvirt/libvirt-2.0.0/libvirt.lxc
similarity index 100%
rename from extended/libvirt/libvirt-2.0.0/libvirt.lxc
rename to virt/libvirt/libvirt-2.0.0/libvirt.lxc
diff --git a/extended/libvirt/libvirt-2.0.0/libvirt.qemu b/virt/libvirt/libvirt-2.0.0/libvirt.qemu
similarity index 100%
rename from extended/libvirt/libvirt-2.0.0/libvirt.qemu
rename to virt/libvirt/libvirt-2.0.0/libvirt.qemu
diff --git a/extended/libvirt/libvirt-2.0.0/libvirt.uml b/virt/libvirt/libvirt-2.0.0/libvirt.uml
similarity index 100%
rename from extended/libvirt/libvirt-2.0.0/libvirt.uml
rename to virt/libvirt/libvirt-2.0.0/libvirt.uml
diff --git a/extended/libvirt/libvirt-3.5.0/libvirt.logrotate b/virt/libvirt/libvirt-3.5.0/libvirt.logrotate
similarity index 100%
rename from extended/libvirt/libvirt-3.5.0/libvirt.logrotate
rename to virt/libvirt/libvirt-3.5.0/libvirt.logrotate
diff --git a/extended/libvirt/libvirt-3.5.0/libvirt.lxc b/virt/libvirt/libvirt-3.5.0/libvirt.lxc
similarity index 100%
rename from extended/libvirt/libvirt-3.5.0/libvirt.lxc
rename to virt/libvirt/libvirt-3.5.0/libvirt.lxc
diff --git a/extended/libvirt/libvirt-3.5.0/libvirt.qemu b/virt/libvirt/libvirt-3.5.0/libvirt.qemu
similarity index 100%
rename from extended/libvirt/libvirt-3.5.0/libvirt.qemu
rename to virt/libvirt/libvirt-3.5.0/libvirt.qemu
diff --git a/extended/libvirt/libvirt-3.5.0/libvirt.uml b/virt/libvirt/libvirt-3.5.0/libvirt.uml
similarity index 100%
rename from extended/libvirt/libvirt-3.5.0/libvirt.uml
rename to virt/libvirt/libvirt-3.5.0/libvirt.uml
diff --git a/devtools/qemu/.gitignore b/virt/qemu/.gitignore
similarity index 100%
rename from devtools/qemu/.gitignore
rename to virt/qemu/.gitignore
diff --git a/devtools/qemu/PKG-INFO b/virt/qemu/PKG-INFO
similarity index 100%
rename from devtools/qemu/PKG-INFO
rename to virt/qemu/PKG-INFO
diff --git a/devtools/qemu/README b/virt/qemu/README
similarity index 100%
rename from devtools/qemu/README
rename to virt/qemu/README
diff --git a/devtools/qemu/centos/build_srpm.data b/virt/qemu/centos/build_srpm.data
similarity index 100%
rename from devtools/qemu/centos/build_srpm.data
rename to virt/qemu/centos/build_srpm.data
diff --git a/devtools/qemu/centos/files/80-kvm.rules b/virt/qemu/centos/files/80-kvm.rules
similarity index 100%
rename from devtools/qemu/centos/files/80-kvm.rules
rename to virt/qemu/centos/files/80-kvm.rules
diff --git a/devtools/qemu/centos/files/85-kvm.preset b/virt/qemu/centos/files/85-kvm.preset
similarity index 100%
rename from devtools/qemu/centos/files/85-kvm.preset
rename to virt/qemu/centos/files/85-kvm.preset
diff --git a/devtools/qemu/centos/files/95-kvm-memlock.conf b/virt/qemu/centos/files/95-kvm-memlock.conf
similarity index 100%
rename from devtools/qemu/centos/files/95-kvm-memlock.conf
rename to virt/qemu/centos/files/95-kvm-memlock.conf
diff --git a/devtools/qemu/centos/files/99-qemu-guest-agent.rules b/virt/qemu/centos/files/99-qemu-guest-agent.rules
similarity index 100%
rename from devtools/qemu/centos/files/99-qemu-guest-agent.rules
rename to virt/qemu/centos/files/99-qemu-guest-agent.rules
diff --git a/devtools/qemu/centos/files/README.rhel6-gpxe-source b/virt/qemu/centos/files/README.rhel6-gpxe-source
similarity index 100%
rename from devtools/qemu/centos/files/README.rhel6-gpxe-source
rename to virt/qemu/centos/files/README.rhel6-gpxe-source
diff --git a/devtools/qemu/centos/files/bios-256k.bin b/virt/qemu/centos/files/bios-256k.bin
similarity index 100%
rename from devtools/qemu/centos/files/bios-256k.bin
rename to virt/qemu/centos/files/bios-256k.bin
diff --git a/devtools/qemu/centos/files/bridge.conf b/virt/qemu/centos/files/bridge.conf
similarity index 100%
rename from devtools/qemu/centos/files/bridge.conf
rename to virt/qemu/centos/files/bridge.conf
diff --git a/devtools/qemu/centos/files/build_configure.sh b/virt/qemu/centos/files/build_configure.sh
similarity index 100%
rename from devtools/qemu/centos/files/build_configure.sh
rename to virt/qemu/centos/files/build_configure.sh
diff --git a/devtools/qemu/centos/files/ksm.service b/virt/qemu/centos/files/ksm.service
similarity index 100%
rename from devtools/qemu/centos/files/ksm.service
rename to virt/qemu/centos/files/ksm.service
diff --git a/devtools/qemu/centos/files/ksm.sysconfig b/virt/qemu/centos/files/ksm.sysconfig
similarity index 100%
rename from devtools/qemu/centos/files/ksm.sysconfig
rename to virt/qemu/centos/files/ksm.sysconfig
diff --git a/devtools/qemu/centos/files/ksmctl.c b/virt/qemu/centos/files/ksmctl.c
similarity index 100%
rename from devtools/qemu/centos/files/ksmctl.c
rename to virt/qemu/centos/files/ksmctl.c
diff --git a/devtools/qemu/centos/files/ksmtuned b/virt/qemu/centos/files/ksmtuned
similarity index 100%
rename from devtools/qemu/centos/files/ksmtuned
rename to virt/qemu/centos/files/ksmtuned
diff --git a/devtools/qemu/centos/files/ksmtuned.conf b/virt/qemu/centos/files/ksmtuned.conf
similarity index 100%
rename from devtools/qemu/centos/files/ksmtuned.conf
rename to virt/qemu/centos/files/ksmtuned.conf
diff --git a/devtools/qemu/centos/files/ksmtuned.service b/virt/qemu/centos/files/ksmtuned.service
similarity index 100%
rename from devtools/qemu/centos/files/ksmtuned.service
rename to virt/qemu/centos/files/ksmtuned.service
diff --git a/devtools/qemu/centos/files/kvm-setup b/virt/qemu/centos/files/kvm-setup
similarity index 100%
rename from devtools/qemu/centos/files/kvm-setup
rename to virt/qemu/centos/files/kvm-setup
diff --git a/devtools/qemu/centos/files/kvm-setup.service b/virt/qemu/centos/files/kvm-setup.service
similarity index 100%
rename from devtools/qemu/centos/files/kvm-setup.service
rename to virt/qemu/centos/files/kvm-setup.service
diff --git a/devtools/qemu/centos/files/kvm.conf b/virt/qemu/centos/files/kvm.conf
similarity index 100%
rename from devtools/qemu/centos/files/kvm.conf
rename to virt/qemu/centos/files/kvm.conf
diff --git a/devtools/qemu/centos/files/qemu-ga.sysconfig b/virt/qemu/centos/files/qemu-ga.sysconfig
similarity index 100%
rename from devtools/qemu/centos/files/qemu-ga.sysconfig
rename to virt/qemu/centos/files/qemu-ga.sysconfig
diff --git a/devtools/qemu/centos/files/qemu-guest-agent.service b/virt/qemu/centos/files/qemu-guest-agent.service
similarity index 100%
rename from devtools/qemu/centos/files/qemu-guest-agent.service
rename to virt/qemu/centos/files/qemu-guest-agent.service
diff --git a/devtools/qemu/centos/files/qemu.binfmt b/virt/qemu/centos/files/qemu.binfmt
similarity index 100%
rename from devtools/qemu/centos/files/qemu.binfmt
rename to virt/qemu/centos/files/qemu.binfmt
diff --git a/devtools/qemu/centos/files/rhel6-e1000.rom b/virt/qemu/centos/files/rhel6-e1000.rom
similarity index 100%
rename from devtools/qemu/centos/files/rhel6-e1000.rom
rename to virt/qemu/centos/files/rhel6-e1000.rom
diff --git a/devtools/qemu/centos/files/rhel6-ne2k_pci.rom b/virt/qemu/centos/files/rhel6-ne2k_pci.rom
similarity index 100%
rename from devtools/qemu/centos/files/rhel6-ne2k_pci.rom
rename to virt/qemu/centos/files/rhel6-ne2k_pci.rom
diff --git a/devtools/qemu/centos/files/rhel6-pcnet.rom b/virt/qemu/centos/files/rhel6-pcnet.rom
similarity index 100%
rename from devtools/qemu/centos/files/rhel6-pcnet.rom
rename to virt/qemu/centos/files/rhel6-pcnet.rom
diff --git a/devtools/qemu/centos/files/rhel6-rtl8139.rom b/virt/qemu/centos/files/rhel6-rtl8139.rom
similarity index 100%
rename from devtools/qemu/centos/files/rhel6-rtl8139.rom
rename to virt/qemu/centos/files/rhel6-rtl8139.rom
diff --git a/devtools/qemu/centos/files/rhel6-virtio.rom b/virt/qemu/centos/files/rhel6-virtio.rom
similarity index 100%
rename from devtools/qemu/centos/files/rhel6-virtio.rom
rename to virt/qemu/centos/files/rhel6-virtio.rom
diff --git a/devtools/qemu/centos/files/vhost.conf b/virt/qemu/centos/files/vhost.conf
similarity index 100%
rename from devtools/qemu/centos/files/vhost.conf
rename to virt/qemu/centos/files/vhost.conf
diff --git a/devtools/qemu/centos/qemu-kvm.spec b/virt/qemu/centos/qemu-kvm.spec
similarity index 100%
rename from devtools/qemu/centos/qemu-kvm.spec
rename to virt/qemu/centos/qemu-kvm.spec
diff --git a/devtools/qemu/qemu/qemu-system-x86.conf b/virt/qemu/qemu/qemu-system-x86.conf
similarity index 100%
rename from devtools/qemu/qemu/qemu-system-x86.conf
rename to virt/qemu/qemu/qemu-system-x86.conf
diff --git a/devtools/qemu/qemu/qemu_clean b/virt/qemu/qemu/qemu_clean
similarity index 100%
rename from devtools/qemu/qemu/qemu_clean
rename to virt/qemu/qemu/qemu_clean
diff --git a/devtools/qemu/qemu/qemu_clean.service b/virt/qemu/qemu/qemu_clean.service
similarity index 100%
rename from devtools/qemu/qemu/qemu_clean.service
rename to virt/qemu/qemu/qemu_clean.service
diff --git a/devtools/qemu/scripts/autopatch.sh b/virt/qemu/scripts/autopatch.sh
similarity index 100%
rename from devtools/qemu/scripts/autopatch.sh
rename to virt/qemu/scripts/autopatch.sh