diff --git a/.gitignore b/.gitignore
index d897903..67a6e43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,15 @@
 *~
 /downloads
 installer-prebuilt
+/mwa-beas
+/mwa-chilon
+/mwa-cleo
+/mwa-delphi
+/mwa-gplv2
+/mwa-gplv3
+/mwa-perian
+/mwa-pitta
+/mwa-solon
+/mwa-sparta
+/mwa-thales
+/stx-gui
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index e6ac3fa..3276335 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,250 +1,12 @@
-mwa-thales/nova-api-proxy
-mwa-perian/ceph
-mwa-perian/ceph-manager
-mwa-chilon/tsconfig
-mwa-pitta/compute-huge
-mwa-pitta/computeconfig
-mwa-pitta/configutilities
-mwa-pitta/controllerconfig
-mwa-pitta/storageconfig
-mwa-cleo/fm-api
-mwa-cleo/fm-common
-mwa-cleo/fm-mgr
-mwa-cleo/fm-doc
 middleware/filesystem/recipes-common/logmgmt
 middleware/filesystem/recipes-control/filesystem-scripts
 middleware/io-monitor/recipes-common/io-monitor
-mwa-beas/mtce-common
-mwa-beas/mtce-compute
-mwa-beas/mtce-control
-mwa-beas/mtce-storage
 middleware/recipes-common/build-info
-mwa-gplv2/dpkg
-mwa-pitta/sysinv/cgts-client
-mwa-pitta/sysinv/sysinv-agent
-mwa-pitta/sysinv/sysinv
-mwa-thales/guest-client
-mwa-thales/guest-agent
-mwa-thales/guest-comm
 middleware/branding/recipes-control/wrs-branding
 middleware/perf/recipes-common/io-scheduler
 middleware/util/recipes-common/collector
-mwa-perian/openstack/openstack-aodh
-mwa-perian/openstack/openstack-murano
-mwa-perian/openstack/python-muranoclient
-mwa-perian/openstack/openstack-murano-ui
-mwa-perian/openstack/openstack-ironic
-mwa-perian/openstack/python-ironicclient
-mwa-perian/openstack/python-magnumclient
-mwa-perian/openstack/openstack-magnum
-mwa-perian/openstack/openstack-magnum-ui
-mwa-perian/openstack/openstack-ras
-mwa-perian/openstack/openstack-panko
-mwa-perian/openstack/openstack-os-vif
-mwa-perian/openstack/python-ceilometer
-mwa-perian/openstack/python-ceilometerclient
-mwa-perian/openstack/python-cinder
-mwa-perian/openstack/python-cinderclient
-mwa-perian/openstack/python-glance
-mwa-perian/openstack/python-glance-store
-mwa-perian/openstack/python-glanceclient
-mwa-perian/openstack/python-heat/openstack-heat
-mwa-perian/openstack/python-heat/wrs-heat-template
-mwa-perian/openstack/python-heatclient
-mwa-perian/openstack/python-horizon
-mwa-perian/openstack/python-keystone
-mwa-perian/openstack/python-keystoneclient
-mwa-perian/openstack/python-keystonemiddleware
-mwa-perian/openstack/python-networking-bgpvpn
-mwa-perian/openstack/python-networking-sfc
-mwa-perian/openstack/python-networking-odl
-mwa-perian/openstack/python-neutron
-mwa-perian/openstack/python-neutron-dynamic-routing
-mwa-perian/openstack/python-neutron-lib
-mwa-perian/openstack/python-neutronclient
-mwa-perian/openstack/python-nova
-mwa-perian/openstack/python-novaclient
-mwa-perian/openstack/python-openstackdocstheme
-mwa-perian/openstack/python-oslo-concurrency
-mwa-perian/openstack/python-oslo-service
-mwa-perian/openstack/python-oslo-messaging
-mwa-perian/openstack/rabbitmq-server
-mwa-sparta/vm-topology
-mwa-perian/openstack/python-keystoneauth1
-mwa-perian/openstack/python-openstackclient
-mwa-perian/openstack/python-osc-lib
-mwa-perian/openstack/python-openstacksdk
-mwa-perian/openstack/python-django-openstack-auth
-mwa-delphi/remote-clients
-mwa-delphi/install-log-server
-mwa-sparta/core/initscripts
-mwa-sparta/core/util-linux
-mwa-sparta/base/setup
-mwa-sparta/base/lshell
-mwa-gplv2/cgcs-users
-mwa-sparta/base/namespace-utils
-mwa-sparta/base/nss-pam-ldapd
-mwa-sparta/base/centos-release
-mwa-sparta/base/expect-lite
-mwa-gplv2/cluster-resource-agents
-mwa-sparta/connectivity/nfs-utils
-mwa-sparta/connectivity/dhcp
-mwa-sparta/connectivity/openssh
-mwa-sparta/devtools/facter
-mwa-sparta/devtools/qemu
-mwa-gplv2/rpm
-mwa-gplv2/libfdt
-mwa-sparta/devtools/nfscheck/recipes-common/nfscheck
-mwa-sparta/devtools/update-motd
-mwa-sparta/devtools/vim
-mwa-sparta/devtools/python/python-django
-mwa-gplv3/python-psycopg2
-mwa-sparta/devtools/python-setuptools
-mwa-gplv2/bash
-mwa-sparta/extended/e2fsprogs
-mwa-gplv3/crontabs
-mwa-gplv2/haproxy
-mwa-gplv2/iptables
-mwa-gplv2/iscsi-initiator-utils
-mwa-gplv2/ldapscripts
-mwa-sparta/extended/libvirt
-mwa-sparta/extended/libvirt-python
-mwa-sparta/extended/lighttpd
-mwa-gplv2/netpbm
-mwa-gplv3/parted
-mwa-sparta/extended/python-cephclient
-mwa-gplv3/python-keyring
-mwa-sparta/extended/python-ryu
-mwa-sparta/extended/python-smartpm
-mwa-sparta/extended/lldpd
-mwa-sparta/extended/logrotate
-mwa-sparta/extended/nova-utils
-mwa-sparta/extended/ntp
-mwa-sparta/extended/pam
-mwa-gplv3/rsync
-mwa-sparta/extended/shadow
-mwa-sparta/extended/shim-unsigned
-mwa-sparta/extended/shim-signed
-mwa-sparta/extended/syslog-ng
-mwa-gplv2/net-tools
-mwa-sparta/extended/novnc
-mwa-sparta/extended/sanlock
-mwa-sparta/extended/sudo
-mwa-sparta/extended/cloud-init
-mwa-sparta/extended/irqbalance
-mwa-sparta/extended/watchdog
-mwa-gplv3/seabios
-mwa-gplv2/tpmdd
-mwa-gplv2/integrity
-mwa-gplv2/drbd
-mwa-gplv2/drbd-tools
-mwa-gplv2/intel-e1000e
-mwa-gplv2/intel-i40e
-mwa-gplv2/intel-i40evf
-mwa-gplv2/intel-ixgbe
-mwa-gplv2/intel-ixgbevf
-mwa-gplv2/qat17
-mwa-sparta/networking/net-snmp
-mwa-sparta/networking/openldap
-mwa-sparta/networking/mlx4-config
-mwa-sparta/networking/openvswitch
-mwa-sparta/networking/scapy
-mwa-thales/nfv
-mwa-sparta/restapi-doc
-mwa-gplv3/grub2
 recipes-bsp/grubby
-mwa-gplv3/dnsmasq
-mwa-sparta/support/libevent
-mwa-sparta/support/tgt
-mwa-solon/service-mgmt/sm-common-1.0.0
-mwa-solon/service-mgmt/sm-db-1.0.0
-mwa-solon/service-mgmt/sm-1.0.0
-mwa-solon/service-mgmt-api
-mwa-solon/service-mgmt-client
-mwa-solon/service-mgmt-tools
-mwa-sparta/security/wrs-ssl
-mwa-sparta/security/tss2
-mwa-sparta/security/tpm2-tools
-mwa-sparta/security/tpm2-openssl-engine
-mwa-sparta/security/libtpms
-mwa-sparta/security/swtpm
-mwa-sparta/security/audit
-mwa-cleo/snmp-ext
-mwa-chilon/cgcs-patch
-mwa-chilon/patch-alarm
 middleware/patching/recipes-common/enable-dev-patch
 middleware/util/recipes-common/platform-util
 middleware/util/recipes-common/monitor-tools
 middleware/util/recipes-common/engtools/hostdata-collectors
-mwa-sparta/kernel-std
-mwa-sparta/devtools/puppet-4.8.2
-mwa-beas/installer/pxe-network-installer
-mwa-pitta/config-gate
-mwa-chilon/requests-toolbelt
-mwa-perian/openstack/python-wsme
-mwa-pitta/puppet-manifests
-mwa-sparta/devtools/puppet-modules/puppet-boolean-1.0.2
-mwa-sparta/devtools/puppet-modules/puppet-create_resources
-mwa-sparta/devtools/puppet-modules/puppet-dnsmasq
-mwa-sparta/devtools/puppet-modules/puppet-drbd-0.3.1
-mwa-sparta/devtools/puppet-modules/puppet-filemapper
-mwa-sparta/devtools/puppet-modules/puppet-haproxy-1.5.0
-mwa-sparta/devtools/puppet-modules/puppet-ldap
-mwa-sparta/devtools/puppet-modules/puppet-lvm
-mwa-sparta/devtools/puppet-modules/puppet-network
-mwa-sparta/devtools/puppet-modules/puppet-nslcd
-mwa-sparta/devtools/puppet-modules/puppet-postgresql-4.8.0
-mwa-sparta/devtools/puppet-modules/puppet-puppi
-mwa-sparta/devtools/puppet-modules/puppet-rabbitmq-5.5.0
-mwa-sparta/devtools/puppet-modules/puppet-staging
-mwa-sparta/devtools/puppet-modules/puppet-stdlib-4.12.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-ceph-2.2.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-cinder-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-glance-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-heat-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-ironic-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-keystone-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-murano-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-magnum-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-neutron-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-nova-11.4.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0
-mwa-sparta/devtools/puppet-modules/openstack/puppet-panko-11.3.0
-mwa-pitta/puppet-modules-wrs/puppet-mtce
-mwa-pitta/puppet-modules-wrs/puppet-sshd
-mwa-pitta/puppet-modules-wrs/puppet-nfv
-mwa-pitta/puppet-modules-wrs/puppet-nova_api_proxy
-mwa-pitta/puppet-modules-wrs/puppet-patching
-mwa-pitta/puppet-modules-wrs/puppet-sysinv
-mwa-pitta/puppet-modules-wrs/puppet-dcorch
-mwa-pitta/puppet-modules-wrs/puppet-dcmanager
-mwa-sparta/base/tis-extensions
-mwa-sparta/python/python-eventlet
-mwa-sparta/python/python-requests
-mwa-chilon/patch-scripts/EXAMPLE_0001
-mwa-chilon/patch-scripts/EXAMPLE_0002
-mwa-chilon/patch-scripts/EXAMPLE_0003
-mwa-chilon/patch-scripts/EXAMPLE_RR
-mwa-chilon/patch-scripts/EXAMPLE_MTCE
-mwa-chilon/patch-scripts/EXAMPLE_NEUTRON
-mwa-chilon/patch-scripts/EXAMPLE_AODH
-mwa-chilon/patch-scripts/EXAMPLE_HEAT
-mwa-chilon/patch-scripts/EXAMPLE_VIM
-mwa-chilon/patch-scripts/EXAMPLE_NOVA
-mwa-chilon/patch-scripts/EXAMPLE_SYSINV
-mwa-gplv2/mariadb
-mwa-sparta/extended/systemd
-mwa-sparta/extended/python-gunicorn
-mwa-sparta/devtools/puppet-modules/openstack/puppet-oslo-11.3.0
-mwa-cleo/snmp-audittrail
-mwa-sparta/python/python-3parclient
-mwa-sparta/python/python-lefthandclient
-mwa-sparta/extended/iproute
-mwa-perian/openstack/distributedcloud
-mwa-perian/openstack/distributedcloud-client
-mwa-sparta/extended/tboot
-mwa-beas/kickstart
-mwa-sparta/mellanox/libibverbs
-mwa-sparta/mellanox/mlnx-ofa_kernel
-mwa-sparta/mellanox/rdma-core
diff --git a/centos_pkg_dirs_installer b/centos_pkg_dirs_installer
deleted file mode 100644
index 6c92af2..0000000
--- a/centos_pkg_dirs_installer
+++ /dev/null
@@ -1,2 +0,0 @@
-mwa-gplv2/rpm
-mwa-gplv3/anaconda
diff --git a/centos_pkg_dirs_rt b/centos_pkg_dirs_rt
deleted file mode 100644
index 4b42423..0000000
--- a/centos_pkg_dirs_rt
+++ /dev/null
@@ -1,13 +0,0 @@
-mwa-sparta/kernel-rt
-mwa-gplv2/intel-e1000e
-mwa-gplv2/intel-i40e
-mwa-gplv2/intel-i40evf
-mwa-gplv2/intel-ixgbe
-mwa-gplv2/intel-ixgbevf
-mwa-gplv2/qat17
-mwa-gplv2/drbd
-mwa-gplv2/tpmdd
-mwa-gplv2/integrity
-mwa-sparta/mellanox/libibverbs
-mwa-sparta/mellanox/mlnx-ofa_kernel
-mwa-sparta/mellanox/rdma-core