diff --git a/hot/RackspaceAutoScale.yaml b/contrib/rackspace/RackspaceAutoScale.yaml
similarity index 100%
rename from hot/RackspaceAutoScale.yaml
rename to contrib/rackspace/RackspaceAutoScale.yaml
diff --git a/cfn/F17/WordPress_Single_Instance_Rackspace_Cloud_Servers.template b/contrib/rackspace/WordPress_Single_Instance_Rackspace_Cloud_Servers.template
similarity index 100%
rename from cfn/F17/WordPress_Single_Instance_Rackspace_Cloud_Servers.template
rename to contrib/rackspace/WordPress_Single_Instance_Rackspace_Cloud_Servers.template
diff --git a/tools/validate-templates b/tools/validate-templates
index 874c6cf1..b2f181dc 100755
--- a/tools/validate-templates
+++ b/tools/validate-templates
@@ -5,6 +5,9 @@ import subprocess
 import sys
 
 
+EXCLUDED_DIRS = ('contrib',)
+
+
 def main(args):
     if len(args) != 1:
         raise SystemExit("Takes one argument, the path to the templates")
@@ -12,6 +15,9 @@ def main(args):
     path = args[0]
     got_error = False
     for root, dirs, files in os.walk(path):
+        for excluded in EXCLUDED_DIRS:
+            if excluded in dirs:
+                dirs.remove(excluded)
         for name in files:
             if name.endswith((".yaml", ".template")):
                 got_error = validate(root, name)