diff --git a/cfn/AutoScalingCeilometer.yaml b/cfn/F17/AutoScalingCeilometer.yaml
similarity index 100%
rename from cfn/AutoScalingCeilometer.yaml
rename to cfn/F17/AutoScalingCeilometer.yaml
diff --git a/cfn/AutoScalingMultiAZSample.template b/cfn/F17/AutoScalingMultiAZSample.template
similarity index 100%
rename from cfn/AutoScalingMultiAZSample.template
rename to cfn/F17/AutoScalingMultiAZSample.template
diff --git a/cfn/AutoScalingMultiAZSample.yaml b/cfn/F17/AutoScalingMultiAZSample.yaml
similarity index 100%
rename from cfn/AutoScalingMultiAZSample.yaml
rename to cfn/F17/AutoScalingMultiAZSample.yaml
diff --git a/cfn/EC2WithEBSSample.template b/cfn/F17/EC2WithEBSSample.template
similarity index 100%
rename from cfn/EC2WithEBSSample.template
rename to cfn/F17/EC2WithEBSSample.template
diff --git a/cfn/HAProxy_Single_Instance.template b/cfn/F17/HAProxy_Single_Instance.template
similarity index 100%
rename from cfn/HAProxy_Single_Instance.template
rename to cfn/F17/HAProxy_Single_Instance.template
diff --git a/cfn/InstanceGroup.template b/cfn/F17/InstanceGroup.template
similarity index 100%
rename from cfn/InstanceGroup.template
rename to cfn/F17/InstanceGroup.template
diff --git a/cfn/MySQL_Single_Instance.template b/cfn/F17/MySQL_Single_Instance.template
similarity index 100%
rename from cfn/MySQL_Single_Instance.template
rename to cfn/F17/MySQL_Single_Instance.template
diff --git a/cfn/PuppetMaster_Single_Instance.template b/cfn/F17/PuppetMaster_Single_Instance.template
similarity index 100%
rename from cfn/PuppetMaster_Single_Instance.template
rename to cfn/F17/PuppetMaster_Single_Instance.template
diff --git a/cfn/Quantum.template b/cfn/F17/Quantum.template
similarity index 100%
rename from cfn/Quantum.template
rename to cfn/F17/Quantum.template
diff --git a/cfn/Quantum.yaml b/cfn/F17/Quantum.yaml
similarity index 100%
rename from cfn/Quantum.yaml
rename to cfn/F17/Quantum.yaml
diff --git a/cfn/Quantum_floating.template b/cfn/F17/Quantum_floating.template
similarity index 100%
rename from cfn/Quantum_floating.template
rename to cfn/F17/Quantum_floating.template
diff --git a/cfn/Rails_Single_Instance.template b/cfn/F17/Rails_Single_Instance.template
similarity index 100%
rename from cfn/Rails_Single_Instance.template
rename to cfn/F17/Rails_Single_Instance.template
diff --git a/cfn/S3_Single_Instance.template b/cfn/F17/S3_Single_Instance.template
similarity index 100%
rename from cfn/S3_Single_Instance.template
rename to cfn/F17/S3_Single_Instance.template
diff --git a/cfn/Swift.template b/cfn/F17/Swift.template
similarity index 100%
rename from cfn/Swift.template
rename to cfn/F17/Swift.template
diff --git a/cfn/WordPress_2_Instances.template b/cfn/F17/WordPress_2_Instances.template
similarity index 100%
rename from cfn/WordPress_2_Instances.template
rename to cfn/F17/WordPress_2_Instances.template
diff --git a/cfn/WordPress_2_Instances_With_EBS.template b/cfn/F17/WordPress_2_Instances_With_EBS.template
similarity index 100%
rename from cfn/WordPress_2_Instances_With_EBS.template
rename to cfn/F17/WordPress_2_Instances_With_EBS.template
diff --git a/cfn/WordPress_2_Instances_With_EBS_EIP.template b/cfn/F17/WordPress_2_Instances_With_EBS_EIP.template
similarity index 100%
rename from cfn/WordPress_2_Instances_With_EBS_EIP.template
rename to cfn/F17/WordPress_2_Instances_With_EBS_EIP.template
diff --git a/cfn/WordPress_And_Http.template b/cfn/F17/WordPress_And_Http.template
similarity index 100%
rename from cfn/WordPress_And_Http.template
rename to cfn/F17/WordPress_And_Http.template
diff --git a/cfn/WordPress_Composed_Instances.template b/cfn/F17/WordPress_Composed_Instances.template
similarity index 100%
rename from cfn/WordPress_Composed_Instances.template
rename to cfn/F17/WordPress_Composed_Instances.template
diff --git a/cfn/WordPress_NoKey.template b/cfn/F17/WordPress_NoKey.template
similarity index 100%
rename from cfn/WordPress_NoKey.template
rename to cfn/F17/WordPress_NoKey.template
diff --git a/cfn/WordPress_Single_Instance.template b/cfn/F17/WordPress_Single_Instance.template
similarity index 100%
rename from cfn/WordPress_Single_Instance.template
rename to cfn/F17/WordPress_Single_Instance.template
diff --git a/cfn/WordPress_Single_Instance.yaml b/cfn/F17/WordPress_Single_Instance.yaml
similarity index 100%
rename from cfn/WordPress_Single_Instance.yaml
rename to cfn/F17/WordPress_Single_Instance.yaml
diff --git a/cfn/WordPress_Single_Instance_Rackspace_Cloud_Servers.template b/cfn/F17/WordPress_Single_Instance_Rackspace_Cloud_Servers.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_Rackspace_Cloud_Servers.template
rename to cfn/F17/WordPress_Single_Instance_Rackspace_Cloud_Servers.template
diff --git a/cfn/WordPress_Single_Instance_With_EBS.template b/cfn/F17/WordPress_Single_Instance_With_EBS.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_With_EBS.template
rename to cfn/F17/WordPress_Single_Instance_With_EBS.template
diff --git a/cfn/WordPress_Single_Instance_With_EBS_EIP.template b/cfn/F17/WordPress_Single_Instance_With_EBS_EIP.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_With_EBS_EIP.template
rename to cfn/F17/WordPress_Single_Instance_With_EBS_EIP.template
diff --git a/cfn/WordPress_Single_Instance_With_EIP.template b/cfn/F17/WordPress_Single_Instance_With_EIP.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_With_EIP.template
rename to cfn/F17/WordPress_Single_Instance_With_EIP.template
diff --git a/cfn/WordPress_Single_Instance_With_HA.template b/cfn/F17/WordPress_Single_Instance_With_HA.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_With_HA.template
rename to cfn/F17/WordPress_Single_Instance_With_HA.template
diff --git a/cfn/WordPress_Single_Instance_With_HA.yaml b/cfn/F17/WordPress_Single_Instance_With_HA.yaml
similarity index 100%
rename from cfn/WordPress_Single_Instance_With_HA.yaml
rename to cfn/F17/WordPress_Single_Instance_With_HA.yaml
diff --git a/cfn/WordPress_Single_Instance_With_HA_AccessPolicy.template b/cfn/F17/WordPress_Single_Instance_With_HA_AccessPolicy.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_With_HA_AccessPolicy.template
rename to cfn/F17/WordPress_Single_Instance_With_HA_AccessPolicy.template
diff --git a/cfn/WordPress_Single_Instance_With_IHA.template b/cfn/F17/WordPress_Single_Instance_With_IHA.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_With_IHA.template
rename to cfn/F17/WordPress_Single_Instance_With_IHA.template
diff --git a/cfn/WordPress_Single_Instance_With_Quantum.template b/cfn/F17/WordPress_Single_Instance_With_Quantum.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_With_Quantum.template
rename to cfn/F17/WordPress_Single_Instance_With_Quantum.template
diff --git a/cfn/WordPress_Single_Instance_deb.template b/cfn/F17/WordPress_Single_Instance_deb.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_deb.template
rename to cfn/F17/WordPress_Single_Instance_deb.template
diff --git a/cfn/WordPress_Single_Instance_gold.template b/cfn/F17/WordPress_Single_Instance_gold.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_gold.template
rename to cfn/F17/WordPress_Single_Instance_gold.template
diff --git a/cfn/WordPress_Single_Instance_puppet.template b/cfn/F17/WordPress_Single_Instance_puppet.template
similarity index 100%
rename from cfn/WordPress_Single_Instance_puppet.template
rename to cfn/F17/WordPress_Single_Instance_puppet.template
diff --git a/cfn/WordPress_With_LB.template b/cfn/F17/WordPress_With_LB.template
similarity index 100%
rename from cfn/WordPress_With_LB.template
rename to cfn/F17/WordPress_With_LB.template
diff --git a/cfn/WordPress_With_RDS.template b/cfn/F17/WordPress_With_RDS.template
similarity index 100%
rename from cfn/WordPress_With_RDS.template
rename to cfn/F17/WordPress_With_RDS.template
diff --git a/cfn/getting_started.template b/cfn/F17/getting_started.template
similarity index 100%
rename from cfn/getting_started.template
rename to cfn/F17/getting_started.template
diff --git a/cfn/WordPress_NoKey_F18.yaml b/cfn/F18/WordPress_NoKey.yaml
similarity index 100%
rename from cfn/WordPress_NoKey_F18.yaml
rename to cfn/F18/WordPress_NoKey.yaml