diff --git a/templates/matchbox/groups.tf.j2 b/10-sno-hub-cluster/templates/matchbox/groups.tf.j2
similarity index 100%
rename from templates/matchbox/groups.tf.j2
rename to 10-sno-hub-cluster/templates/matchbox/groups.tf.j2
diff --git a/templates/matchbox/profiles.tf.j2 b/10-sno-hub-cluster/templates/matchbox/profiles.tf.j2
similarity index 100%
rename from templates/matchbox/profiles.tf.j2
rename to 10-sno-hub-cluster/templates/matchbox/profiles.tf.j2
diff --git a/templates/matchbox/provider.tf.j2 b/10-sno-hub-cluster/templates/matchbox/provider.tf.j2
similarity index 100%
rename from templates/matchbox/provider.tf.j2
rename to 10-sno-hub-cluster/templates/matchbox/provider.tf.j2
diff --git a/templates/openshift-installer/agent-config.yaml.j2 b/10-sno-hub-cluster/templates/openshift-installer/agent-config.yaml.j2
similarity index 100%
rename from templates/openshift-installer/agent-config.yaml.j2
rename to 10-sno-hub-cluster/templates/openshift-installer/agent-config.yaml.j2
diff --git a/templates/openshift-installer/install-config.yaml.j2 b/10-sno-hub-cluster/templates/openshift-installer/install-config.yaml.j2
similarity index 100%
rename from templates/openshift-installer/install-config.yaml.j2
rename to 10-sno-hub-cluster/templates/openshift-installer/install-config.yaml.j2