diff --git a/recipes-stx/stx-ansible-playbooks/files/0001-stx.3.0-rebase-adjust-path.patch b/meta-stx-flock/stx-ansible-playbooks/files/0001-stx.3.0-rebase-adjust-path.patch
similarity index 100%
rename from recipes-stx/stx-ansible-playbooks/files/0001-stx.3.0-rebase-adjust-path.patch
rename to meta-stx-flock/stx-ansible-playbooks/files/0001-stx.3.0-rebase-adjust-path.patch
diff --git a/recipes-stx/stx-ansible-playbooks/files/0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch b/meta-stx-flock/stx-ansible-playbooks/files/0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch
similarity index 100%
rename from recipes-stx/stx-ansible-playbooks/files/0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch
rename to meta-stx-flock/stx-ansible-playbooks/files/0002-update_sysinv_database-do-not-fail-if-ceph-monitor-a.patch
diff --git a/recipes-stx/stx-ansible-playbooks/files/0003-update_sysinv_database-wait-after-provision.patch b/meta-stx-flock/stx-ansible-playbooks/files/0003-update_sysinv_database-wait-after-provision.patch
similarity index 100%
rename from recipes-stx/stx-ansible-playbooks/files/0003-update_sysinv_database-wait-after-provision.patch
rename to meta-stx-flock/stx-ansible-playbooks/files/0003-update_sysinv_database-wait-after-provision.patch
diff --git a/recipes-stx/stx-ansible-playbooks/files/0004-bringup_flock_services-use-systmd-for-fminit-and-add.patch b/meta-stx-flock/stx-ansible-playbooks/files/0004-bringup_flock_services-use-systmd-for-fminit-and-add.patch
similarity index 100%
rename from recipes-stx/stx-ansible-playbooks/files/0004-bringup_flock_services-use-systmd-for-fminit-and-add.patch
rename to meta-stx-flock/stx-ansible-playbooks/files/0004-bringup_flock_services-use-systmd-for-fminit-and-add.patch
diff --git a/recipes-stx/stx-ansible-playbooks/files/0005-persist-config-add-retry-for-etcd.patch b/meta-stx-flock/stx-ansible-playbooks/files/0005-persist-config-add-retry-for-etcd.patch
similarity index 100%
rename from recipes-stx/stx-ansible-playbooks/files/0005-persist-config-add-retry-for-etcd.patch
rename to meta-stx-flock/stx-ansible-playbooks/files/0005-persist-config-add-retry-for-etcd.patch
diff --git a/recipes-stx/stx-ansible-playbooks/playbookconfig.bb b/meta-stx-flock/stx-ansible-playbooks/playbookconfig.bb
similarity index 100%
rename from recipes-stx/stx-ansible-playbooks/playbookconfig.bb
rename to meta-stx-flock/stx-ansible-playbooks/playbookconfig.bb
diff --git a/recipes-stx/stx-config-files/config-files_1.0.0.bb b/meta-stx-flock/stx-config-files/config-files_1.0.0.bb
similarity index 100%
rename from recipes-stx/stx-config-files/config-files_1.0.0.bb
rename to meta-stx-flock/stx-config-files/config-files_1.0.0.bb
diff --git a/recipes-stx/stx-config-files/files/openssh-config-rm-hmac-ripemd160.patch b/meta-stx-flock/stx-config-files/files/openssh-config-rm-hmac-ripemd160.patch
similarity index 100%
rename from recipes-stx/stx-config-files/files/openssh-config-rm-hmac-ripemd160.patch
rename to meta-stx-flock/stx-config-files/files/openssh-config-rm-hmac-ripemd160.patch
diff --git a/recipes-stx/stx-config-files/files/syslog-ng-conf-fix-the-source.patch b/meta-stx-flock/stx-config-files/files/syslog-ng-conf-fix-the-source.patch
similarity index 100%
rename from recipes-stx/stx-config-files/files/syslog-ng-conf-fix-the-source.patch
rename to meta-stx-flock/stx-config-files/files/syslog-ng-conf-fix-the-source.patch
diff --git a/recipes-stx/stx-config-files/files/syslog-ng-conf-replace-match-with-message.patch b/meta-stx-flock/stx-config-files/files/syslog-ng-conf-replace-match-with-message.patch
similarity index 100%
rename from recipes-stx/stx-config-files/files/syslog-ng-conf-replace-match-with-message.patch
rename to meta-stx-flock/stx-config-files/files/syslog-ng-conf-replace-match-with-message.patch
diff --git a/recipes-stx/stx-config-files/files/syslog-ng-config-parse-err.patch b/meta-stx-flock/stx-config-files/files/syslog-ng-config-parse-err.patch
similarity index 100%
rename from recipes-stx/stx-config-files/files/syslog-ng-config-parse-err.patch
rename to meta-stx-flock/stx-config-files/files/syslog-ng-config-parse-err.patch
diff --git a/recipes-stx/stx-config-files/files/syslog-ng-config-systemd-service.patch b/meta-stx-flock/stx-config-files/files/syslog-ng-config-systemd-service.patch
similarity index 100%
rename from recipes-stx/stx-config-files/files/syslog-ng-config-systemd-service.patch
rename to meta-stx-flock/stx-config-files/files/syslog-ng-config-systemd-service.patch
diff --git a/recipes-stx/stx-config-files/files/util-linux-pam-postlogin.patch b/meta-stx-flock/stx-config-files/files/util-linux-pam-postlogin.patch
similarity index 100%
rename from recipes-stx/stx-config-files/files/util-linux-pam-postlogin.patch
rename to meta-stx-flock/stx-config-files/files/util-linux-pam-postlogin.patch
diff --git a/recipes-stx/stx-config/cgts-client.bb b/meta-stx-flock/stx-config/cgts-client.bb
similarity index 100%
rename from recipes-stx/stx-config/cgts-client.bb
rename to meta-stx-flock/stx-config/cgts-client.bb
diff --git a/recipes-stx/stx-config/config-common.inc b/meta-stx-flock/stx-config/config-common.inc
similarity index 100%
rename from recipes-stx/stx-config/config-common.inc
rename to meta-stx-flock/stx-config/config-common.inc
diff --git a/recipes-stx/stx-config/config-gate.bb b/meta-stx-flock/stx-config/config-gate.bb
similarity index 100%
rename from recipes-stx/stx-config/config-gate.bb
rename to meta-stx-flock/stx-config/config-gate.bb
diff --git a/recipes-stx/stx-config/controllerconfig.bb b/meta-stx-flock/stx-config/controllerconfig.bb
similarity index 100%
rename from recipes-stx/stx-config/controllerconfig.bb
rename to meta-stx-flock/stx-config/controllerconfig.bb
diff --git a/recipes-stx/stx-config/files/0001-stx-config-remove-argparse-requirement-from-sysinv.patch b/meta-stx-flock/stx-config/files/0001-stx-config-remove-argparse-requirement-from-sysinv.patch
similarity index 100%
rename from recipes-stx/stx-config/files/0001-stx-config-remove-argparse-requirement-from-sysinv.patch
rename to meta-stx-flock/stx-config/files/0001-stx-config-remove-argparse-requirement-from-sysinv.patch
diff --git a/recipes-stx/stx-config/storageconfig.bb b/meta-stx-flock/stx-config/storageconfig.bb
similarity index 100%
rename from recipes-stx/stx-config/storageconfig.bb
rename to meta-stx-flock/stx-config/storageconfig.bb
diff --git a/recipes-stx/stx-config/sysinv-agent.bb b/meta-stx-flock/stx-config/sysinv-agent.bb
similarity index 100%
rename from recipes-stx/stx-config/sysinv-agent.bb
rename to meta-stx-flock/stx-config/sysinv-agent.bb
diff --git a/recipes-stx/stx-config/sysinv.bb b/meta-stx-flock/stx-config/sysinv.bb
similarity index 100%
rename from recipes-stx/stx-config/sysinv.bb
rename to meta-stx-flock/stx-config/sysinv.bb
diff --git a/recipes-stx/stx-config/tsconfig.bb b/meta-stx-flock/stx-config/tsconfig.bb
similarity index 100%
rename from recipes-stx/stx-config/tsconfig.bb
rename to meta-stx-flock/stx-config/tsconfig.bb
diff --git a/recipes-stx/stx-config/workerconfig.bb b/meta-stx-flock/stx-config/workerconfig.bb
similarity index 100%
rename from recipes-stx/stx-config/workerconfig.bb
rename to meta-stx-flock/stx-config/workerconfig.bb
diff --git a/recipes-stx/distributedcloud/distributedcloud-client-dcmanager_git.bb b/meta-stx-flock/stx-distributedcloud/distributedcloud-client-dcmanager_git.bb
similarity index 100%
rename from recipes-stx/distributedcloud/distributedcloud-client-dcmanager_git.bb
rename to meta-stx-flock/stx-distributedcloud/distributedcloud-client-dcmanager_git.bb
diff --git a/recipes-stx/distributedcloud/distributedcloud_git.bb b/meta-stx-flock/stx-distributedcloud/distributedcloud_git.bb
similarity index 100%
rename from recipes-stx/distributedcloud/distributedcloud_git.bb
rename to meta-stx-flock/stx-distributedcloud/distributedcloud_git.bb
diff --git a/recipes-stx/stx-fault/fault-common.inc b/meta-stx-flock/stx-fault/fault-common.inc
similarity index 100%
rename from recipes-stx/stx-fault/fault-common.inc
rename to meta-stx-flock/stx-fault/fault-common.inc
diff --git a/recipes-stx/stx-fault/files/0001-fm-common-add-LDFLAGS.patch b/meta-stx-flock/stx-fault/files/0001-fm-common-add-LDFLAGS.patch
similarity index 100%
rename from recipes-stx/stx-fault/files/0001-fm-common-add-LDFLAGS.patch
rename to meta-stx-flock/stx-fault/files/0001-fm-common-add-LDFLAGS.patch
diff --git a/recipes-stx/stx-fault/files/0001-fm-mgr-Fix-install-target.patch b/meta-stx-flock/stx-fault/files/0001-fm-mgr-Fix-install-target.patch
similarity index 100%
rename from recipes-stx/stx-fault/files/0001-fm-mgr-Fix-install-target.patch
rename to meta-stx-flock/stx-fault/files/0001-fm-mgr-Fix-install-target.patch
diff --git a/recipes-stx/stx-fault/files/0001-snmp-audittrail-add-LDFLAGS.patch b/meta-stx-flock/stx-fault/files/0001-snmp-audittrail-add-LDFLAGS.patch
similarity index 100%
rename from recipes-stx/stx-fault/files/0001-snmp-audittrail-add-LDFLAGS.patch
rename to meta-stx-flock/stx-fault/files/0001-snmp-audittrail-add-LDFLAGS.patch
diff --git a/recipes-stx/stx-fault/files/0001-snmp-ext-add-LDFLAGS.patch b/meta-stx-flock/stx-fault/files/0001-snmp-ext-add-LDFLAGS.patch
similarity index 100%
rename from recipes-stx/stx-fault/files/0001-snmp-ext-add-LDFLAGS.patch
rename to meta-stx-flock/stx-fault/files/0001-snmp-ext-add-LDFLAGS.patch
diff --git a/recipes-stx/stx-fault/fm-api.bb b/meta-stx-flock/stx-fault/fm-api.bb
similarity index 100%
rename from recipes-stx/stx-fault/fm-api.bb
rename to meta-stx-flock/stx-fault/fm-api.bb
diff --git a/recipes-stx/stx-fault/fm-common.bb b/meta-stx-flock/stx-fault/fm-common.bb
similarity index 100%
rename from recipes-stx/stx-fault/fm-common.bb
rename to meta-stx-flock/stx-fault/fm-common.bb
diff --git a/recipes-stx/stx-fault/fm-doc.bb b/meta-stx-flock/stx-fault/fm-doc.bb
similarity index 100%
rename from recipes-stx/stx-fault/fm-doc.bb
rename to meta-stx-flock/stx-fault/fm-doc.bb
diff --git a/recipes-stx/stx-fault/fm-mgr.bb b/meta-stx-flock/stx-fault/fm-mgr.bb
similarity index 100%
rename from recipes-stx/stx-fault/fm-mgr.bb
rename to meta-stx-flock/stx-fault/fm-mgr.bb
diff --git a/recipes-stx/stx-fault/fm-rest-api.bb b/meta-stx-flock/stx-fault/fm-rest-api.bb
similarity index 100%
rename from recipes-stx/stx-fault/fm-rest-api.bb
rename to meta-stx-flock/stx-fault/fm-rest-api.bb
diff --git a/recipes-stx/stx-fault/python-fmclient.bb b/meta-stx-flock/stx-fault/python-fmclient.bb
similarity index 100%
rename from recipes-stx/stx-fault/python-fmclient.bb
rename to meta-stx-flock/stx-fault/python-fmclient.bb
diff --git a/recipes-stx/stx-fault/snmp-audittrail.bb b/meta-stx-flock/stx-fault/snmp-audittrail.bb
similarity index 100%
rename from recipes-stx/stx-fault/snmp-audittrail.bb
rename to meta-stx-flock/stx-fault/snmp-audittrail.bb
diff --git a/recipes-stx/stx-fault/snmp-ext.bb b/meta-stx-flock/stx-fault/snmp-ext.bb
similarity index 100%
rename from recipes-stx/stx-fault/snmp-ext.bb
rename to meta-stx-flock/stx-fault/snmp-ext.bb
diff --git a/recipes-stx/stx-gui/stx-gui.bb b/meta-stx-flock/stx-gui/stx-gui.bb
similarity index 100%
rename from recipes-stx/stx-gui/stx-gui.bb
rename to meta-stx-flock/stx-gui/stx-gui.bb
diff --git a/recipes-stx/stx-ha/files/0001-sm-db-Fix-dest-libdir.patch b/meta-stx-flock/stx-ha/files/0001-sm-db-Fix-dest-libdir.patch
similarity index 100%
rename from recipes-stx/stx-ha/files/0001-sm-db-Fix-dest-libdir.patch
rename to meta-stx-flock/stx-ha/files/0001-sm-db-Fix-dest-libdir.patch
diff --git a/recipes-stx/stx-ha/ha-common.inc b/meta-stx-flock/stx-ha/ha-common.inc
similarity index 100%
rename from recipes-stx/stx-ha/ha-common.inc
rename to meta-stx-flock/stx-ha/ha-common.inc
diff --git a/recipes-stx/stx-ha/libsm-common.bb b/meta-stx-flock/stx-ha/libsm-common.bb
similarity index 100%
rename from recipes-stx/stx-ha/libsm-common.bb
rename to meta-stx-flock/stx-ha/libsm-common.bb
diff --git a/recipes-stx/stx-ha/sm-api.bb b/meta-stx-flock/stx-ha/sm-api.bb
similarity index 100%
rename from recipes-stx/stx-ha/sm-api.bb
rename to meta-stx-flock/stx-ha/sm-api.bb
diff --git a/recipes-stx/stx-ha/sm-client.bb b/meta-stx-flock/stx-ha/sm-client.bb
similarity index 100%
rename from recipes-stx/stx-ha/sm-client.bb
rename to meta-stx-flock/stx-ha/sm-client.bb
diff --git a/recipes-stx/stx-ha/sm-db.bb b/meta-stx-flock/stx-ha/sm-db.bb
similarity index 100%
rename from recipes-stx/stx-ha/sm-db.bb
rename to meta-stx-flock/stx-ha/sm-db.bb
diff --git a/recipes-stx/stx-ha/sm-tools.bb b/meta-stx-flock/stx-ha/sm-tools.bb
similarity index 100%
rename from recipes-stx/stx-ha/sm-tools.bb
rename to meta-stx-flock/stx-ha/sm-tools.bb
diff --git a/recipes-stx/stx-ha/sm.bb b/meta-stx-flock/stx-ha/sm.bb
similarity index 100%
rename from recipes-stx/stx-ha/sm.bb
rename to meta-stx-flock/stx-ha/sm.bb
diff --git a/recipes-stx/stx-ha/stx-ocf-scripts.bb b/meta-stx-flock/stx-ha/stx-ocf-scripts.bb
similarity index 100%
rename from recipes-stx/stx-ha/stx-ocf-scripts.bb
rename to meta-stx-flock/stx-ha/stx-ocf-scripts.bb
diff --git a/recipes-stx/stx-integ-kubernetes/cloud-provider-openstack.bb b/meta-stx-flock/stx-integ-kubernetes/cloud-provider-openstack.bb
similarity index 100%
rename from recipes-stx/stx-integ-kubernetes/cloud-provider-openstack.bb
rename to meta-stx-flock/stx-integ-kubernetes/cloud-provider-openstack.bb
diff --git a/recipes-stx/stx-integ/files/ibsh/LICENSE b/meta-stx-flock/stx-integ/files/ibsh/LICENSE
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/LICENSE
rename to meta-stx-flock/stx-integ/files/ibsh/LICENSE
diff --git a/recipes-stx/stx-integ/files/ibsh/admin.cmds b/meta-stx-flock/stx-integ/files/ibsh/admin.cmds
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/admin.cmds
rename to meta-stx-flock/stx-integ/files/ibsh/admin.cmds
diff --git a/recipes-stx/stx-integ/files/ibsh/admin.xtns b/meta-stx-flock/stx-integ/files/ibsh/admin.xtns
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/admin.xtns
rename to meta-stx-flock/stx-integ/files/ibsh/admin.xtns
diff --git a/recipes-stx/stx-integ/files/ibsh/ibsh-0.3e-cgcs-copyright.patch b/meta-stx-flock/stx-integ/files/ibsh/ibsh-0.3e-cgcs-copyright.patch
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/ibsh-0.3e-cgcs-copyright.patch
rename to meta-stx-flock/stx-integ/files/ibsh/ibsh-0.3e-cgcs-copyright.patch
diff --git a/recipes-stx/stx-integ/files/ibsh/ibsh-0.3e-cgcs.patch b/meta-stx-flock/stx-integ/files/ibsh/ibsh-0.3e-cgcs.patch
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/ibsh-0.3e-cgcs.patch
rename to meta-stx-flock/stx-integ/files/ibsh/ibsh-0.3e-cgcs.patch
diff --git a/recipes-stx/stx-integ/files/ibsh/ibsh-0.3e.patch b/meta-stx-flock/stx-integ/files/ibsh/ibsh-0.3e.patch
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/ibsh-0.3e.patch
rename to meta-stx-flock/stx-integ/files/ibsh/ibsh-0.3e.patch
diff --git a/recipes-stx/stx-integ/files/ibsh/operator.cmds b/meta-stx-flock/stx-integ/files/ibsh/operator.cmds
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/operator.cmds
rename to meta-stx-flock/stx-integ/files/ibsh/operator.cmds
diff --git a/recipes-stx/stx-integ/files/ibsh/operator.xtns b/meta-stx-flock/stx-integ/files/ibsh/operator.xtns
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/operator.xtns
rename to meta-stx-flock/stx-integ/files/ibsh/operator.xtns
diff --git a/recipes-stx/stx-integ/files/ibsh/secadmin.cmds b/meta-stx-flock/stx-integ/files/ibsh/secadmin.cmds
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/secadmin.cmds
rename to meta-stx-flock/stx-integ/files/ibsh/secadmin.cmds
diff --git a/recipes-stx/stx-integ/files/ibsh/secadmin.xtns b/meta-stx-flock/stx-integ/files/ibsh/secadmin.xtns
similarity index 100%
rename from recipes-stx/stx-integ/files/ibsh/secadmin.xtns
rename to meta-stx-flock/stx-integ/files/ibsh/secadmin.xtns
diff --git a/recipes-stx/stx-integ/ibsh_0.3e.bbappend b/meta-stx-flock/stx-integ/ibsh_0.3e.bbappend
similarity index 100%
rename from recipes-stx/stx-integ/ibsh_0.3e.bbappend
rename to meta-stx-flock/stx-integ/ibsh_0.3e.bbappend
diff --git a/recipes-stx/stx-integ/kvm-timer-advance-setup.bb b/meta-stx-flock/stx-integ/kvm-timer-advance-setup.bb
similarity index 100%
rename from recipes-stx/stx-integ/kvm-timer-advance-setup.bb
rename to meta-stx-flock/stx-integ/kvm-timer-advance-setup.bb
diff --git a/recipes-stx/stx-integ/spectre-meltdown-checker_git.bb b/meta-stx-flock/stx-integ/spectre-meltdown-checker_git.bb
similarity index 100%
rename from recipes-stx/stx-integ/spectre-meltdown-checker_git.bb
rename to meta-stx-flock/stx-integ/spectre-meltdown-checker_git.bb
diff --git a/recipes-stx/stx-metal/files/0001-inventory-Remove-argparse-requirement.patch b/meta-stx-flock/stx-metal/files/0001-inventory-Remove-argparse-requirement.patch
similarity index 100%
rename from recipes-stx/stx-metal/files/0001-inventory-Remove-argparse-requirement.patch
rename to meta-stx-flock/stx-metal/files/0001-inventory-Remove-argparse-requirement.patch
diff --git a/recipes-stx/stx-metal/files/0001-mtce-Use-LDFLAGS-when-linking.patch b/meta-stx-flock/stx-metal/files/0001-mtce-Use-LDFLAGS-when-linking.patch
similarity index 100%
rename from recipes-stx/stx-metal/files/0001-mtce-Use-LDFLAGS-when-linking.patch
rename to meta-stx-flock/stx-metal/files/0001-mtce-Use-LDFLAGS-when-linking.patch
diff --git a/recipes-stx/stx-metal/files/0001-mtce-avoid-overflowing-amon.tx_buf.patch b/meta-stx-flock/stx-metal/files/0001-mtce-avoid-overflowing-amon.tx_buf.patch
similarity index 100%
rename from recipes-stx/stx-metal/files/0001-mtce-avoid-overflowing-amon.tx_buf.patch
rename to meta-stx-flock/stx-metal/files/0001-mtce-avoid-overflowing-amon.tx_buf.patch
diff --git a/recipes-stx/stx-metal/files/0001-mtce-compute-dont-install-empty-directory-unless-nee.patch b/meta-stx-flock/stx-metal/files/0001-mtce-compute-dont-install-empty-directory-unless-nee.patch
similarity index 100%
rename from recipes-stx/stx-metal/files/0001-mtce-compute-dont-install-empty-directory-unless-nee.patch
rename to meta-stx-flock/stx-metal/files/0001-mtce-compute-dont-install-empty-directory-unless-nee.patch
diff --git a/recipes-stx/stx-metal/files/0001-mtce-control-dont-install-empty-directory-unless-nee.patch b/meta-stx-flock/stx-metal/files/0001-mtce-control-dont-install-empty-directory-unless-nee.patch
similarity index 100%
rename from recipes-stx/stx-metal/files/0001-mtce-control-dont-install-empty-directory-unless-nee.patch
rename to meta-stx-flock/stx-metal/files/0001-mtce-control-dont-install-empty-directory-unless-nee.patch
diff --git a/recipes-stx/stx-metal/files/0001-mtce-storage-dont-install-empty-directory-unless-nee.patch b/meta-stx-flock/stx-metal/files/0001-mtce-storage-dont-install-empty-directory-unless-nee.patch
similarity index 100%
rename from recipes-stx/stx-metal/files/0001-mtce-storage-dont-install-empty-directory-unless-nee.patch
rename to meta-stx-flock/stx-metal/files/0001-mtce-storage-dont-install-empty-directory-unless-nee.patch
diff --git a/recipes-stx/stx-metal/files/0002-mtce-Adjust-paths.patch b/meta-stx-flock/stx-metal/files/0002-mtce-Adjust-paths.patch
similarity index 100%
rename from recipes-stx/stx-metal/files/0002-mtce-Adjust-paths.patch
rename to meta-stx-flock/stx-metal/files/0002-mtce-Adjust-paths.patch
diff --git a/recipes-stx/stx-metal/inventory.bb b/meta-stx-flock/stx-metal/inventory.bb
similarity index 100%
rename from recipes-stx/stx-metal/inventory.bb
rename to meta-stx-flock/stx-metal/inventory.bb
diff --git a/recipes-stx/stx-metal/metal-common.inc b/meta-stx-flock/stx-metal/metal-common.inc
similarity index 100%
rename from recipes-stx/stx-metal/metal-common.inc
rename to meta-stx-flock/stx-metal/metal-common.inc
diff --git a/recipes-stx/stx-metal/mtce-common.bb b/meta-stx-flock/stx-metal/mtce-common.bb
similarity index 100%
rename from recipes-stx/stx-metal/mtce-common.bb
rename to meta-stx-flock/stx-metal/mtce-common.bb
diff --git a/recipes-stx/stx-metal/mtce-compute.bb b/meta-stx-flock/stx-metal/mtce-compute.bb
similarity index 100%
rename from recipes-stx/stx-metal/mtce-compute.bb
rename to meta-stx-flock/stx-metal/mtce-compute.bb
diff --git a/recipes-stx/stx-metal/mtce-control.bb b/meta-stx-flock/stx-metal/mtce-control.bb
similarity index 100%
rename from recipes-stx/stx-metal/mtce-control.bb
rename to meta-stx-flock/stx-metal/mtce-control.bb
diff --git a/recipes-stx/stx-metal/mtce-storage.bb b/meta-stx-flock/stx-metal/mtce-storage.bb
similarity index 100%
rename from recipes-stx/stx-metal/mtce-storage.bb
rename to meta-stx-flock/stx-metal/mtce-storage.bb
diff --git a/recipes-stx/stx-metal/mtce.bb b/meta-stx-flock/stx-metal/mtce.bb
similarity index 100%
rename from recipes-stx/stx-metal/mtce.bb
rename to meta-stx-flock/stx-metal/mtce.bb
diff --git a/recipes-stx/stx-metal/pxe-network-installer.bb b/meta-stx-flock/stx-metal/pxe-network-installer.bb
similarity index 100%
rename from recipes-stx/stx-metal/pxe-network-installer.bb
rename to meta-stx-flock/stx-metal/pxe-network-installer.bb
diff --git a/recipes-stx/stx-metal/python-inventoryclient.bb b/meta-stx-flock/stx-metal/python-inventoryclient.bb
similarity index 100%
rename from recipes-stx/stx-metal/python-inventoryclient.bb
rename to meta-stx-flock/stx-metal/python-inventoryclient.bb
diff --git a/recipes-stx/stx-monitor-armada-app/monitor-helm-elastic_1.0.bb b/meta-stx-flock/stx-monitor-armada-app/monitor-helm-elastic_1.0.bb
similarity index 100%
rename from recipes-stx/stx-monitor-armada-app/monitor-helm-elastic_1.0.bb
rename to meta-stx-flock/stx-monitor-armada-app/monitor-helm-elastic_1.0.bb
diff --git a/recipes-stx/stx-monitor-armada-app/monitor-helm_1.0.bb b/meta-stx-flock/stx-monitor-armada-app/monitor-helm_1.0.bb
similarity index 100%
rename from recipes-stx/stx-monitor-armada-app/monitor-helm_1.0.bb
rename to meta-stx-flock/stx-monitor-armada-app/monitor-helm_1.0.bb
diff --git a/recipes-stx/stx-monitor-armada-app/stx-monitor-helm_1.0.bb b/meta-stx-flock/stx-monitor-armada-app/stx-monitor-helm_1.0.bb
similarity index 100%
rename from recipes-stx/stx-monitor-armada-app/stx-monitor-helm_1.0.bb
rename to meta-stx-flock/stx-monitor-armada-app/stx-monitor-helm_1.0.bb
diff --git a/recipes-stx/stx-monitoring/collectd-extensions.bb b/meta-stx-flock/stx-monitoring/collectd-extensions.bb
similarity index 100%
rename from recipes-stx/stx-monitoring/collectd-extensions.bb
rename to meta-stx-flock/stx-monitoring/collectd-extensions.bb
diff --git a/recipes-stx/stx-monitoring/influxdb-extensions.bb b/meta-stx-flock/stx-monitoring/influxdb-extensions.bb
similarity index 100%
rename from recipes-stx/stx-monitoring/influxdb-extensions.bb
rename to meta-stx-flock/stx-monitoring/influxdb-extensions.bb
diff --git a/recipes-stx/stx-monitoring/monitor-tools.bb b/meta-stx-flock/stx-monitoring/monitor-tools.bb
similarity index 100%
rename from recipes-stx/stx-monitoring/monitor-tools.bb
rename to meta-stx-flock/stx-monitoring/monitor-tools.bb
diff --git a/recipes-stx/stx-monitoring/monitoring-common.inc b/meta-stx-flock/stx-monitoring/monitoring-common.inc
similarity index 100%
rename from recipes-stx/stx-monitoring/monitoring-common.inc
rename to meta-stx-flock/stx-monitoring/monitoring-common.inc
diff --git a/recipes-stx/stx-monitoring/vm-topology.bb b/meta-stx-flock/stx-monitoring/vm-topology.bb
similarity index 100%
rename from recipes-stx/stx-monitoring/vm-topology.bb
rename to meta-stx-flock/stx-monitoring/vm-topology.bb
diff --git a/recipes-stx/stx-nfv/files/0001-mtce-guest-Fix-ldflags-usage.patch b/meta-stx-flock/stx-nfv/files/0001-mtce-guest-Fix-ldflags-usage.patch
similarity index 100%
rename from recipes-stx/stx-nfv/files/0001-mtce-guest-Fix-ldflags-usage.patch
rename to meta-stx-flock/stx-nfv/files/0001-mtce-guest-Fix-ldflags-usage.patch
diff --git a/recipes-stx/stx-nfv/mtce-guest.bb b/meta-stx-flock/stx-nfv/mtce-guest.bb
similarity index 100%
rename from recipes-stx/stx-nfv/mtce-guest.bb
rename to meta-stx-flock/stx-nfv/mtce-guest.bb
diff --git a/recipes-stx/stx-nfv/nfv-client.bb b/meta-stx-flock/stx-nfv/nfv-client.bb
similarity index 100%
rename from recipes-stx/stx-nfv/nfv-client.bb
rename to meta-stx-flock/stx-nfv/nfv-client.bb
diff --git a/recipes-stx/stx-nfv/nfv-common.bb b/meta-stx-flock/stx-nfv/nfv-common.bb
similarity index 100%
rename from recipes-stx/stx-nfv/nfv-common.bb
rename to meta-stx-flock/stx-nfv/nfv-common.bb
diff --git a/recipes-stx/stx-nfv/nfv-common.inc b/meta-stx-flock/stx-nfv/nfv-common.inc
similarity index 100%
rename from recipes-stx/stx-nfv/nfv-common.inc
rename to meta-stx-flock/stx-nfv/nfv-common.inc
diff --git a/recipes-stx/stx-nfv/nfv-plugins.bb b/meta-stx-flock/stx-nfv/nfv-plugins.bb
similarity index 100%
rename from recipes-stx/stx-nfv/nfv-plugins.bb
rename to meta-stx-flock/stx-nfv/nfv-plugins.bb
diff --git a/recipes-stx/stx-nfv/nfv-tools.bb b/meta-stx-flock/stx-nfv/nfv-tools.bb
similarity index 100%
rename from recipes-stx/stx-nfv/nfv-tools.bb
rename to meta-stx-flock/stx-nfv/nfv-tools.bb
diff --git a/recipes-stx/stx-nfv/nfv-vim.bb b/meta-stx-flock/stx-nfv/nfv-vim.bb
similarity index 100%
rename from recipes-stx/stx-nfv/nfv-vim.bb
rename to meta-stx-flock/stx-nfv/nfv-vim.bb
diff --git a/recipes-stx/stx-nfv/nova-api-proxy.bb b/meta-stx-flock/stx-nfv/nova-api-proxy.bb
similarity index 100%
rename from recipes-stx/stx-nfv/nova-api-proxy.bb
rename to meta-stx-flock/stx-nfv/nova-api-proxy.bb
diff --git a/recipes-stx/stx-openstack-armada-app/openstack-helm-infra_1.0.bb b/meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra_1.0.bb
similarity index 100%
rename from recipes-stx/stx-openstack-armada-app/openstack-helm-infra_1.0.bb
rename to meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra_1.0.bb
diff --git a/recipes-stx/stx-openstack-armada-app/openstack-helm_1.0.bb b/meta-stx-flock/stx-openstack-armada-app/openstack-helm_1.0.bb
similarity index 100%
rename from recipes-stx/stx-openstack-armada-app/openstack-helm_1.0.bb
rename to meta-stx-flock/stx-openstack-armada-app/openstack-helm_1.0.bb
diff --git a/recipes-stx/stx-openstack-armada-app/stx-openstack-helm_1.0.bb b/meta-stx-flock/stx-openstack-armada-app/stx-openstack-helm_1.0.bb
similarity index 100%
rename from recipes-stx/stx-openstack-armada-app/stx-openstack-helm_1.0.bb
rename to meta-stx-flock/stx-openstack-armada-app/stx-openstack-helm_1.0.bb
diff --git a/recipes-stx/stx-platform-armada-app/stx-platform-helm_1.0.bb b/meta-stx-flock/stx-platform-armada-app/stx-platform-helm_1.0.bb
similarity index 100%
rename from recipes-stx/stx-platform-armada-app/stx-platform-helm_1.0.bb
rename to meta-stx-flock/stx-platform-armada-app/stx-platform-helm_1.0.bb
diff --git a/recipes-stx/stx-update/cgcs-patch.bb b/meta-stx-flock/stx-update/cgcs-patch.bb
similarity index 100%
rename from recipes-stx/stx-update/cgcs-patch.bb
rename to meta-stx-flock/stx-update/cgcs-patch.bb
diff --git a/recipes-stx/stx-update/enable-dev-patch.bb b/meta-stx-flock/stx-update/enable-dev-patch.bb
similarity index 100%
rename from recipes-stx/stx-update/enable-dev-patch.bb
rename to meta-stx-flock/stx-update/enable-dev-patch.bb
diff --git a/recipes-stx/stx-update/patch-alarm.bb b/meta-stx-flock/stx-update/patch-alarm.bb
similarity index 100%
rename from recipes-stx/stx-update/patch-alarm.bb
rename to meta-stx-flock/stx-update/patch-alarm.bb
diff --git a/recipes-stx/stx-update/tsconfig.bb b/meta-stx-flock/stx-update/tsconfig.bb
similarity index 100%
rename from recipes-stx/stx-update/tsconfig.bb
rename to meta-stx-flock/stx-update/tsconfig.bb
diff --git a/recipes-stx/stx-update/update-common.inc b/meta-stx-flock/stx-update/update-common.inc
similarity index 100%
rename from recipes-stx/stx-update/update-common.inc
rename to meta-stx-flock/stx-update/update-common.inc
diff --git a/recipes-stx/stx-upstream/openstack-ras_git.bb b/meta-stx-flock/stx-upstream/openstack-ras_git.bb
similarity index 100%
rename from recipes-stx/stx-upstream/openstack-ras_git.bb
rename to meta-stx-flock/stx-upstream/openstack-ras_git.bb
diff --git a/recipes-stx/stx-utilities/build-info.bb b/meta-stx-flock/stx-utilities/build-info.bb
similarity index 100%
rename from recipes-stx/stx-utilities/build-info.bb
rename to meta-stx-flock/stx-utilities/build-info.bb
diff --git a/recipes-stx/stx-utilities/ceph-manager.bb b/meta-stx-flock/stx-utilities/ceph-manager.bb
similarity index 100%
rename from recipes-stx/stx-utilities/ceph-manager.bb
rename to meta-stx-flock/stx-utilities/ceph-manager.bb
diff --git a/recipes-stx/stx-utilities/collect-engtools.bb b/meta-stx-flock/stx-utilities/collect-engtools.bb
similarity index 100%
rename from recipes-stx/stx-utilities/collect-engtools.bb
rename to meta-stx-flock/stx-utilities/collect-engtools.bb
diff --git a/recipes-stx/stx-utilities/collector.bb b/meta-stx-flock/stx-utilities/collector.bb
similarity index 100%
rename from recipes-stx/stx-utilities/collector.bb
rename to meta-stx-flock/stx-utilities/collector.bb
diff --git a/recipes-stx/stx-utilities/files/0001-build_info_license.patch b/meta-stx-flock/stx-utilities/files/0001-build_info_license.patch
similarity index 100%
rename from recipes-stx/stx-utilities/files/0001-build_info_license.patch
rename to meta-stx-flock/stx-utilities/files/0001-build_info_license.patch
diff --git a/recipes-stx/stx-utilities/files/build.info b/meta-stx-flock/stx-utilities/files/build.info
similarity index 100%
rename from recipes-stx/stx-utilities/files/build.info
rename to meta-stx-flock/stx-utilities/files/build.info
diff --git a/recipes-stx/stx-utilities/logmgmt.bb b/meta-stx-flock/stx-utilities/logmgmt.bb
similarity index 100%
rename from recipes-stx/stx-utilities/logmgmt.bb
rename to meta-stx-flock/stx-utilities/logmgmt.bb
diff --git a/recipes-stx/stx-utilities/namespace-utils.bb b/meta-stx-flock/stx-utilities/namespace-utils.bb
similarity index 100%
rename from recipes-stx/stx-utilities/namespace-utils.bb
rename to meta-stx-flock/stx-utilities/namespace-utils.bb
diff --git a/recipes-stx/stx-utilities/nfscheck.bb b/meta-stx-flock/stx-utilities/nfscheck.bb
similarity index 100%
rename from recipes-stx/stx-utilities/nfscheck.bb
rename to meta-stx-flock/stx-utilities/nfscheck.bb
diff --git a/recipes-stx/stx-utilities/pci-irq-affinity.bb b/meta-stx-flock/stx-utilities/pci-irq-affinity.bb
similarity index 100%
rename from recipes-stx/stx-utilities/pci-irq-affinity.bb
rename to meta-stx-flock/stx-utilities/pci-irq-affinity.bb
diff --git a/recipes-stx/stx-utilities/platform-util.bb b/meta-stx-flock/stx-utilities/platform-util.bb
similarity index 100%
rename from recipes-stx/stx-utilities/platform-util.bb
rename to meta-stx-flock/stx-utilities/platform-util.bb
diff --git a/recipes-stx/stx-utilities/python-cephclient.bb b/meta-stx-flock/stx-utilities/python-cephclient.bb
similarity index 100%
rename from recipes-stx/stx-utilities/python-cephclient.bb
rename to meta-stx-flock/stx-utilities/python-cephclient.bb
diff --git a/recipes-stx/stx-utilities/stx-extensions.bb b/meta-stx-flock/stx-utilities/stx-extensions.bb
similarity index 100%
rename from recipes-stx/stx-utilities/stx-extensions.bb
rename to meta-stx-flock/stx-utilities/stx-extensions.bb
diff --git a/recipes-stx/stx-utilities/stx-ssl.bb b/meta-stx-flock/stx-utilities/stx-ssl.bb
similarity index 100%
rename from recipes-stx/stx-utilities/stx-ssl.bb
rename to meta-stx-flock/stx-utilities/stx-ssl.bb
diff --git a/recipes-stx/stx-utilities/update-motd.bb b/meta-stx-flock/stx-utilities/update-motd.bb
similarity index 100%
rename from recipes-stx/stx-utilities/update-motd.bb
rename to meta-stx-flock/stx-utilities/update-motd.bb
diff --git a/recipes-stx/stx-utilities/utilities-common.inc b/meta-stx-flock/stx-utilities/utilities-common.inc
similarity index 100%
rename from recipes-stx/stx-utilities/utilities-common.inc
rename to meta-stx-flock/stx-utilities/utilities-common.inc
diff --git a/recipes-stx/stx-utilities/worker-utils.bb b/meta-stx-flock/stx-utilities/worker-utils.bb
similarity index 100%
rename from recipes-stx/stx-utilities/worker-utils.bb
rename to meta-stx-flock/stx-utilities/worker-utils.bb