diff --git a/basics/introduction.md b/_basics/introduction.md
similarity index 100%
rename from basics/introduction.md
rename to _basics/introduction.md
diff --git a/basics/operators.md b/_basics/operators.md
similarity index 100%
rename from basics/operators.md
rename to _basics/operators.md
diff --git a/basics/truthy-and-falsy.md b/_basics/truthy-and-falsy.md
similarity index 100%
rename from basics/truthy-and-falsy.md
rename to _basics/truthy-and-falsy.md
diff --git a/basics/types.md b/_basics/types.md
similarity index 100%
rename from basics/types.md
rename to _basics/types.md
diff --git a/basics/variations.md b/_basics/variations.md
similarity index 100%
rename from basics/variations.md
rename to _basics/variations.md
diff --git a/basics/whitespace.md b/_basics/whitespace.md
similarity index 100%
rename from basics/whitespace.md
rename to _basics/whitespace.md
diff --git a/_config.yml b/_config.yml
index 3510330..a936124 100644
--- a/_config.yml
+++ b/_config.yml
@@ -16,6 +16,15 @@ exclude:
   - node_modules
 keep_files:             ["css"]
 
+# Collections
+collections:
+  basics:
+    output: true
+  tags:
+    output: true
+  filters:
+    output: true
+
 # Plugins
 plugins:
   - jekyll-redirect-from
@@ -26,11 +35,3 @@ defaults:
       path: "" # an empty string here means all files in the project
     values:
       layout: default
-  - scope:
-      path: "filters"
-    values:
-      type: filter
-  - scope:
-      path: "tags"
-    values:
-      type: tag
diff --git a/filters/abs.md b/_filters/abs.md
similarity index 100%
rename from filters/abs.md
rename to _filters/abs.md
diff --git a/filters/append.md b/_filters/append.md
similarity index 100%
rename from filters/append.md
rename to _filters/append.md
diff --git a/filters/at_least.md b/_filters/at_least.md
similarity index 100%
rename from filters/at_least.md
rename to _filters/at_least.md
diff --git a/filters/at_most.md b/_filters/at_most.md
similarity index 100%
rename from filters/at_most.md
rename to _filters/at_most.md
diff --git a/filters/capitalize.md b/_filters/capitalize.md
similarity index 100%
rename from filters/capitalize.md
rename to _filters/capitalize.md
diff --git a/filters/ceil.md b/_filters/ceil.md
similarity index 100%
rename from filters/ceil.md
rename to _filters/ceil.md
diff --git a/filters/compact.md b/_filters/compact.md
similarity index 100%
rename from filters/compact.md
rename to _filters/compact.md
diff --git a/filters/concat.md b/_filters/concat.md
similarity index 100%
rename from filters/concat.md
rename to _filters/concat.md
diff --git a/filters/date.md b/_filters/date.md
similarity index 100%
rename from filters/date.md
rename to _filters/date.md
diff --git a/filters/default.md b/_filters/default.md
similarity index 100%
rename from filters/default.md
rename to _filters/default.md
diff --git a/filters/divided_by.md b/_filters/divided_by.md
similarity index 100%
rename from filters/divided_by.md
rename to _filters/divided_by.md
diff --git a/filters/downcase.md b/_filters/downcase.md
similarity index 100%
rename from filters/downcase.md
rename to _filters/downcase.md
diff --git a/filters/escape.md b/_filters/escape.md
similarity index 100%
rename from filters/escape.md
rename to _filters/escape.md
diff --git a/filters/escape_once.md b/_filters/escape_once.md
similarity index 100%
rename from filters/escape_once.md
rename to _filters/escape_once.md
diff --git a/filters/first.md b/_filters/first.md
similarity index 100%
rename from filters/first.md
rename to _filters/first.md
diff --git a/filters/floor.md b/_filters/floor.md
similarity index 100%
rename from filters/floor.md
rename to _filters/floor.md
diff --git a/filters/join.md b/_filters/join.md
similarity index 100%
rename from filters/join.md
rename to _filters/join.md
diff --git a/filters/last.md b/_filters/last.md
similarity index 100%
rename from filters/last.md
rename to _filters/last.md
diff --git a/filters/lstrip.md b/_filters/lstrip.md
similarity index 100%
rename from filters/lstrip.md
rename to _filters/lstrip.md
diff --git a/filters/map.md b/_filters/map.md
similarity index 100%
rename from filters/map.md
rename to _filters/map.md
diff --git a/filters/minus.md b/_filters/minus.md
similarity index 100%
rename from filters/minus.md
rename to _filters/minus.md
diff --git a/filters/modulo.md b/_filters/modulo.md
similarity index 100%
rename from filters/modulo.md
rename to _filters/modulo.md
diff --git a/filters/newline_to_br.md b/_filters/newline_to_br.md
similarity index 100%
rename from filters/newline_to_br.md
rename to _filters/newline_to_br.md
diff --git a/filters/plus.md b/_filters/plus.md
similarity index 100%
rename from filters/plus.md
rename to _filters/plus.md
diff --git a/filters/prepend.md b/_filters/prepend.md
similarity index 100%
rename from filters/prepend.md
rename to _filters/prepend.md
diff --git a/filters/remove.md b/_filters/remove.md
similarity index 100%
rename from filters/remove.md
rename to _filters/remove.md
diff --git a/filters/remove_first.md b/_filters/remove_first.md
similarity index 100%
rename from filters/remove_first.md
rename to _filters/remove_first.md
diff --git a/filters/replace.md b/_filters/replace.md
similarity index 100%
rename from filters/replace.md
rename to _filters/replace.md
diff --git a/filters/replace_first.md b/_filters/replace_first.md
similarity index 100%
rename from filters/replace_first.md
rename to _filters/replace_first.md
diff --git a/filters/reverse.md b/_filters/reverse.md
similarity index 100%
rename from filters/reverse.md
rename to _filters/reverse.md
diff --git a/filters/round.md b/_filters/round.md
similarity index 100%
rename from filters/round.md
rename to _filters/round.md
diff --git a/filters/rstrip.md b/_filters/rstrip.md
similarity index 100%
rename from filters/rstrip.md
rename to _filters/rstrip.md
diff --git a/filters/size.md b/_filters/size.md
similarity index 100%
rename from filters/size.md
rename to _filters/size.md
diff --git a/filters/slice.md b/_filters/slice.md
similarity index 100%
rename from filters/slice.md
rename to _filters/slice.md
diff --git a/filters/sort.md b/_filters/sort.md
similarity index 100%
rename from filters/sort.md
rename to _filters/sort.md
diff --git a/filters/sort_natural.md b/_filters/sort_natural.md
similarity index 100%
rename from filters/sort_natural.md
rename to _filters/sort_natural.md
diff --git a/filters/split.md b/_filters/split.md
similarity index 100%
rename from filters/split.md
rename to _filters/split.md
diff --git a/filters/strip.md b/_filters/strip.md
similarity index 100%
rename from filters/strip.md
rename to _filters/strip.md
diff --git a/filters/strip_html.md b/_filters/strip_html.md
similarity index 100%
rename from filters/strip_html.md
rename to _filters/strip_html.md
diff --git a/filters/strip_newlines.md b/_filters/strip_newlines.md
similarity index 100%
rename from filters/strip_newlines.md
rename to _filters/strip_newlines.md
diff --git a/filters/times.md b/_filters/times.md
similarity index 100%
rename from filters/times.md
rename to _filters/times.md
diff --git a/filters/truncate.md b/_filters/truncate.md
similarity index 100%
rename from filters/truncate.md
rename to _filters/truncate.md
diff --git a/filters/truncatewords.md b/_filters/truncatewords.md
similarity index 100%
rename from filters/truncatewords.md
rename to _filters/truncatewords.md
diff --git a/filters/uniq.md b/_filters/uniq.md
similarity index 100%
rename from filters/uniq.md
rename to _filters/uniq.md
diff --git a/filters/upcase.md b/_filters/upcase.md
similarity index 100%
rename from filters/upcase.md
rename to _filters/upcase.md
diff --git a/filters/url_decode.md b/_filters/url_decode.md
similarity index 100%
rename from filters/url_decode.md
rename to _filters/url_decode.md
diff --git a/filters/url_encode.md b/_filters/url_encode.md
similarity index 100%
rename from filters/url_encode.md
rename to _filters/url_encode.md
diff --git a/filters/where.md b/_filters/where.md
similarity index 100%
rename from filters/where.md
rename to _filters/where.md
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 3bf203d..b1b58c2 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -15,14 +15,10 @@
         <h3 class="section__header">{{ section | capitalize }}</h3>
 
         <ul class="section__links">
-        {%- for item in site.pages -%}
-          {%- if item.url contains section/ -%}
-            {%- unless item.path contains "index" -%}
-              <li class="section__item">
-                <a href="{{ item.url | relative_url }}" class="section__link {% if item.url contains page.url and page.url != '/' and page.type != 'index' %} section__link--is-active{% endif %}">{{ item.title }}</a>
-              </li>
-            {%- endunless -%}
-          {%- endif -%}
+        {%- for item in site[section] -%}
+            <li class="section__item">
+                <a href="{{ item.url | relative_url }}" class="section__link{% if item.url == page.url %} section__link--is-active{% endif %}">{{ item.title }}</a>
+            </li>
         {%- endfor -%}
         </ul>
       {%- endfor -%}
diff --git a/tags/comment.md b/_tags/comment.md
similarity index 100%
rename from tags/comment.md
rename to _tags/comment.md
diff --git a/tags/control-flow.md b/_tags/control-flow.md
similarity index 100%
rename from tags/control-flow.md
rename to _tags/control-flow.md
diff --git a/tags/iteration.md b/_tags/iteration.md
similarity index 100%
rename from tags/iteration.md
rename to _tags/iteration.md
diff --git a/tags/raw.md b/_tags/raw.md
similarity index 100%
rename from tags/raw.md
rename to _tags/raw.md
diff --git a/tags/variable.md b/_tags/variable.md
similarity index 100%
rename from tags/variable.md
rename to _tags/variable.md