diff --git a/templates/controller.yaml b/templates/controller/1.0.0/controller.yaml
similarity index 100%
rename from templates/controller.yaml
rename to templates/controller/1.0.0/controller.yaml
diff --git a/templates/glance.yaml b/templates/glance/1.0.0/glance.yaml
similarity index 100%
rename from templates/glance.yaml
rename to templates/glance/1.0.0/glance.yaml
diff --git a/templates/glance_base.yaml b/templates/glance_base/1.0.0/glance_base.yaml
similarity index 100%
rename from templates/glance_base.yaml
rename to templates/glance_base/1.0.0/glance_base.yaml
diff --git a/templates/glance_db.yaml b/templates/glance_db/1.0.0/glance_db.yaml
similarity index 100%
rename from templates/glance_db.yaml
rename to templates/glance_db/1.0.0/glance_db.yaml
diff --git a/templates/glance_registry.yaml b/templates/glance_registry/1.0.0/glance_registry.yaml
similarity index 100%
rename from templates/glance_registry.yaml
rename to templates/glance_registry/1.0.0/glance_registry.yaml
diff --git a/templates/haproxy.yaml b/templates/haproxy/1.0.0/haproxy.yaml
similarity index 100%
rename from templates/haproxy.yaml
rename to templates/haproxy/1.0.0/haproxy.yaml
diff --git a/templates/keystone_api.yaml b/templates/keystone_api/1.0.0/keystone_api.yaml
similarity index 100%
rename from templates/keystone_api.yaml
rename to templates/keystone_api/1.0.0/keystone_api.yaml
diff --git a/templates/keystone_base.yaml b/templates/keystone_base/1.0.0/keystone_base.yaml
similarity index 100%
rename from templates/keystone_base.yaml
rename to templates/keystone_base/1.0.0/keystone_base.yaml
diff --git a/templates/mos_repos.yaml b/templates/mos_repos/1.0.0/mos_repos.yaml
similarity index 100%
rename from templates/mos_repos.yaml
rename to templates/mos_repos/1.0.0/mos_repos.yaml
diff --git a/templates/nodes.yaml b/templates/nodes/1.0.0/nodes.yaml
similarity index 100%
rename from templates/nodes.yaml
rename to templates/nodes/1.0.0/nodes.yaml
diff --git a/templates/nodes_network.yaml b/templates/nodes_network/1.0.0/nodes_network.yaml
similarity index 100%
rename from templates/nodes_network.yaml
rename to templates/nodes_network/1.0.0/nodes_network.yaml
diff --git a/templates/nodes_with_transports.yaml b/templates/nodes_with_transports/1.0.0/nodes_with_transports.yaml
similarity index 100%
rename from templates/nodes_with_transports.yaml
rename to templates/nodes_with_transports/1.0.0/nodes_with_transports.yaml
diff --git a/templates/not_provisioned_nodes.yaml b/templates/not_provisioned_nodes/1.0.0/not_provisioned_nodes.yaml
similarity index 100%
rename from templates/not_provisioned_nodes.yaml
rename to templates/not_provisioned_nodes/1.0.0/not_provisioned_nodes.yaml
diff --git a/templates/openstack_base.yaml b/templates/openstack_base/1.0.0/openstack_base.yaml
similarity index 100%
rename from templates/openstack_base.yaml
rename to templates/openstack_base/1.0.0/openstack_base.yaml
diff --git a/templates/profile.yaml b/templates/profile/1.0.0/profile.yaml
similarity index 100%
rename from templates/profile.yaml
rename to templates/profile/1.0.0/profile.yaml
diff --git a/templates/seed_node.yaml b/templates/seed_node/1.0.0/seed_node.yaml
similarity index 100%
rename from templates/seed_node.yaml
rename to templates/seed_node/1.0.0/seed_node.yaml
diff --git a/templates/sources.yaml b/templates/sources/1.0.0/sources.yaml
similarity index 100%
rename from templates/sources.yaml
rename to templates/sources/1.0.0/sources.yaml