diff --git a/classes/cluster/sl-k8s-calico/.env b/classes/cluster_deprecated/sl-k8s-calico/.env
similarity index 100%
rename from classes/cluster/sl-k8s-calico/.env
rename to classes/cluster_deprecated/sl-k8s-calico/.env
diff --git a/classes/cluster/sl-k8s-calico/infra/config.yml b/classes/cluster_deprecated/sl-k8s-calico/infra/config.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/infra/config.yml
rename to classes/cluster_deprecated/sl-k8s-calico/infra/config.yml
diff --git a/classes/cluster/sl-k8s-calico/infra/init.yml b/classes/cluster_deprecated/sl-k8s-calico/infra/init.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/infra/init.yml
rename to classes/cluster_deprecated/sl-k8s-calico/infra/init.yml
diff --git a/classes/cluster/sl-k8s-calico/init.yml b/classes/cluster_deprecated/sl-k8s-calico/init.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/init.yml
rename to classes/cluster_deprecated/sl-k8s-calico/init.yml
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster_deprecated/sl-k8s-calico/kubernetes/compute.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/kubernetes/compute.yml
rename to classes/cluster_deprecated/sl-k8s-calico/kubernetes/compute.yml
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster_deprecated/sl-k8s-calico/kubernetes/control.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/kubernetes/control.yml
rename to classes/cluster_deprecated/sl-k8s-calico/kubernetes/control.yml
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster_deprecated/sl-k8s-calico/kubernetes/init.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/kubernetes/init.yml
rename to classes/cluster_deprecated/sl-k8s-calico/kubernetes/init.yml
diff --git a/classes/cluster/sl-k8s-calico/stacklight/client.yml b/classes/cluster_deprecated/sl-k8s-calico/stacklight/client.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/stacklight/client.yml
rename to classes/cluster_deprecated/sl-k8s-calico/stacklight/client.yml
diff --git a/classes/cluster/sl-k8s-calico/stacklight/init.yml b/classes/cluster_deprecated/sl-k8s-calico/stacklight/init.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/stacklight/init.yml
rename to classes/cluster_deprecated/sl-k8s-calico/stacklight/init.yml
diff --git a/classes/cluster/sl-k8s-calico/stacklight/proxy.yml b/classes/cluster_deprecated/sl-k8s-calico/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/stacklight/proxy.yml
rename to classes/cluster_deprecated/sl-k8s-calico/stacklight/proxy.yml
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster_deprecated/sl-k8s-calico/stacklight/server.yml
similarity index 100%
rename from classes/cluster/sl-k8s-calico/stacklight/server.yml
rename to classes/cluster_deprecated/sl-k8s-calico/stacklight/server.yml
diff --git a/classes/cluster/sl-os-contrail/.env b/classes/cluster_deprecated/sl-os-contrail/.env
similarity index 100%
rename from classes/cluster/sl-os-contrail/.env
rename to classes/cluster_deprecated/sl-os-contrail/.env
diff --git a/classes/cluster/sl-os-contrail/infra/config.yml b/classes/cluster_deprecated/sl-os-contrail/infra/config.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/infra/config.yml
rename to classes/cluster_deprecated/sl-os-contrail/infra/config.yml
diff --git a/classes/cluster/sl-os-contrail/infra/init.yml b/classes/cluster_deprecated/sl-os-contrail/infra/init.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/infra/init.yml
rename to classes/cluster_deprecated/sl-os-contrail/infra/init.yml
diff --git a/classes/cluster/sl-os-contrail/init.yml b/classes/cluster_deprecated/sl-os-contrail/init.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/init.yml
rename to classes/cluster_deprecated/sl-os-contrail/init.yml
diff --git a/classes/cluster/sl-os-contrail/opencontrail/control.yml b/classes/cluster_deprecated/sl-os-contrail/opencontrail/control.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/opencontrail/control.yml
rename to classes/cluster_deprecated/sl-os-contrail/opencontrail/control.yml
diff --git a/classes/cluster/sl-os-contrail/opencontrail/init.yml b/classes/cluster_deprecated/sl-os-contrail/opencontrail/init.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/opencontrail/init.yml
rename to classes/cluster_deprecated/sl-os-contrail/opencontrail/init.yml
diff --git a/classes/cluster/sl-os-contrail/openstack/compute.yml b/classes/cluster_deprecated/sl-os-contrail/openstack/compute.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/openstack/compute.yml
rename to classes/cluster_deprecated/sl-os-contrail/openstack/compute.yml
diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster_deprecated/sl-os-contrail/openstack/control.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/openstack/control.yml
rename to classes/cluster_deprecated/sl-os-contrail/openstack/control.yml
diff --git a/classes/cluster/sl-os-contrail/openstack/dashboard.yml b/classes/cluster_deprecated/sl-os-contrail/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/openstack/dashboard.yml
rename to classes/cluster_deprecated/sl-os-contrail/openstack/dashboard.yml
diff --git a/classes/cluster/sl-os-contrail/openstack/init.yml b/classes/cluster_deprecated/sl-os-contrail/openstack/init.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/openstack/init.yml
rename to classes/cluster_deprecated/sl-os-contrail/openstack/init.yml
diff --git a/classes/cluster/sl-os-contrail/openstack/proxy.yml b/classes/cluster_deprecated/sl-os-contrail/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/openstack/proxy.yml
rename to classes/cluster_deprecated/sl-os-contrail/openstack/proxy.yml
diff --git a/classes/cluster/sl-os-contrail/stacklight/client.yml b/classes/cluster_deprecated/sl-os-contrail/stacklight/client.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/stacklight/client.yml
rename to classes/cluster_deprecated/sl-os-contrail/stacklight/client.yml
diff --git a/classes/cluster/sl-os-contrail/stacklight/init.yml b/classes/cluster_deprecated/sl-os-contrail/stacklight/init.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/stacklight/init.yml
rename to classes/cluster_deprecated/sl-os-contrail/stacklight/init.yml
diff --git a/classes/cluster/sl-os-contrail/stacklight/proxy.yml b/classes/cluster_deprecated/sl-os-contrail/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/stacklight/proxy.yml
rename to classes/cluster_deprecated/sl-os-contrail/stacklight/proxy.yml
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster_deprecated/sl-os-contrail/stacklight/server.yml
similarity index 100%
rename from classes/cluster/sl-os-contrail/stacklight/server.yml
rename to classes/cluster_deprecated/sl-os-contrail/stacklight/server.yml
diff --git a/classes/cluster/sl-os-ovs/infra/config.yml b/classes/cluster_deprecated/sl-os-ovs/infra/config.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/infra/config.yml
rename to classes/cluster_deprecated/sl-os-ovs/infra/config.yml
diff --git a/classes/cluster/sl-os-ovs/infra/init.yml b/classes/cluster_deprecated/sl-os-ovs/infra/init.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/infra/init.yml
rename to classes/cluster_deprecated/sl-os-ovs/infra/init.yml
diff --git a/classes/cluster/sl-os-ovs/init.yml b/classes/cluster_deprecated/sl-os-ovs/init.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/init.yml
rename to classes/cluster_deprecated/sl-os-ovs/init.yml
diff --git a/classes/cluster/sl-os-ovs/openstack/compute.yml b/classes/cluster_deprecated/sl-os-ovs/openstack/compute.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/openstack/compute.yml
rename to classes/cluster_deprecated/sl-os-ovs/openstack/compute.yml
diff --git a/classes/cluster/sl-os-ovs/openstack/control.yml b/classes/cluster_deprecated/sl-os-ovs/openstack/control.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/openstack/control.yml
rename to classes/cluster_deprecated/sl-os-ovs/openstack/control.yml
diff --git a/classes/cluster/sl-os-ovs/openstack/dashboard.yml b/classes/cluster_deprecated/sl-os-ovs/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/openstack/dashboard.yml
rename to classes/cluster_deprecated/sl-os-ovs/openstack/dashboard.yml
diff --git a/classes/cluster/sl-os-ovs/openstack/gateway.yml b/classes/cluster_deprecated/sl-os-ovs/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/openstack/gateway.yml
rename to classes/cluster_deprecated/sl-os-ovs/openstack/gateway.yml
diff --git a/classes/cluster/sl-os-ovs/openstack/init.yml b/classes/cluster_deprecated/sl-os-ovs/openstack/init.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/openstack/init.yml
rename to classes/cluster_deprecated/sl-os-ovs/openstack/init.yml
diff --git a/classes/cluster/sl-os-ovs/openstack/proxy.yml b/classes/cluster_deprecated/sl-os-ovs/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/openstack/proxy.yml
rename to classes/cluster_deprecated/sl-os-ovs/openstack/proxy.yml
diff --git a/classes/cluster/sl-os-ovs/stacklight/client.yml b/classes/cluster_deprecated/sl-os-ovs/stacklight/client.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/stacklight/client.yml
rename to classes/cluster_deprecated/sl-os-ovs/stacklight/client.yml
diff --git a/classes/cluster/sl-os-ovs/stacklight/init.yml b/classes/cluster_deprecated/sl-os-ovs/stacklight/init.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/stacklight/init.yml
rename to classes/cluster_deprecated/sl-os-ovs/stacklight/init.yml
diff --git a/classes/cluster/sl-os-ovs/stacklight/proxy.yml b/classes/cluster_deprecated/sl-os-ovs/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/stacklight/proxy.yml
rename to classes/cluster_deprecated/sl-os-ovs/stacklight/proxy.yml
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster_deprecated/sl-os-ovs/stacklight/server.yml
similarity index 100%
rename from classes/cluster/sl-os-ovs/stacklight/server.yml
rename to classes/cluster_deprecated/sl-os-ovs/stacklight/server.yml
diff --git a/classes/cluster/sl-pike-dvr/.env b/classes/cluster_deprecated/sl-pike-dvr/.env
similarity index 100%
rename from classes/cluster/sl-pike-dvr/.env
rename to classes/cluster_deprecated/sl-pike-dvr/.env
diff --git a/classes/cluster/sl-pike-dvr/infra/config.yml b/classes/cluster_deprecated/sl-pike-dvr/infra/config.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/infra/config.yml
rename to classes/cluster_deprecated/sl-pike-dvr/infra/config.yml
diff --git a/classes/cluster/sl-pike-dvr/infra/init.yml b/classes/cluster_deprecated/sl-pike-dvr/infra/init.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/infra/init.yml
rename to classes/cluster_deprecated/sl-pike-dvr/infra/init.yml
diff --git a/classes/cluster/sl-pike-dvr/init.yml b/classes/cluster_deprecated/sl-pike-dvr/init.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/init.yml
rename to classes/cluster_deprecated/sl-pike-dvr/init.yml
diff --git a/classes/cluster/sl-pike-dvr/openstack/compute.yml b/classes/cluster_deprecated/sl-pike-dvr/openstack/compute.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/openstack/compute.yml
rename to classes/cluster_deprecated/sl-pike-dvr/openstack/compute.yml
diff --git a/classes/cluster/sl-pike-dvr/openstack/control.yml b/classes/cluster_deprecated/sl-pike-dvr/openstack/control.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/openstack/control.yml
rename to classes/cluster_deprecated/sl-pike-dvr/openstack/control.yml
diff --git a/classes/cluster/sl-pike-dvr/openstack/dashboard.yml b/classes/cluster_deprecated/sl-pike-dvr/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/openstack/dashboard.yml
rename to classes/cluster_deprecated/sl-pike-dvr/openstack/dashboard.yml
diff --git a/classes/cluster/sl-pike-dvr/openstack/gateway.yml b/classes/cluster_deprecated/sl-pike-dvr/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/openstack/gateway.yml
rename to classes/cluster_deprecated/sl-pike-dvr/openstack/gateway.yml
diff --git a/classes/cluster/sl-pike-dvr/openstack/init.yml b/classes/cluster_deprecated/sl-pike-dvr/openstack/init.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/openstack/init.yml
rename to classes/cluster_deprecated/sl-pike-dvr/openstack/init.yml
diff --git a/classes/cluster/sl-pike-dvr/openstack/proxy.yml b/classes/cluster_deprecated/sl-pike-dvr/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/openstack/proxy.yml
rename to classes/cluster_deprecated/sl-pike-dvr/openstack/proxy.yml
diff --git a/classes/cluster/sl-pike-dvr/stacklight/client.yml b/classes/cluster_deprecated/sl-pike-dvr/stacklight/client.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/stacklight/client.yml
rename to classes/cluster_deprecated/sl-pike-dvr/stacklight/client.yml
diff --git a/classes/cluster/sl-pike-dvr/stacklight/init.yml b/classes/cluster_deprecated/sl-pike-dvr/stacklight/init.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/stacklight/init.yml
rename to classes/cluster_deprecated/sl-pike-dvr/stacklight/init.yml
diff --git a/classes/cluster/sl-pike-dvr/stacklight/proxy.yml b/classes/cluster_deprecated/sl-pike-dvr/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/stacklight/proxy.yml
rename to classes/cluster_deprecated/sl-pike-dvr/stacklight/proxy.yml
diff --git a/classes/cluster/sl-pike-dvr/stacklight/server.yml b/classes/cluster_deprecated/sl-pike-dvr/stacklight/server.yml
similarity index 100%
rename from classes/cluster/sl-pike-dvr/stacklight/server.yml
rename to classes/cluster_deprecated/sl-pike-dvr/stacklight/server.yml