diff --git a/system/billometer/server/single.yml b/billometer/server/single.yml
similarity index 100%
rename from system/billometer/server/single.yml
rename to billometer/server/single.yml
diff --git a/system/ceilometer/compute/cluster.yml b/ceilometer/compute/cluster.yml
similarity index 100%
rename from system/ceilometer/compute/cluster.yml
rename to ceilometer/compute/cluster.yml
diff --git a/system/cinder/control/cluster.yml b/cinder/control/cluster.yml
similarity index 100%
rename from system/cinder/control/cluster.yml
rename to cinder/control/cluster.yml
diff --git a/system/cinder/control/single.yml b/cinder/control/single.yml
similarity index 100%
rename from system/cinder/control/single.yml
rename to cinder/control/single.yml
diff --git a/system/cinder/volume/single.yml b/cinder/volume/single.yml
similarity index 100%
rename from system/cinder/volume/single.yml
rename to cinder/volume/single.yml
diff --git a/system/collectd/client/local.yml b/collectd/client/local.yml
similarity index 100%
rename from system/collectd/client/local.yml
rename to collectd/client/local.yml
diff --git a/system/collectd/client/output/carbon.yml b/collectd/client/output/carbon.yml
similarity index 100%
rename from system/collectd/client/output/carbon.yml
rename to collectd/client/output/carbon.yml
diff --git a/system/collectd/client/output/heka.yml b/collectd/client/output/heka.yml
similarity index 100%
rename from system/collectd/client/output/heka.yml
rename to collectd/client/output/heka.yml
diff --git a/system/collectd/remote_client/cluster.yml b/collectd/remote_client/cluster.yml
similarity index 100%
rename from system/collectd/remote_client/cluster.yml
rename to collectd/remote_client/cluster.yml
diff --git a/system/collectd/remote_client/output/heka.yml b/collectd/remote_client/output/heka.yml
similarity index 100%
rename from system/collectd/remote_client/output/heka.yml
rename to collectd/remote_client/output/heka.yml
diff --git a/system/collectd/remote_client/single.yml b/collectd/remote_client/single.yml
similarity index 100%
rename from system/collectd/remote_client/single.yml
rename to collectd/remote_client/single.yml
diff --git a/system/elasticsearch/client/single.yml b/elasticsearch/client/single.yml
similarity index 100%
rename from system/elasticsearch/client/single.yml
rename to elasticsearch/client/single.yml
diff --git a/system/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
similarity index 100%
rename from system/elasticsearch/server/cluster.yml
rename to elasticsearch/server/cluster.yml
diff --git a/system/elasticsearch/server/curator.yml b/elasticsearch/server/curator.yml
similarity index 100%
rename from system/elasticsearch/server/curator.yml
rename to elasticsearch/server/curator.yml
diff --git a/system/elasticsearch/server/single.yml b/elasticsearch/server/single.yml
similarity index 100%
rename from system/elasticsearch/server/single.yml
rename to elasticsearch/server/single.yml
diff --git a/system/galera/server/cluster.yml b/galera/server/cluster.yml
similarity index 100%
rename from system/galera/server/cluster.yml
rename to galera/server/cluster.yml
diff --git a/system/galera/server/database/ceilometer.yml b/galera/server/database/ceilometer.yml
similarity index 100%
rename from system/galera/server/database/ceilometer.yml
rename to galera/server/database/ceilometer.yml
diff --git a/system/galera/server/database/cinder.yml b/galera/server/database/cinder.yml
similarity index 100%
rename from system/galera/server/database/cinder.yml
rename to galera/server/database/cinder.yml
diff --git a/system/galera/server/database/glance.yml b/galera/server/database/glance.yml
similarity index 100%
rename from system/galera/server/database/glance.yml
rename to galera/server/database/glance.yml
diff --git a/system/galera/server/database/grafana.yml b/galera/server/database/grafana.yml
similarity index 100%
rename from system/galera/server/database/grafana.yml
rename to galera/server/database/grafana.yml
diff --git a/system/galera/server/database/graphite.yml b/galera/server/database/graphite.yml
similarity index 100%
rename from system/galera/server/database/graphite.yml
rename to galera/server/database/graphite.yml
diff --git a/system/galera/server/database/heat.yml b/galera/server/database/heat.yml
similarity index 100%
rename from system/galera/server/database/heat.yml
rename to galera/server/database/heat.yml
diff --git a/system/galera/server/database/keystone.yml b/galera/server/database/keystone.yml
similarity index 100%
rename from system/galera/server/database/keystone.yml
rename to galera/server/database/keystone.yml
diff --git a/system/galera/server/database/neutron.yml b/galera/server/database/neutron.yml
similarity index 100%
rename from system/galera/server/database/neutron.yml
rename to galera/server/database/neutron.yml
diff --git a/system/galera/server/database/nova.yml b/galera/server/database/nova.yml
similarity index 100%
rename from system/galera/server/database/nova.yml
rename to galera/server/database/nova.yml
diff --git a/system/glance/control/cluster.yml b/glance/control/cluster.yml
similarity index 100%
rename from system/glance/control/cluster.yml
rename to glance/control/cluster.yml
diff --git a/system/glance/control/single.yml b/glance/control/single.yml
similarity index 100%
rename from system/glance/control/single.yml
rename to glance/control/single.yml
diff --git a/system/glance/control/storage/glusterfs.yml b/glance/control/storage/glusterfs.yml
similarity index 100%
rename from system/glance/control/storage/glusterfs.yml
rename to glance/control/storage/glusterfs.yml
diff --git a/system/grafana/client/single.yml b/grafana/client/single.yml
similarity index 100%
rename from system/grafana/client/single.yml
rename to grafana/client/single.yml
diff --git a/system/grafana/server/single.yml b/grafana/server/single.yml
similarity index 100%
rename from system/grafana/server/single.yml
rename to grafana/server/single.yml
diff --git a/system/graphite/collector/single.yml b/graphite/collector/single.yml
similarity index 100%
rename from system/graphite/collector/single.yml
rename to graphite/collector/single.yml
diff --git a/system/graphite/server/single.yml b/graphite/server/single.yml
similarity index 100%
rename from system/graphite/server/single.yml
rename to graphite/server/single.yml
diff --git a/system/haproxy/proxy/listen/elasticsearch.yml b/haproxy/proxy/listen/elasticsearch.yml
similarity index 100%
rename from system/haproxy/proxy/listen/elasticsearch.yml
rename to haproxy/proxy/listen/elasticsearch.yml
diff --git a/system/haproxy/proxy/listen/kibana.yml b/haproxy/proxy/listen/kibana.yml
similarity index 100%
rename from system/haproxy/proxy/listen/kibana.yml
rename to haproxy/proxy/listen/kibana.yml
diff --git a/system/haproxy/proxy/listen/logging.yml b/haproxy/proxy/listen/logging.yml
similarity index 100%
rename from system/haproxy/proxy/listen/logging.yml
rename to haproxy/proxy/listen/logging.yml
diff --git a/system/haproxy/proxy/listen/monitoring.yml b/haproxy/proxy/listen/monitoring.yml
similarity index 100%
rename from system/haproxy/proxy/listen/monitoring.yml
rename to haproxy/proxy/listen/monitoring.yml
diff --git a/system/haproxy/proxy/listen/opencontrail/analytics.yml b/haproxy/proxy/listen/opencontrail/analytics.yml
similarity index 100%
rename from system/haproxy/proxy/listen/opencontrail/analytics.yml
rename to haproxy/proxy/listen/opencontrail/analytics.yml
diff --git a/system/haproxy/proxy/listen/opencontrail/control.yml b/haproxy/proxy/listen/opencontrail/control.yml
similarity index 100%
rename from system/haproxy/proxy/listen/opencontrail/control.yml
rename to haproxy/proxy/listen/opencontrail/control.yml
diff --git a/system/haproxy/proxy/listen/openstack/cinder.yml b/haproxy/proxy/listen/openstack/cinder.yml
similarity index 100%
rename from system/haproxy/proxy/listen/openstack/cinder.yml
rename to haproxy/proxy/listen/openstack/cinder.yml
diff --git a/system/haproxy/proxy/listen/openstack/galera.yml b/haproxy/proxy/listen/openstack/galera.yml
similarity index 100%
rename from system/haproxy/proxy/listen/openstack/galera.yml
rename to haproxy/proxy/listen/openstack/galera.yml
diff --git a/system/haproxy/proxy/listen/openstack/glance.yml b/haproxy/proxy/listen/openstack/glance.yml
similarity index 100%
rename from system/haproxy/proxy/listen/openstack/glance.yml
rename to haproxy/proxy/listen/openstack/glance.yml
diff --git a/system/haproxy/proxy/listen/openstack/heat.yml b/haproxy/proxy/listen/openstack/heat.yml
similarity index 100%
rename from system/haproxy/proxy/listen/openstack/heat.yml
rename to haproxy/proxy/listen/openstack/heat.yml
diff --git a/system/haproxy/proxy/listen/openstack/horizon.yml b/haproxy/proxy/listen/openstack/horizon.yml
similarity index 100%
rename from system/haproxy/proxy/listen/openstack/horizon.yml
rename to haproxy/proxy/listen/openstack/horizon.yml
diff --git a/system/haproxy/proxy/listen/openstack/keystone.yml b/haproxy/proxy/listen/openstack/keystone.yml
similarity index 100%
rename from system/haproxy/proxy/listen/openstack/keystone.yml
rename to haproxy/proxy/listen/openstack/keystone.yml
diff --git a/system/haproxy/proxy/listen/openstack/neutron.yml b/haproxy/proxy/listen/openstack/neutron.yml
similarity index 100%
rename from system/haproxy/proxy/listen/openstack/neutron.yml
rename to haproxy/proxy/listen/openstack/neutron.yml
diff --git a/system/haproxy/proxy/listen/openstack/nova.yml b/haproxy/proxy/listen/openstack/nova.yml
similarity index 100%
rename from system/haproxy/proxy/listen/openstack/nova.yml
rename to haproxy/proxy/listen/openstack/nova.yml
diff --git a/system/haproxy/proxy/listen/rabbitmq.yml b/haproxy/proxy/listen/rabbitmq.yml
similarity index 100%
rename from system/haproxy/proxy/listen/rabbitmq.yml
rename to haproxy/proxy/listen/rabbitmq.yml
diff --git a/system/haproxy/proxy/listen/redis.yml b/haproxy/proxy/listen/redis.yml
similarity index 100%
rename from system/haproxy/proxy/listen/redis.yml
rename to haproxy/proxy/listen/redis.yml
diff --git a/system/haproxy/proxy/listen/sensu.yml b/haproxy/proxy/listen/sensu.yml
similarity index 100%
rename from system/haproxy/proxy/listen/sensu.yml
rename to haproxy/proxy/listen/sensu.yml
diff --git a/system/haproxy/proxy/listen/stacklight/elasticsearch.yml b/haproxy/proxy/listen/stacklight/elasticsearch.yml
similarity index 100%
rename from system/haproxy/proxy/listen/stacklight/elasticsearch.yml
rename to haproxy/proxy/listen/stacklight/elasticsearch.yml
diff --git a/system/haproxy/proxy/listen/stacklight/grafana.yml b/haproxy/proxy/listen/stacklight/grafana.yml
similarity index 100%
rename from system/haproxy/proxy/listen/stacklight/grafana.yml
rename to haproxy/proxy/listen/stacklight/grafana.yml
diff --git a/system/haproxy/proxy/listen/stacklight/kibana.yml b/haproxy/proxy/listen/stacklight/kibana.yml
similarity index 100%
rename from system/haproxy/proxy/listen/stacklight/kibana.yml
rename to haproxy/proxy/listen/stacklight/kibana.yml
diff --git a/system/haproxy/proxy/listen/uchiwa.yml b/haproxy/proxy/listen/uchiwa.yml
similarity index 100%
rename from system/haproxy/proxy/listen/uchiwa.yml
rename to haproxy/proxy/listen/uchiwa.yml
diff --git a/system/haproxy/proxy/single.yml b/haproxy/proxy/single.yml
similarity index 100%
rename from system/haproxy/proxy/single.yml
rename to haproxy/proxy/single.yml
diff --git a/system/heat/server/cluster.yml b/heat/server/cluster.yml
similarity index 100%
rename from system/heat/server/cluster.yml
rename to heat/server/cluster.yml
diff --git a/system/heat/server/single.yml b/heat/server/single.yml
similarity index 100%
rename from system/heat/server/single.yml
rename to heat/server/single.yml
diff --git a/system/heka/aggregator/cluster.yml b/heka/aggregator/cluster.yml
similarity index 100%
rename from system/heka/aggregator/cluster.yml
rename to heka/aggregator/cluster.yml
diff --git a/system/heka/aggregator/single.yml b/heka/aggregator/single.yml
similarity index 100%
rename from system/heka/aggregator/single.yml
rename to heka/aggregator/single.yml
diff --git a/system/heka/alarm/openstack_compute.yml b/heka/alarm/openstack_compute.yml
similarity index 100%
rename from system/heka/alarm/openstack_compute.yml
rename to heka/alarm/openstack_compute.yml
diff --git a/system/heka/alarm/openstack_control.yml b/heka/alarm/openstack_control.yml
similarity index 100%
rename from system/heka/alarm/openstack_control.yml
rename to heka/alarm/openstack_control.yml
diff --git a/system/heka/log_collector/single.yml b/heka/log_collector/single.yml
similarity index 100%
rename from system/heka/log_collector/single.yml
rename to heka/log_collector/single.yml
diff --git a/system/heka/metric_collector/single.yml b/heka/metric_collector/single.yml
similarity index 100%
rename from system/heka/metric_collector/single.yml
rename to heka/metric_collector/single.yml
diff --git a/system/heka/remote_collector/cluster.yml b/heka/remote_collector/cluster.yml
similarity index 100%
rename from system/heka/remote_collector/cluster.yml
rename to heka/remote_collector/cluster.yml
diff --git a/system/heka/remote_collector/single.yml b/heka/remote_collector/single.yml
similarity index 100%
rename from system/heka/remote_collector/single.yml
rename to heka/remote_collector/single.yml
diff --git a/system/heka/router/single.yml b/heka/router/single.yml
similarity index 100%
rename from system/heka/router/single.yml
rename to heka/router/single.yml
diff --git a/system/heka/shipper/single.yml b/heka/shipper/single.yml
similarity index 100%
rename from system/heka/shipper/single.yml
rename to heka/shipper/single.yml
diff --git a/system/horizon/server/app/tcpcloud_kilo.yml b/horizon/server/app/tcpcloud_kilo.yml
similarity index 100%
rename from system/horizon/server/app/tcpcloud_kilo.yml
rename to horizon/server/app/tcpcloud_kilo.yml
diff --git a/system/horizon/server/cluster.yml b/horizon/server/cluster.yml
similarity index 100%
rename from system/horizon/server/cluster.yml
rename to horizon/server/cluster.yml
diff --git a/system/horizon/server/multi.yml b/horizon/server/multi.yml
similarity index 100%
rename from system/horizon/server/multi.yml
rename to horizon/server/multi.yml
diff --git a/system/horizon/server/single.yml b/horizon/server/single.yml
similarity index 100%
rename from system/horizon/server/single.yml
rename to horizon/server/single.yml
diff --git a/system/influxdb/server/cluster.yml b/influxdb/server/cluster.yml
similarity index 100%
rename from system/influxdb/server/cluster.yml
rename to influxdb/server/cluster.yml
diff --git a/system/influxdb/server/single.yml b/influxdb/server/single.yml
similarity index 100%
rename from system/influxdb/server/single.yml
rename to influxdb/server/single.yml
diff --git a/system/influxdb/server/tmpfs_wal.yml b/influxdb/server/tmpfs_wal.yml
similarity index 100%
rename from system/influxdb/server/tmpfs_wal.yml
rename to influxdb/server/tmpfs_wal.yml
diff --git a/system/keepalived/cluster/instance/stacklight_monitor_vip.yml b/keepalived/cluster/instance/stacklight_monitor_vip.yml
similarity index 100%
rename from system/keepalived/cluster/instance/stacklight_monitor_vip.yml
rename to keepalived/cluster/instance/stacklight_monitor_vip.yml
diff --git a/system/keystone/client/service/billometer.yml b/keystone/client/service/billometer.yml
similarity index 100%
rename from system/keystone/client/service/billometer.yml
rename to keystone/client/service/billometer.yml
diff --git a/system/keystone/client/service/ceilometer.yml b/keystone/client/service/ceilometer.yml
similarity index 100%
rename from system/keystone/client/service/ceilometer.yml
rename to keystone/client/service/ceilometer.yml
diff --git a/system/keystone/client/service/cinder.yml b/keystone/client/service/cinder.yml
similarity index 100%
rename from system/keystone/client/service/cinder.yml
rename to keystone/client/service/cinder.yml
diff --git a/system/keystone/client/service/cinder2.yml b/keystone/client/service/cinder2.yml
similarity index 100%
rename from system/keystone/client/service/cinder2.yml
rename to keystone/client/service/cinder2.yml
diff --git a/system/keystone/client/service/glance.yml b/keystone/client/service/glance.yml
similarity index 100%
rename from system/keystone/client/service/glance.yml
rename to keystone/client/service/glance.yml
diff --git a/system/keystone/client/service/heat-cfn.yml b/keystone/client/service/heat-cfn.yml
similarity index 100%
rename from system/keystone/client/service/heat-cfn.yml
rename to keystone/client/service/heat-cfn.yml
diff --git a/system/keystone/client/service/heat.yml b/keystone/client/service/heat.yml
similarity index 100%
rename from system/keystone/client/service/heat.yml
rename to keystone/client/service/heat.yml
diff --git a/system/keystone/client/service/keystone.yml b/keystone/client/service/keystone.yml
similarity index 100%
rename from system/keystone/client/service/keystone.yml
rename to keystone/client/service/keystone.yml
diff --git a/system/keystone/client/service/keystone3.yml b/keystone/client/service/keystone3.yml
similarity index 100%
rename from system/keystone/client/service/keystone3.yml
rename to keystone/client/service/keystone3.yml
diff --git a/system/keystone/client/service/neutron.yml b/keystone/client/service/neutron.yml
similarity index 100%
rename from system/keystone/client/service/neutron.yml
rename to keystone/client/service/neutron.yml
diff --git a/system/keystone/client/service/nova-ec2.yml b/keystone/client/service/nova-ec2.yml
similarity index 100%
rename from system/keystone/client/service/nova-ec2.yml
rename to keystone/client/service/nova-ec2.yml
diff --git a/system/keystone/client/service/nova.yml b/keystone/client/service/nova.yml
similarity index 100%
rename from system/keystone/client/service/nova.yml
rename to keystone/client/service/nova.yml
diff --git a/system/keystone/client/service/nova21.yml b/keystone/client/service/nova21.yml
similarity index 100%
rename from system/keystone/client/service/nova21.yml
rename to keystone/client/service/nova21.yml
diff --git a/system/keystone/client/single.yml b/keystone/client/single.yml
similarity index 100%
rename from system/keystone/client/single.yml
rename to keystone/client/single.yml
diff --git a/system/keystone/server/cluster.yml b/keystone/server/cluster.yml
similarity index 100%
rename from system/keystone/server/cluster.yml
rename to keystone/server/cluster.yml
diff --git a/system/keystone/server/single.yml b/keystone/server/single.yml
similarity index 100%
rename from system/keystone/server/single.yml
rename to keystone/server/single.yml
diff --git a/system/keystone/server/storage/glusterfs.yml b/keystone/server/storage/glusterfs.yml
similarity index 100%
rename from system/keystone/server/storage/glusterfs.yml
rename to keystone/server/storage/glusterfs.yml
diff --git a/system/kibana/client/single.yml b/kibana/client/single.yml
similarity index 100%
rename from system/kibana/client/single.yml
rename to kibana/client/single.yml
diff --git a/system/kibana/server/single.yml b/kibana/server/single.yml
similarity index 100%
rename from system/kibana/server/single.yml
rename to kibana/server/single.yml
diff --git a/system/linux/network/interface/ovs_lab_dvr.yml b/linux/network/interface/ovs_lab_dvr.yml
similarity index 100%
rename from system/linux/network/interface/ovs_lab_dvr.yml
rename to linux/network/interface/ovs_lab_dvr.yml
diff --git a/system/linux/network/interface/primary_dhcp.yml b/linux/network/interface/primary_dhcp.yml
similarity index 100%
rename from system/linux/network/interface/primary_dhcp.yml
rename to linux/network/interface/primary_dhcp.yml
diff --git a/system/linux/network/interface/primary_static.yml b/linux/network/interface/primary_static.yml
similarity index 100%
rename from system/linux/network/interface/primary_static.yml
rename to linux/network/interface/primary_static.yml
diff --git a/system/linux/system/lowmem.yml b/linux/system/lowmem.yml
similarity index 100%
rename from system/linux/system/lowmem.yml
rename to linux/system/lowmem.yml
diff --git a/system/linux/system/repo/contrail.yml b/linux/system/repo/contrail.yml
similarity index 100%
rename from system/linux/system/repo/contrail.yml
rename to linux/system/repo/contrail.yml
diff --git a/system/linux/system/repo/kibana.yml b/linux/system/repo/kibana.yml
similarity index 100%
rename from system/linux/system/repo/kibana.yml
rename to linux/system/repo/kibana.yml
diff --git a/system/linux/system/repo/mos8.yml b/linux/system/repo/mos8.yml
similarity index 100%
rename from system/linux/system/repo/mos8.yml
rename to linux/system/repo/mos8.yml
diff --git a/system/linux/system/repo/mos9.yml b/linux/system/repo/mos9.yml
similarity index 100%
rename from system/linux/system/repo/mos9.yml
rename to linux/system/repo/mos9.yml
diff --git a/system/linux/system/repo/saltstack_2016_3_trusty.yml b/linux/system/repo/saltstack_2016_3_trusty.yml
similarity index 100%
rename from system/linux/system/repo/saltstack_2016_3_trusty.yml
rename to linux/system/repo/saltstack_2016_3_trusty.yml
diff --git a/system/linux/system/repo/saltstack_2016_3_xenial.yml b/linux/system/repo/saltstack_2016_3_xenial.yml
similarity index 100%
rename from system/linux/system/repo/saltstack_2016_3_xenial.yml
rename to linux/system/repo/saltstack_2016_3_xenial.yml
diff --git a/system/linux/system/repo/tcp_base.yml b/linux/system/repo/tcp_base.yml
similarity index 100%
rename from system/linux/system/repo/tcp_base.yml
rename to linux/system/repo/tcp_base.yml
diff --git a/system/linux/system/repo/tcp_elastic.yml b/linux/system/repo/tcp_elastic.yml
similarity index 100%
rename from system/linux/system/repo/tcp_elastic.yml
rename to linux/system/repo/tcp_elastic.yml
diff --git a/system/linux/system/repo/tcp_extra.yml b/linux/system/repo/tcp_extra.yml
similarity index 100%
rename from system/linux/system/repo/tcp_extra.yml
rename to linux/system/repo/tcp_extra.yml
diff --git a/system/linux/system/repo/tcp_mk20.yml b/linux/system/repo/tcp_mk20.yml
similarity index 100%
rename from system/linux/system/repo/tcp_mk20.yml
rename to linux/system/repo/tcp_mk20.yml
diff --git a/system/linux/system/repo/tcp_salt.yml b/linux/system/repo/tcp_salt.yml
similarity index 100%
rename from system/linux/system/repo/tcp_salt.yml
rename to linux/system/repo/tcp_salt.yml
diff --git a/system/linux/system/repo/ubuntu.yml b/linux/system/repo/ubuntu.yml
similarity index 100%
rename from system/linux/system/repo/ubuntu.yml
rename to linux/system/repo/ubuntu.yml
diff --git a/system/linux/system/single.yml b/linux/system/single.yml
similarity index 100%
rename from system/linux/system/single.yml
rename to linux/system/single.yml
diff --git a/system/memcached/server/single.yml b/memcached/server/single.yml
similarity index 100%
rename from system/memcached/server/single.yml
rename to memcached/server/single.yml
diff --git a/system/mysql/client/database/ceilometer.yml b/mysql/client/database/ceilometer.yml
similarity index 100%
rename from system/mysql/client/database/ceilometer.yml
rename to mysql/client/database/ceilometer.yml
diff --git a/system/mysql/client/database/cinder.yml b/mysql/client/database/cinder.yml
similarity index 100%
rename from system/mysql/client/database/cinder.yml
rename to mysql/client/database/cinder.yml
diff --git a/system/mysql/client/database/glance.yml b/mysql/client/database/glance.yml
similarity index 100%
rename from system/mysql/client/database/glance.yml
rename to mysql/client/database/glance.yml
diff --git a/system/mysql/client/database/grafana.yml b/mysql/client/database/grafana.yml
similarity index 100%
rename from system/mysql/client/database/grafana.yml
rename to mysql/client/database/grafana.yml
diff --git a/system/mysql/client/database/heat.yml b/mysql/client/database/heat.yml
similarity index 100%
rename from system/mysql/client/database/heat.yml
rename to mysql/client/database/heat.yml
diff --git a/system/mysql/client/database/keystone.yml b/mysql/client/database/keystone.yml
similarity index 100%
rename from system/mysql/client/database/keystone.yml
rename to mysql/client/database/keystone.yml
diff --git a/system/mysql/client/database/nova.yml b/mysql/client/database/nova.yml
similarity index 100%
rename from system/mysql/client/database/nova.yml
rename to mysql/client/database/nova.yml
diff --git a/system/mysql/client/database/nova_api.yml b/mysql/client/database/nova_api.yml
similarity index 100%
rename from system/mysql/client/database/nova_api.yml
rename to mysql/client/database/nova_api.yml
diff --git a/system/mysql/client/single.yml b/mysql/client/single.yml
similarity index 100%
rename from system/mysql/client/single.yml
rename to mysql/client/single.yml
diff --git a/system/nagios/server/cluster.yml b/nagios/server/cluster.yml
similarity index 100%
rename from system/nagios/server/cluster.yml
rename to nagios/server/cluster.yml
diff --git a/system/nagios/server/init.yml b/nagios/server/init.yml
similarity index 100%
rename from system/nagios/server/init.yml
rename to nagios/server/init.yml
diff --git a/system/nagios/server/single.yml b/nagios/server/single.yml
similarity index 100%
rename from system/nagios/server/single.yml
rename to nagios/server/single.yml
diff --git a/system/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
similarity index 100%
rename from system/neutron/compute/cluster.yml
rename to neutron/compute/cluster.yml
diff --git a/system/neutron/control/cluster.yml b/neutron/control/cluster.yml
similarity index 100%
rename from system/neutron/control/cluster.yml
rename to neutron/control/cluster.yml
diff --git a/system/neutron/control/opencontrail/cluster.yml b/neutron/control/opencontrail/cluster.yml
similarity index 100%
rename from system/neutron/control/opencontrail/cluster.yml
rename to neutron/control/opencontrail/cluster.yml
diff --git a/system/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
similarity index 100%
rename from system/neutron/control/openvswitch/cluster.yml
rename to neutron/control/openvswitch/cluster.yml
diff --git a/system/neutron/control/single.yml b/neutron/control/single.yml
similarity index 100%
rename from system/neutron/control/single.yml
rename to neutron/control/single.yml
diff --git a/system/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
similarity index 100%
rename from system/neutron/gateway/cluster.yml
rename to neutron/gateway/cluster.yml
diff --git a/system/nginx/server/proxy/grafana_web.yml b/nginx/server/proxy/grafana_web.yml
similarity index 100%
rename from system/nginx/server/proxy/grafana_web.yml
rename to nginx/server/proxy/grafana_web.yml
diff --git a/system/nginx/server/proxy/graphite_web.yml b/nginx/server/proxy/graphite_web.yml
similarity index 100%
rename from system/nginx/server/proxy/graphite_web.yml
rename to nginx/server/proxy/graphite_web.yml
diff --git a/system/nginx/server/proxy/kibana_web.yml b/nginx/server/proxy/kibana_web.yml
similarity index 100%
rename from system/nginx/server/proxy/kibana_web.yml
rename to nginx/server/proxy/kibana_web.yml
diff --git a/system/nginx/server/proxy/nagios_web.yml b/nginx/server/proxy/nagios_web.yml
similarity index 100%
rename from system/nginx/server/proxy/nagios_web.yml
rename to nginx/server/proxy/nagios_web.yml
diff --git a/system/nginx/server/proxy/opencontrail_web.yml b/nginx/server/proxy/opencontrail_web.yml
similarity index 100%
rename from system/nginx/server/proxy/opencontrail_web.yml
rename to nginx/server/proxy/opencontrail_web.yml
diff --git a/system/nginx/server/proxy/openstack_api.yml b/nginx/server/proxy/openstack_api.yml
similarity index 100%
rename from system/nginx/server/proxy/openstack_api.yml
rename to nginx/server/proxy/openstack_api.yml
diff --git a/system/nginx/server/proxy/openstack_vnc.yml b/nginx/server/proxy/openstack_vnc.yml
similarity index 100%
rename from system/nginx/server/proxy/openstack_vnc.yml
rename to nginx/server/proxy/openstack_vnc.yml
diff --git a/system/nginx/server/proxy/openstack_web.yml b/nginx/server/proxy/openstack_web.yml
similarity index 100%
rename from system/nginx/server/proxy/openstack_web.yml
rename to nginx/server/proxy/openstack_web.yml
diff --git a/system/nginx/server/proxy/sensu_web.yml b/nginx/server/proxy/sensu_web.yml
similarity index 100%
rename from system/nginx/server/proxy/sensu_web.yml
rename to nginx/server/proxy/sensu_web.yml
diff --git a/system/nginx/server/proxy/sphinx_web.yml b/nginx/server/proxy/sphinx_web.yml
similarity index 100%
rename from system/nginx/server/proxy/sphinx_web.yml
rename to nginx/server/proxy/sphinx_web.yml
diff --git a/system/nginx/server/single.yml b/nginx/server/single.yml
similarity index 100%
rename from system/nginx/server/single.yml
rename to nginx/server/single.yml
diff --git a/system/nova/compute/cluster.yml b/nova/compute/cluster.yml
similarity index 100%
rename from system/nova/compute/cluster.yml
rename to nova/compute/cluster.yml
diff --git a/system/nova/compute/single.yml b/nova/compute/single.yml
similarity index 100%
rename from system/nova/compute/single.yml
rename to nova/compute/single.yml
diff --git a/system/nova/control/cluster.yml b/nova/control/cluster.yml
similarity index 100%
rename from system/nova/control/cluster.yml
rename to nova/control/cluster.yml
diff --git a/system/nova/control/single.yml b/nova/control/single.yml
similarity index 100%
rename from system/nova/control/single.yml
rename to nova/control/single.yml
diff --git a/system/ntp/client/single.yml b/ntp/client/single.yml
similarity index 100%
rename from system/ntp/client/single.yml
rename to ntp/client/single.yml
diff --git a/system/opencontrail/compute/cluster.yml b/opencontrail/compute/cluster.yml
similarity index 100%
rename from system/opencontrail/compute/cluster.yml
rename to opencontrail/compute/cluster.yml
diff --git a/system/opencontrail/compute/single.yml b/opencontrail/compute/single.yml
similarity index 100%
rename from system/opencontrail/compute/single.yml
rename to opencontrail/compute/single.yml
diff --git a/system/opencontrail/control/analytics.yml b/opencontrail/control/analytics.yml
similarity index 100%
rename from system/opencontrail/control/analytics.yml
rename to opencontrail/control/analytics.yml
diff --git a/system/opencontrail/control/cluster.yml b/opencontrail/control/cluster.yml
similarity index 100%
rename from system/opencontrail/control/cluster.yml
rename to opencontrail/control/cluster.yml
diff --git a/system/opencontrail/control/control.yml b/opencontrail/control/control.yml
similarity index 100%
rename from system/opencontrail/control/control.yml
rename to opencontrail/control/control.yml
diff --git a/system/opencontrail/control/single.yml b/opencontrail/control/single.yml
similarity index 100%
rename from system/opencontrail/control/single.yml
rename to opencontrail/control/single.yml
diff --git a/system/openssh/client/lab.yml b/openssh/client/lab.yml
similarity index 100%
rename from system/openssh/client/lab.yml
rename to openssh/client/lab.yml
diff --git a/system/openssh/server/single.yml b/openssh/server/single.yml
similarity index 100%
rename from system/openssh/server/single.yml
rename to openssh/server/single.yml
diff --git a/system/openssh/server/team/qa_scale.yml b/openssh/server/team/qa_scale.yml
similarity index 100%
rename from system/openssh/server/team/qa_scale.yml
rename to openssh/server/team/qa_scale.yml
diff --git a/system/openssh/server/team/stacklight.yml b/openssh/server/team/stacklight.yml
similarity index 100%
rename from system/openssh/server/team/stacklight.yml
rename to openssh/server/team/stacklight.yml
diff --git a/system/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
similarity index 100%
rename from system/openssh/server/team/tcpcloud.yml
rename to openssh/server/team/tcpcloud.yml
diff --git a/system/rabbitmq/server/cluster.yml b/rabbitmq/server/cluster.yml
similarity index 100%
rename from system/rabbitmq/server/cluster.yml
rename to rabbitmq/server/cluster.yml
diff --git a/system/rabbitmq/server/single.yml b/rabbitmq/server/single.yml
similarity index 100%
rename from system/rabbitmq/server/single.yml
rename to rabbitmq/server/single.yml
diff --git a/system/rabbitmq/server/vhost/monitoring.yml b/rabbitmq/server/vhost/monitoring.yml
similarity index 100%
rename from system/rabbitmq/server/vhost/monitoring.yml
rename to rabbitmq/server/vhost/monitoring.yml
diff --git a/system/rabbitmq/server/vhost/openstack.yml b/rabbitmq/server/vhost/openstack.yml
similarity index 100%
rename from system/rabbitmq/server/vhost/openstack.yml
rename to rabbitmq/server/vhost/openstack.yml
diff --git a/system/reclass/storage/salt.yml b/reclass/storage/salt.yml
similarity index 100%
rename from system/reclass/storage/salt.yml
rename to reclass/storage/salt.yml
diff --git a/system/reclass/storage/system/monitoring_service_cluster.yml b/reclass/storage/system/monitoring_service_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/monitoring_service_cluster.yml
rename to reclass/storage/system/monitoring_service_cluster.yml
diff --git a/system/reclass/storage/system/monitoring_service_single.yml b/reclass/storage/system/monitoring_service_single.yml
similarity index 100%
rename from system/reclass/storage/system/monitoring_service_single.yml
rename to reclass/storage/system/monitoring_service_single.yml
diff --git a/system/reclass/storage/system/opencontrail_analytics_cluster.yml b/reclass/storage/system/opencontrail_analytics_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/opencontrail_analytics_cluster.yml
rename to reclass/storage/system/opencontrail_analytics_cluster.yml
diff --git a/system/reclass/storage/system/opencontrail_control_cluster.yml b/reclass/storage/system/opencontrail_control_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/opencontrail_control_cluster.yml
rename to reclass/storage/system/opencontrail_control_cluster.yml
diff --git a/system/reclass/storage/system/opencontrail_gateway_single.yml b/reclass/storage/system/opencontrail_gateway_single.yml
similarity index 100%
rename from system/reclass/storage/system/opencontrail_gateway_single.yml
rename to reclass/storage/system/opencontrail_gateway_single.yml
diff --git a/system/reclass/storage/system/openstack_compute_multi.yml b/reclass/storage/system/openstack_compute_multi.yml
similarity index 100%
rename from system/reclass/storage/system/openstack_compute_multi.yml
rename to reclass/storage/system/openstack_compute_multi.yml
diff --git a/system/reclass/storage/system/openstack_compute_single.yml b/reclass/storage/system/openstack_compute_single.yml
similarity index 100%
rename from system/reclass/storage/system/openstack_compute_single.yml
rename to reclass/storage/system/openstack_compute_single.yml
diff --git a/system/reclass/storage/system/openstack_control_cluster.yml b/reclass/storage/system/openstack_control_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/openstack_control_cluster.yml
rename to reclass/storage/system/openstack_control_cluster.yml
diff --git a/system/reclass/storage/system/openstack_dashboard_single.yml b/reclass/storage/system/openstack_dashboard_single.yml
similarity index 100%
rename from system/reclass/storage/system/openstack_dashboard_single.yml
rename to reclass/storage/system/openstack_dashboard_single.yml
diff --git a/system/reclass/storage/system/openstack_database_cluster.yml b/reclass/storage/system/openstack_database_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/openstack_database_cluster.yml
rename to reclass/storage/system/openstack_database_cluster.yml
diff --git a/system/reclass/storage/system/openstack_gateway_single.yml b/reclass/storage/system/openstack_gateway_single.yml
similarity index 100%
rename from system/reclass/storage/system/openstack_gateway_single.yml
rename to reclass/storage/system/openstack_gateway_single.yml
diff --git a/system/reclass/storage/system/openstack_message_queue_cluster.yml b/reclass/storage/system/openstack_message_queue_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/openstack_message_queue_cluster.yml
rename to reclass/storage/system/openstack_message_queue_cluster.yml
diff --git a/system/reclass/storage/system/openstack_proxy_cluster.yml b/reclass/storage/system/openstack_proxy_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/openstack_proxy_cluster.yml
rename to reclass/storage/system/openstack_proxy_cluster.yml
diff --git a/system/reclass/storage/system/openstack_proxy_single.yml b/reclass/storage/system/openstack_proxy_single.yml
similarity index 100%
rename from system/reclass/storage/system/openstack_proxy_single.yml
rename to reclass/storage/system/openstack_proxy_single.yml
diff --git a/system/reclass/storage/system/physical_control_cluster.yml b/reclass/storage/system/physical_control_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/physical_control_cluster.yml
rename to reclass/storage/system/physical_control_cluster.yml
diff --git a/system/reclass/storage/system/physical_control_full.yml b/reclass/storage/system/physical_control_full.yml
similarity index 100%
rename from system/reclass/storage/system/physical_control_full.yml
rename to reclass/storage/system/physical_control_full.yml
diff --git a/system/reclass/storage/system/physical_control_single.yml b/reclass/storage/system/physical_control_single.yml
similarity index 100%
rename from system/reclass/storage/system/physical_control_single.yml
rename to reclass/storage/system/physical_control_single.yml
diff --git a/system/reclass/storage/system/stacklight_log_cluster.yml b/reclass/storage/system/stacklight_log_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/stacklight_log_cluster.yml
rename to reclass/storage/system/stacklight_log_cluster.yml
diff --git a/system/reclass/storage/system/stacklight_monitor_cluster.yml b/reclass/storage/system/stacklight_monitor_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/stacklight_monitor_cluster.yml
rename to reclass/storage/system/stacklight_monitor_cluster.yml
diff --git a/system/reclass/storage/system/stacklight_server_cluster.yml b/reclass/storage/system/stacklight_server_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/stacklight_server_cluster.yml
rename to reclass/storage/system/stacklight_server_cluster.yml
diff --git a/system/reclass/storage/system/stacklight_server_single.yml b/reclass/storage/system/stacklight_server_single.yml
similarity index 100%
rename from system/reclass/storage/system/stacklight_server_single.yml
rename to reclass/storage/system/stacklight_server_single.yml
diff --git a/system/reclass/storage/system/stacklight_telemetry_cluster.yml b/reclass/storage/system/stacklight_telemetry_cluster.yml
similarity index 100%
rename from system/reclass/storage/system/stacklight_telemetry_cluster.yml
rename to reclass/storage/system/stacklight_telemetry_cluster.yml
diff --git a/system/salt/control/cluster/opencontrail_analytics_cluster.yml b/salt/control/cluster/opencontrail_analytics_cluster.yml
similarity index 100%
rename from system/salt/control/cluster/opencontrail_analytics_cluster.yml
rename to salt/control/cluster/opencontrail_analytics_cluster.yml
diff --git a/system/salt/control/cluster/opencontrail_control_cluster.yml b/salt/control/cluster/opencontrail_control_cluster.yml
similarity index 100%
rename from system/salt/control/cluster/opencontrail_control_cluster.yml
rename to salt/control/cluster/opencontrail_control_cluster.yml
diff --git a/system/salt/control/cluster/openstack_control_cluster.yml b/salt/control/cluster/openstack_control_cluster.yml
similarity index 100%
rename from system/salt/control/cluster/openstack_control_cluster.yml
rename to salt/control/cluster/openstack_control_cluster.yml
diff --git a/system/salt/control/cluster/openstack_database_cluster.yml b/salt/control/cluster/openstack_database_cluster.yml
similarity index 100%
rename from system/salt/control/cluster/openstack_database_cluster.yml
rename to salt/control/cluster/openstack_database_cluster.yml
diff --git a/system/salt/control/cluster/openstack_message_queue_cluster.yml b/salt/control/cluster/openstack_message_queue_cluster.yml
similarity index 100%
rename from system/salt/control/cluster/openstack_message_queue_cluster.yml
rename to salt/control/cluster/openstack_message_queue_cluster.yml
diff --git a/system/salt/control/cluster/openstack_proxy_single.yml b/salt/control/cluster/openstack_proxy_single.yml
similarity index 100%
rename from system/salt/control/cluster/openstack_proxy_single.yml
rename to salt/control/cluster/openstack_proxy_single.yml
diff --git a/system/salt/control/cluster/stacklight_log_cluster.yml b/salt/control/cluster/stacklight_log_cluster.yml
similarity index 100%
rename from system/salt/control/cluster/stacklight_log_cluster.yml
rename to salt/control/cluster/stacklight_log_cluster.yml
diff --git a/system/salt/control/cluster/stacklight_server_cluster.yml b/salt/control/cluster/stacklight_server_cluster.yml
similarity index 100%
rename from system/salt/control/cluster/stacklight_server_cluster.yml
rename to salt/control/cluster/stacklight_server_cluster.yml
diff --git a/system/salt/control/cluster/stacklight_telemetry_cluster.yml b/salt/control/cluster/stacklight_telemetry_cluster.yml
similarity index 100%
rename from system/salt/control/cluster/stacklight_telemetry_cluster.yml
rename to salt/control/cluster/stacklight_telemetry_cluster.yml
diff --git a/system/salt/control/virt.yml b/salt/control/virt.yml
similarity index 100%
rename from system/salt/control/virt.yml
rename to salt/control/virt.yml
diff --git a/system/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
similarity index 100%
rename from system/salt/master/formula/git/openstack.yml
rename to salt/master/formula/git/openstack.yml
diff --git a/system/salt/master/formula/git/saltstack.yml b/salt/master/formula/git/saltstack.yml
similarity index 100%
rename from system/salt/master/formula/git/saltstack.yml
rename to salt/master/formula/git/saltstack.yml
diff --git a/system/salt/master/formula/git/stacklight.yml b/salt/master/formula/git/stacklight.yml
similarity index 100%
rename from system/salt/master/formula/git/stacklight.yml
rename to salt/master/formula/git/stacklight.yml
diff --git a/system/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
similarity index 100%
rename from system/salt/master/formula/pkg/openstack.yml
rename to salt/master/formula/pkg/openstack.yml
diff --git a/system/salt/master/formula/pkg/saltstack.yml b/salt/master/formula/pkg/saltstack.yml
similarity index 100%
rename from system/salt/master/formula/pkg/saltstack.yml
rename to salt/master/formula/pkg/saltstack.yml
diff --git a/system/salt/master/formula/pkg/stacklight.yml b/salt/master/formula/pkg/stacklight.yml
similarity index 100%
rename from system/salt/master/formula/pkg/stacklight.yml
rename to salt/master/formula/pkg/stacklight.yml
diff --git a/system/salt/master/git.yml b/salt/master/git.yml
similarity index 100%
rename from system/salt/master/git.yml
rename to salt/master/git.yml
diff --git a/system/salt/master/pkg.yml b/salt/master/pkg.yml
similarity index 100%
rename from system/salt/master/pkg.yml
rename to salt/master/pkg.yml
diff --git a/system/salt/master/single.yml b/salt/master/single.yml
similarity index 100%
rename from system/salt/master/single.yml
rename to salt/master/single.yml
diff --git a/system/salt/minion/master.yml b/salt/minion/master.yml
similarity index 100%
rename from system/salt/minion/master.yml
rename to salt/minion/master.yml
diff --git a/system/salt/minion/pki/authority.yml b/salt/minion/pki/authority.yml
similarity index 100%
rename from system/salt/minion/pki/authority.yml
rename to salt/minion/pki/authority.yml
diff --git a/system/salt/minion/pki/certificate.yml b/salt/minion/pki/certificate.yml
similarity index 100%
rename from system/salt/minion/pki/certificate.yml
rename to salt/minion/pki/certificate.yml
diff --git a/system/sensu/client/remote.yml b/sensu/client/remote.yml
similarity index 100%
rename from system/sensu/client/remote.yml
rename to sensu/client/remote.yml
diff --git a/system/sensu/client/single.yml b/sensu/client/single.yml
similarity index 100%
rename from system/sensu/client/single.yml
rename to sensu/client/single.yml
diff --git a/system/sensu/server/dashboard.yml b/sensu/server/dashboard.yml
similarity index 100%
rename from system/sensu/server/dashboard.yml
rename to sensu/server/dashboard.yml
diff --git a/system/sensu/server/handler/mail.yml b/sensu/server/handler/mail.yml
similarity index 100%
rename from system/sensu/server/handler/mail.yml
rename to sensu/server/handler/mail.yml
diff --git a/system/sensu/server/single.yml b/sensu/server/single.yml
similarity index 100%
rename from system/sensu/server/single.yml
rename to sensu/server/single.yml
diff --git a/system/sphinx/server/doc/reclass.yml b/sphinx/server/doc/reclass.yml
similarity index 100%
rename from system/sphinx/server/doc/reclass.yml
rename to sphinx/server/doc/reclass.yml
diff --git a/system/sphinx/server/multi.yml b/sphinx/server/multi.yml
similarity index 100%
rename from system/sphinx/server/multi.yml
rename to sphinx/server/multi.yml