diff --git a/_config.yml b/_config.yml
index dc4a237b..73d62ca1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -26,55 +26,22 @@ sass:
 excerpt_separator: <!--more-->
 collections_dir: collections
 collections:
-  posts:
-    permalink: /blog/:year/:month/:day/:title/
   evergreen:
     output: true
     permalink: /:name/
-  authors:
-    permalink: /blog/authors/:path/
   devices:
     output: true
     permalink: /devices/:path/
-  browsers:
-    output: true
-    permalink: /browsers/:path/
   software:
     output: true
     permalink: /software/:path/
-  os:
-    output: true
-    permalink: /os/:path/
   providers:
     output: true
     permalink: /providers/:path/
-
-defaults:
-  - scope:
-      path: ""
-      type: "devices"
-    values:
-      layout: recommendation
-  - scope:
-      path: ""
-      type: "browsers"
-    values:
-      layout: recommendation
-  - scope:
-      path: ""
-      type: "software"
-    values:
-      layout: recommendation
-  - scope:
-      path: ""
-      type: "os"
-    values:
-      layout: recommendation
-  - scope:
-      path: ""
-      type: "providers"
-    values:
-      layout: recommendation
+  posts:
+    permalink: /blog/:year/:month/:day/:title/
+  authors:
+    permalink: /blog/authors/:path/
 
 build:
      date:
diff --git a/collections/_browsers/brave.md b/_data/software/browsers/brave.md
similarity index 100%
rename from collections/_browsers/brave.md
rename to _data/software/browsers/brave.md
diff --git a/collections/_browsers/bromite.md b/_data/software/browsers/bromite.md
similarity index 100%
rename from collections/_browsers/bromite.md
rename to _data/software/browsers/bromite.md
diff --git a/collections/_browsers/chromium.md b/_data/software/browsers/chromium.md
similarity index 100%
rename from collections/_browsers/chromium.md
rename to _data/software/browsers/chromium.md
diff --git a/collections/_browsers/firefox.html b/_data/software/browsers/firefox.html
similarity index 100%
rename from collections/_browsers/firefox.html
rename to _data/software/browsers/firefox.html
diff --git a/collections/_browsers/google-chrome.md b/_data/software/browsers/google-chrome.md
similarity index 100%
rename from collections/_browsers/google-chrome.md
rename to _data/software/browsers/google-chrome.md
diff --git a/collections/_browsers/safari.md b/_data/software/browsers/safari.md
similarity index 100%
rename from collections/_browsers/safari.md
rename to _data/software/browsers/safari.md
diff --git a/collections/_browsers/tor-browser.md b/_data/software/browsers/tor-browser.md
similarity index 100%
rename from collections/_browsers/tor-browser.md
rename to _data/software/browsers/tor-browser.md
diff --git a/collections/_browsers/ungoogled-chromium.md b/_data/software/browsers/ungoogled-chromium.md
similarity index 100%
rename from collections/_browsers/ungoogled-chromium.md
rename to _data/software/browsers/ungoogled-chromium.md