diff --git a/alpine/manifests/alpine-pod.yaml b/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from alpine/manifests/alpine-pod.yaml
rename to alpine/templates/alpine-pod.yaml
diff --git a/cassandra/manifests/cassandra-rc.yaml b/cassandra/templates/cassandra-rc.yaml
similarity index 100%
rename from cassandra/manifests/cassandra-rc.yaml
rename to cassandra/templates/cassandra-rc.yaml
diff --git a/cassandra/manifests/cassandra-svc.yaml b/cassandra/templates/cassandra-svc.yaml
similarity index 100%
rename from cassandra/manifests/cassandra-svc.yaml
rename to cassandra/templates/cassandra-svc.yaml
diff --git a/docker-registry/manifests/docker-registry-rc.yaml b/docker-registry/templates/docker-registry-rc.yaml
similarity index 100%
rename from docker-registry/manifests/docker-registry-rc.yaml
rename to docker-registry/templates/docker-registry-rc.yaml
diff --git a/docker-registry/manifests/docker-registry-svc.yaml b/docker-registry/templates/docker-registry-svc.yaml
similarity index 100%
rename from docker-registry/manifests/docker-registry-svc.yaml
rename to docker-registry/templates/docker-registry-svc.yaml
diff --git a/elasticsearch/manifests/elasticsearch-rc.yaml b/elasticsearch/templates/elasticsearch-rc.yaml
similarity index 100%
rename from elasticsearch/manifests/elasticsearch-rc.yaml
rename to elasticsearch/templates/elasticsearch-rc.yaml
diff --git a/elasticsearch/manifests/elasticsearch-svc.yaml b/elasticsearch/templates/elasticsearch-svc.yaml
similarity index 100%
rename from elasticsearch/manifests/elasticsearch-svc.yaml
rename to elasticsearch/templates/elasticsearch-svc.yaml
diff --git a/example-nginx/manifests/example-nginx-controller.yaml b/example-nginx/templates/example-nginx-controller.yaml
similarity index 100%
rename from example-nginx/manifests/example-nginx-controller.yaml
rename to example-nginx/templates/example-nginx-controller.yaml
diff --git a/example-nginx/manifests/example-nginx-service.yaml b/example-nginx/templates/example-nginx-service.yaml
similarity index 100%
rename from example-nginx/manifests/example-nginx-service.yaml
rename to example-nginx/templates/example-nginx-service.yaml
diff --git a/example-todo/manifests/example-todo-rc.yaml b/example-todo/templates/example-todo-rc.yaml
similarity index 100%
rename from example-todo/manifests/example-todo-rc.yaml
rename to example-todo/templates/example-todo-rc.yaml
diff --git a/example-todo/manifests/example-todo-redis-cluster-service.yaml b/example-todo/templates/example-todo-redis-cluster-service.yaml
similarity index 100%
rename from example-todo/manifests/example-todo-redis-cluster-service.yaml
rename to example-todo/templates/example-todo-redis-cluster-service.yaml
diff --git a/example-todo/manifests/example-todo-redis-standalone-service.yaml b/example-todo/templates/example-todo-redis-standalone-service.yaml
similarity index 100%
rename from example-todo/manifests/example-todo-redis-standalone-service.yaml
rename to example-todo/templates/example-todo-redis-standalone-service.yaml
diff --git a/example-todo/manifests/example-todo-service.yaml b/example-todo/templates/example-todo-service.yaml
similarity index 100%
rename from example-todo/manifests/example-todo-service.yaml
rename to example-todo/templates/example-todo-service.yaml
diff --git a/jenkins/manifests/jenkins-rc.yaml b/jenkins/templates/jenkins-rc.yaml
similarity index 100%
rename from jenkins/manifests/jenkins-rc.yaml
rename to jenkins/templates/jenkins-rc.yaml
diff --git a/jenkins/manifests/jenkins-svc.yaml b/jenkins/templates/jenkins-svc.yaml
similarity index 100%
rename from jenkins/manifests/jenkins-svc.yaml
rename to jenkins/templates/jenkins-svc.yaml
diff --git a/memcached/manifests/memcached-rc.yaml b/memcached/templates/memcached-rc.yaml
similarity index 100%
rename from memcached/manifests/memcached-rc.yaml
rename to memcached/templates/memcached-rc.yaml
diff --git a/mysql/manifests/mysql-rc.yaml b/mysql/templates/mysql-rc.yaml
similarity index 100%
rename from mysql/manifests/mysql-rc.yaml
rename to mysql/templates/mysql-rc.yaml
diff --git a/mysql/manifests/mysql-svc.yaml b/mysql/templates/mysql-svc.yaml
similarity index 100%
rename from mysql/manifests/mysql-svc.yaml
rename to mysql/templates/mysql-svc.yaml
diff --git a/nginx-alpine/manifests/nginx-rc.yaml b/nginx-alpine/templates/nginx-rc.yaml
similarity index 100%
rename from nginx-alpine/manifests/nginx-rc.yaml
rename to nginx-alpine/templates/nginx-rc.yaml
diff --git a/nginx-alpine/manifests/nginx-svc.yaml b/nginx-alpine/templates/nginx-svc.yaml
similarity index 100%
rename from nginx-alpine/manifests/nginx-svc.yaml
rename to nginx-alpine/templates/nginx-svc.yaml
diff --git a/nginx/manifests/nginx-rc.yaml b/nginx/templates/nginx-rc.yaml
similarity index 100%
rename from nginx/manifests/nginx-rc.yaml
rename to nginx/templates/nginx-rc.yaml
diff --git a/nginx/manifests/nginx-svc.yaml b/nginx/templates/nginx-svc.yaml
similarity index 100%
rename from nginx/manifests/nginx-svc.yaml
rename to nginx/templates/nginx-svc.yaml
diff --git a/owncloud/manifests/owncloud-rc.yaml b/owncloud/templates/owncloud-rc.yaml
similarity index 100%
rename from owncloud/manifests/owncloud-rc.yaml
rename to owncloud/templates/owncloud-rc.yaml
diff --git a/owncloud/manifests/owncloud-svc.yaml b/owncloud/templates/owncloud-svc.yaml
similarity index 100%
rename from owncloud/manifests/owncloud-svc.yaml
rename to owncloud/templates/owncloud-svc.yaml
diff --git a/postgresql/manifests/postgresql-rc.yaml b/postgresql/templates/postgresql-rc.yaml
similarity index 100%
rename from postgresql/manifests/postgresql-rc.yaml
rename to postgresql/templates/postgresql-rc.yaml
diff --git a/postgresql/manifests/postgresql-svc.yaml b/postgresql/templates/postgresql-svc.yaml
similarity index 100%
rename from postgresql/manifests/postgresql-svc.yaml
rename to postgresql/templates/postgresql-svc.yaml
diff --git a/proxy-2-service/manifests/proxy-2-service-pod.yaml b/proxy-2-service/templates/proxy-2-service-pod.yaml
similarity index 100%
rename from proxy-2-service/manifests/proxy-2-service-pod.yaml
rename to proxy-2-service/templates/proxy-2-service-pod.yaml
diff --git a/rabbitmq/manifests/rabbitmq-rc.yaml b/rabbitmq/templates/rabbitmq-rc.yaml
similarity index 100%
rename from rabbitmq/manifests/rabbitmq-rc.yaml
rename to rabbitmq/templates/rabbitmq-rc.yaml
diff --git a/rabbitmq/manifests/rabbitmq-svc.yaml b/rabbitmq/templates/rabbitmq-svc.yaml
similarity index 100%
rename from rabbitmq/manifests/rabbitmq-svc.yaml
rename to rabbitmq/templates/rabbitmq-svc.yaml
diff --git a/redis-cluster/manifests/redis-master.yaml b/redis-cluster/templates/redis-master.yaml
similarity index 100%
rename from redis-cluster/manifests/redis-master.yaml
rename to redis-cluster/templates/redis-master.yaml
diff --git a/redis-cluster/manifests/redis-rc.yaml b/redis-cluster/templates/redis-rc.yaml
similarity index 100%
rename from redis-cluster/manifests/redis-rc.yaml
rename to redis-cluster/templates/redis-rc.yaml
diff --git a/redis-cluster/manifests/redis-sentinel-rc.yaml b/redis-cluster/templates/redis-sentinel-rc.yaml
similarity index 100%
rename from redis-cluster/manifests/redis-sentinel-rc.yaml
rename to redis-cluster/templates/redis-sentinel-rc.yaml
diff --git a/redis-cluster/manifests/redis-sentinel-service.yaml b/redis-cluster/templates/redis-sentinel-service.yaml
similarity index 100%
rename from redis-cluster/manifests/redis-sentinel-service.yaml
rename to redis-cluster/templates/redis-sentinel-service.yaml
diff --git a/redis-standalone/manifests/redis-rc.yaml b/redis-standalone/templates/redis-rc.yaml
similarity index 100%
rename from redis-standalone/manifests/redis-rc.yaml
rename to redis-standalone/templates/redis-rc.yaml
diff --git a/redis-standalone/manifests/redis-svc.yaml b/redis-standalone/templates/redis-svc.yaml
similarity index 100%
rename from redis-standalone/manifests/redis-svc.yaml
rename to redis-standalone/templates/redis-svc.yaml
diff --git a/redmine/manifests/redmine-rc.yaml b/redmine/templates/redmine-rc.yaml
similarity index 100%
rename from redmine/manifests/redmine-rc.yaml
rename to redmine/templates/redmine-rc.yaml
diff --git a/redmine/manifests/redmine-svc.yaml b/redmine/templates/redmine-svc.yaml
similarity index 100%
rename from redmine/manifests/redmine-svc.yaml
rename to redmine/templates/redmine-svc.yaml
diff --git a/riak/manifests/riak-rc.yaml b/riak/templates/riak-rc.yaml
similarity index 100%
rename from riak/manifests/riak-rc.yaml
rename to riak/templates/riak-rc.yaml
diff --git a/riak/manifests/riak-svc.yaml b/riak/templates/riak-svc.yaml
similarity index 100%
rename from riak/manifests/riak-svc.yaml
rename to riak/templates/riak-svc.yaml
diff --git a/selenium-hub/manifests/selenium-hub-rc.yaml b/selenium-hub/templates/selenium-hub-rc.yaml
similarity index 100%
rename from selenium-hub/manifests/selenium-hub-rc.yaml
rename to selenium-hub/templates/selenium-hub-rc.yaml
diff --git a/selenium-hub/manifests/selenium-hub-svc.yaml b/selenium-hub/templates/selenium-hub-svc.yaml
similarity index 100%
rename from selenium-hub/manifests/selenium-hub-svc.yaml
rename to selenium-hub/templates/selenium-hub-svc.yaml
diff --git a/selenium-hub/manifests/selenium-node-chrome-rc.yaml b/selenium-hub/templates/selenium-node-chrome-rc.yaml
similarity index 100%
rename from selenium-hub/manifests/selenium-node-chrome-rc.yaml
rename to selenium-hub/templates/selenium-node-chrome-rc.yaml
diff --git a/selenium-hub/manifests/selenium-node-firefox-rc.yaml b/selenium-hub/templates/selenium-node-firefox-rc.yaml
similarity index 100%
rename from selenium-hub/manifests/selenium-node-firefox-rc.yaml
rename to selenium-hub/templates/selenium-node-firefox-rc.yaml
diff --git a/spark/manifests/spark-master-controller.yaml b/spark/templates/spark-master-controller.yaml
similarity index 100%
rename from spark/manifests/spark-master-controller.yaml
rename to spark/templates/spark-master-controller.yaml
diff --git a/spark/manifests/spark-master-service.yaml b/spark/templates/spark-master-service.yaml
similarity index 100%
rename from spark/manifests/spark-master-service.yaml
rename to spark/templates/spark-master-service.yaml
diff --git a/spark/manifests/spark-webui.yaml b/spark/templates/spark-webui.yaml
similarity index 100%
rename from spark/manifests/spark-webui.yaml
rename to spark/templates/spark-webui.yaml
diff --git a/spark/manifests/spark-worker-controller.yaml b/spark/templates/spark-worker-controller.yaml
similarity index 100%
rename from spark/manifests/spark-worker-controller.yaml
rename to spark/templates/spark-worker-controller.yaml
diff --git a/spark/manifests/zeppelin-controller.yaml b/spark/templates/zeppelin-controller.yaml
similarity index 100%
rename from spark/manifests/zeppelin-controller.yaml
rename to spark/templates/zeppelin-controller.yaml
diff --git a/spark/manifests/zeppelin-service.yaml b/spark/templates/zeppelin-service.yaml
similarity index 100%
rename from spark/manifests/zeppelin-service.yaml
rename to spark/templates/zeppelin-service.yaml
diff --git a/storm/manifests/storm-nimbus-service.yaml b/storm/templates/storm-nimbus-service.yaml
similarity index 100%
rename from storm/manifests/storm-nimbus-service.yaml
rename to storm/templates/storm-nimbus-service.yaml
diff --git a/storm/manifests/storm-nimbus.yaml b/storm/templates/storm-nimbus.yaml
similarity index 100%
rename from storm/manifests/storm-nimbus.yaml
rename to storm/templates/storm-nimbus.yaml
diff --git a/storm/manifests/storm-worker-controller.yaml b/storm/templates/storm-worker-controller.yaml
similarity index 100%
rename from storm/manifests/storm-worker-controller.yaml
rename to storm/templates/storm-worker-controller.yaml
diff --git a/storm/manifests/zookeeper-service.yaml b/storm/templates/zookeeper-service.yaml
similarity index 100%
rename from storm/manifests/zookeeper-service.yaml
rename to storm/templates/zookeeper-service.yaml
diff --git a/storm/manifests/zookeeper.yaml b/storm/templates/zookeeper.yaml
similarity index 100%
rename from storm/manifests/zookeeper.yaml
rename to storm/templates/zookeeper.yaml
diff --git a/third_party/elasticsearch-1/manifests/elasticsearch-rc.yaml b/third_party/elasticsearch-1/templates/elasticsearch-rc.yaml
similarity index 100%
rename from third_party/elasticsearch-1/manifests/elasticsearch-rc.yaml
rename to third_party/elasticsearch-1/templates/elasticsearch-rc.yaml
diff --git a/third_party/elasticsearch-1/manifests/elasticsearch-svc.yaml b/third_party/elasticsearch-1/templates/elasticsearch-svc.yaml
similarity index 100%
rename from third_party/elasticsearch-1/manifests/elasticsearch-svc.yaml
rename to third_party/elasticsearch-1/templates/elasticsearch-svc.yaml
diff --git a/third_party/minecraft/manifests/minecraft-svc.yaml b/third_party/minecraft/templates/minecraft-svc.yaml
similarity index 100%
rename from third_party/minecraft/manifests/minecraft-svc.yaml
rename to third_party/minecraft/templates/minecraft-svc.yaml
diff --git a/third_party/minecraft/manifests/minecraft.yaml b/third_party/minecraft/templates/minecraft.yaml
similarity index 100%
rename from third_party/minecraft/manifests/minecraft.yaml
rename to third_party/minecraft/templates/minecraft.yaml
diff --git a/ubuntu-debootstrap/manifests/ubuntu-pod.yaml b/ubuntu-debootstrap/templates/ubuntu-pod.yaml
similarity index 100%
rename from ubuntu-debootstrap/manifests/ubuntu-pod.yaml
rename to ubuntu-debootstrap/templates/ubuntu-pod.yaml