diff --git a/openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl b/openshift-origin/F18/F18-x86_64-openshift-origin-broker-cfntools.tdl
similarity index 100%
rename from openshift-origin/F18-x86_64-openshift-origin-broker-cfntools.tdl
rename to openshift-origin/F18/F18-x86_64-openshift-origin-broker-cfntools.tdl
diff --git a/openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl b/openshift-origin/F18/F18-x86_64-openshift-origin-node-cfntools.tdl
similarity index 100%
rename from openshift-origin/F18-x86_64-openshift-origin-node-cfntools.tdl
rename to openshift-origin/F18/F18-x86_64-openshift-origin-node-cfntools.tdl
diff --git a/openshift-origin/OpenShift.template b/openshift-origin/F18/OpenShift.template
similarity index 100%
rename from openshift-origin/OpenShift.template
rename to openshift-origin/F18/OpenShift.template
diff --git a/openshift-origin/OpenShiftAutoScaling.yaml b/openshift-origin/F18/OpenShiftAutoScaling.yaml
similarity index 100%
rename from openshift-origin/OpenShiftAutoScaling.yaml
rename to openshift-origin/F18/OpenShiftAutoScaling.yaml
diff --git a/openshift-origin/README.rst b/openshift-origin/F18/README.rst
similarity index 100%
rename from openshift-origin/README.rst
rename to openshift-origin/F18/README.rst
diff --git a/openshift-origin/elements/heat-cfntools/install.d/05-heat-cfntools b/openshift-origin/F18/elements/heat-cfntools/install.d/05-heat-cfntools
similarity index 100%
rename from openshift-origin/elements/heat-cfntools/install.d/05-heat-cfntools
rename to openshift-origin/F18/elements/heat-cfntools/install.d/05-heat-cfntools
diff --git a/openshift-origin/elements/openshift-origin-broker/README.md b/openshift-origin/F18/elements/openshift-origin-broker/README.md
similarity index 100%
rename from openshift-origin/elements/openshift-origin-broker/README.md
rename to openshift-origin/F18/elements/openshift-origin-broker/README.md
diff --git a/openshift-origin/elements/openshift-origin-broker/element-deps b/openshift-origin/F18/elements/openshift-origin-broker/element-deps
similarity index 100%
rename from openshift-origin/elements/openshift-origin-broker/element-deps
rename to openshift-origin/F18/elements/openshift-origin-broker/element-deps
diff --git a/openshift-origin/elements/openshift-origin-broker/install.d/30-openshift-origin-broker b/openshift-origin/F18/elements/openshift-origin-broker/install.d/30-openshift-origin-broker
similarity index 100%
rename from openshift-origin/elements/openshift-origin-broker/install.d/30-openshift-origin-broker
rename to openshift-origin/F18/elements/openshift-origin-broker/install.d/30-openshift-origin-broker
diff --git a/openshift-origin/elements/openshift-origin-node/README.md b/openshift-origin/F18/elements/openshift-origin-node/README.md
similarity index 100%
rename from openshift-origin/elements/openshift-origin-node/README.md
rename to openshift-origin/F18/elements/openshift-origin-node/README.md
diff --git a/openshift-origin/elements/openshift-origin-node/element-deps b/openshift-origin/F18/elements/openshift-origin-node/element-deps
similarity index 100%
rename from openshift-origin/elements/openshift-origin-node/element-deps
rename to openshift-origin/F18/elements/openshift-origin-node/element-deps
diff --git a/openshift-origin/elements/openshift-origin-node/install.d/30-openshift-origin-node b/openshift-origin/F18/elements/openshift-origin-node/install.d/30-openshift-origin-node
similarity index 100%
rename from openshift-origin/elements/openshift-origin-node/install.d/30-openshift-origin-node
rename to openshift-origin/F18/elements/openshift-origin-node/install.d/30-openshift-origin-node
diff --git a/openshift-origin/elements/openshift-origin-repos/README.md b/openshift-origin/F18/elements/openshift-origin-repos/README.md
similarity index 100%
rename from openshift-origin/elements/openshift-origin-repos/README.md
rename to openshift-origin/F18/elements/openshift-origin-repos/README.md
diff --git a/openshift-origin/elements/openshift-origin-repos/element-deps b/openshift-origin/F18/elements/openshift-origin-repos/element-deps
similarity index 100%
rename from openshift-origin/elements/openshift-origin-repos/element-deps
rename to openshift-origin/F18/elements/openshift-origin-repos/element-deps
diff --git a/openshift-origin/elements/openshift-origin-repos/pre-install.d/29-puppetlabs-release b/openshift-origin/F18/elements/openshift-origin-repos/pre-install.d/29-puppetlabs-release
similarity index 100%
rename from openshift-origin/elements/openshift-origin-repos/pre-install.d/29-puppetlabs-release
rename to openshift-origin/F18/elements/openshift-origin-repos/pre-install.d/29-puppetlabs-release
diff --git a/openshift-origin/elements/openshift-origin-repos/pre-install.d/30-openshift-origin-repos b/openshift-origin/F18/elements/openshift-origin-repos/pre-install.d/30-openshift-origin-repos
similarity index 100%
rename from openshift-origin/elements/openshift-origin-repos/pre-install.d/30-openshift-origin-repos
rename to openshift-origin/F18/elements/openshift-origin-repos/pre-install.d/30-openshift-origin-repos