diff --git a/classes/cluster/k8s-ha-contrail/.env b/classes/cluster_deprecated/k8s-ha-contrail/.env
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/.env
rename to classes/cluster_deprecated/k8s-ha-contrail/.env
diff --git a/classes/cluster/k8s-ha-contrail/MAINTAINERS b/classes/cluster_deprecated/k8s-ha-contrail/MAINTAINERS
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/MAINTAINERS
rename to classes/cluster_deprecated/k8s-ha-contrail/MAINTAINERS
diff --git a/classes/cluster/k8s-ha-contrail/infra/config.yml b/classes/cluster_deprecated/k8s-ha-contrail/infra/config.yml
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/infra/config.yml
rename to classes/cluster_deprecated/k8s-ha-contrail/infra/config.yml
diff --git a/classes/cluster/k8s-ha-contrail/infra/init.yml b/classes/cluster_deprecated/k8s-ha-contrail/infra/init.yml
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/infra/init.yml
rename to classes/cluster_deprecated/k8s-ha-contrail/infra/init.yml
diff --git a/classes/cluster/k8s-ha-contrail/init.yml b/classes/cluster_deprecated/k8s-ha-contrail/init.yml
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/init.yml
rename to classes/cluster_deprecated/k8s-ha-contrail/init.yml
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/compute.yml
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
rename to classes/cluster_deprecated/k8s-ha-contrail/kubernetes/compute.yml
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/kubernetes/control.yml
rename to classes/cluster_deprecated/k8s-ha-contrail/kubernetes/control.yml
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/kubernetes/init.yml
rename to classes/cluster_deprecated/k8s-ha-contrail/kubernetes/init.yml
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/compute.yml b/classes/cluster_deprecated/k8s-ha-contrail/opencontrail/compute.yml
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/opencontrail/compute.yml
rename to classes/cluster_deprecated/k8s-ha-contrail/opencontrail/compute.yml
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml b/classes/cluster_deprecated/k8s-ha-contrail/opencontrail/control.yml
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/opencontrail/control.yml
rename to classes/cluster_deprecated/k8s-ha-contrail/opencontrail/control.yml
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/init.yml b/classes/cluster_deprecated/k8s-ha-contrail/opencontrail/init.yml
similarity index 100%
rename from classes/cluster/k8s-ha-contrail/opencontrail/init.yml
rename to classes/cluster_deprecated/k8s-ha-contrail/opencontrail/init.yml
diff --git a/classes/cluster/sl-k8s-contrail/infra/config.yml b/classes/cluster_deprecated/sl-k8s-contrail/infra/config.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/infra/config.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/infra/config.yml
diff --git a/classes/cluster/sl-k8s-contrail/infra/init.yml b/classes/cluster_deprecated/sl-k8s-contrail/infra/init.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/infra/init.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/infra/init.yml
diff --git a/classes/cluster/sl-k8s-contrail/init.yml b/classes/cluster_deprecated/sl-k8s-contrail/init.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/init.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/init.yml
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/compute.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/kubernetes/compute.yml
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/kubernetes/control.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/kubernetes/control.yml
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/kubernetes/init.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/kubernetes/init.yml
diff --git a/classes/cluster/sl-k8s-contrail/opencontrail/compute.yml b/classes/cluster_deprecated/sl-k8s-contrail/opencontrail/compute.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/opencontrail/compute.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/opencontrail/compute.yml
diff --git a/classes/cluster/sl-k8s-contrail/opencontrail/control.yml b/classes/cluster_deprecated/sl-k8s-contrail/opencontrail/control.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/opencontrail/control.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/opencontrail/control.yml
diff --git a/classes/cluster/sl-k8s-contrail/opencontrail/init.yml b/classes/cluster_deprecated/sl-k8s-contrail/opencontrail/init.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/opencontrail/init.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/opencontrail/init.yml
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/client.yml b/classes/cluster_deprecated/sl-k8s-contrail/stacklight/client.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/stacklight/client.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/stacklight/client.yml
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/init.yml b/classes/cluster_deprecated/sl-k8s-contrail/stacklight/init.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/stacklight/init.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/stacklight/init.yml
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/proxy.yml b/classes/cluster_deprecated/sl-k8s-contrail/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/stacklight/proxy.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/stacklight/proxy.yml
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster_deprecated/sl-k8s-contrail/stacklight/server.yml
similarity index 100%
rename from classes/cluster/sl-k8s-contrail/stacklight/server.yml
rename to classes/cluster_deprecated/sl-k8s-contrail/stacklight/server.yml