diff --git a/h5bp/basic.conf b/h5bp/basic.conf
new file mode 100644
index 0000000..2b85ad4
--- /dev/null
+++ b/h5bp/basic.conf
@@ -0,0 +1,6 @@
+# Basic h5bp rules
+
+include h5bp/directive-only/x-ua-compatible.conf;
+include h5bp/location/expires.conf;
+include h5bp/location/cross-domain-fonts.conf;
+include h5bp/location/protect-system-files.conf;
diff --git a/h5bp/cache-file-descriptors.conf b/h5bp/directive-only/cache-file-descriptors.conf
similarity index 100%
rename from h5bp/cache-file-descriptors.conf
rename to h5bp/directive-only/cache-file-descriptors.conf
diff --git a/h5bp/cross-domain-ajax.conf b/h5bp/directive-only/cross-domain-ajax.conf
similarity index 100%
rename from h5bp/cross-domain-ajax.conf
rename to h5bp/directive-only/cross-domain-ajax.conf
diff --git a/h5bp/no-transform.conf b/h5bp/directive-only/no-transform.conf
similarity index 100%
rename from h5bp/no-transform.conf
rename to h5bp/directive-only/no-transform.conf
diff --git a/h5bp/x-ua-compatible.conf b/h5bp/directive-only/x-ua-compatible.conf
similarity index 100%
rename from h5bp/x-ua-compatible.conf
rename to h5bp/directive-only/x-ua-compatible.conf
diff --git a/h5bp/h5bp.conf b/h5bp/h5bp.conf
deleted file mode 100644
index 671ae58..0000000
--- a/h5bp/h5bp.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Basic h5bp rules
-
-include h5bp/expires.conf;
-include h5bp/x-ua-compatible.conf;
-include h5bp/cross-domain-fonts.conf;
-include h5bp/protect-system-files.conf;
diff --git a/h5bp/cache-busting.conf b/h5bp/location/cache-busting.conf
similarity index 100%
rename from h5bp/cache-busting.conf
rename to h5bp/location/cache-busting.conf
diff --git a/h5bp/cross-domain-fonts.conf b/h5bp/location/cross-domain-fonts.conf
similarity index 100%
rename from h5bp/cross-domain-fonts.conf
rename to h5bp/location/cross-domain-fonts.conf
diff --git a/h5bp/expires.conf b/h5bp/location/expires.conf
similarity index 100%
rename from h5bp/expires.conf
rename to h5bp/location/expires.conf
diff --git a/h5bp/protect-system-files.conf b/h5bp/location/protect-system-files.conf
similarity index 100%
rename from h5bp/protect-system-files.conf
rename to h5bp/location/protect-system-files.conf
diff --git a/sites-available/example.com b/sites-available/example.com
index 0ae72f2..099f026 100644
--- a/sites-available/example.com
+++ b/sites-available/example.com
@@ -30,6 +30,6 @@ server {
   # Custom 404 page
   error_page 404 /404.html;
 
-  # Include the component config parts for h5bp
-  include h5bp/h5bp.conf;
+  # Include the basic h5bp config set
+  include h5bp/basic.conf;
 }