diff --git a/_config.yml b/_config.yml
index 68a1a6c4..e4682e21 100644
--- a/_config.yml
+++ b/_config.yml
@@ -4,10 +4,6 @@ url: "http://liquidmarkup.org" # the base hostname & protocol for your site
 markdown: kramdown
 highlighter: pygments
 permalink: /:year/:month/:day/:basename:output_ext
-collections:
-  docs:
-    output: true
-    permalink: /docs/:path/
 exclude:
   - README.md
   - CNAME
@@ -19,14 +15,14 @@ defaults:
     values:
       layout: "default"
   - scope:
-      path: "docs/basics"
+      path: "basics"
     values:
       type: "basics"
   - scope:
-      path: "docs/filters"
+      path: "filters"
     values:
       type: "filters"
   - scope:
-      path: "docs/tags"
+      path: "tags"
     values:
       type: "tags"
diff --git a/_docs/tags/control-flow/case-when b/_docs/tags/control-flow/case-when
deleted file mode 100644
index f79ea848..00000000
--- a/_docs/tags/control-flow/case-when
+++ /dev/null
@@ -1,27 +0,0 @@
-## case/when
-
-<p>Creates a switch statement to compare a variable with different values. <code>case</code> initializes the switch statement, and <code>when</code> compares its values.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-{% assign handle = 'cake' %}
-{% case handle %}
-  {% when 'cake' %}
-     This is a cake
-  {% when 'cookie' %}
-     This is a cookie
-  {% else %}
-     This is not a cake nor a cookie
-{% endcase %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-This is a cake
-{% endraw %}{% endhighlight %}
-</div>
diff --git a/_docs/tags/control-flow/elsif-else.md b/_docs/tags/control-flow/elsif-else.md
deleted file mode 100644
index e08623d1..00000000
--- a/_docs/tags/control-flow/elsif-else.md
+++ /dev/null
@@ -1,26 +0,0 @@
-## elsif / else
-
-<p>Adds more conditions within an <code>if</code> or <code>unless</code> block.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-  <!-- If customer.name = 'anonymous' -->
-  {% if customer.name == 'kevin' %}
-    Hey Kevin!
-  {% elsif customer.name == 'anonymous' %}
-    Hey Anonymous!
-  {% else %}
-    Hi Stranger!
-  {% endif %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-Hey Anonymous!
-{% endraw %}{% endhighlight %}
-</div>
diff --git a/_docs/tags/control-flow/if.md b/_docs/tags/control-flow/if.md
deleted file mode 100644
index f41b842a..00000000
--- a/_docs/tags/control-flow/if.md
+++ /dev/null
@@ -1,21 +0,0 @@
-## if
-
-<p>Executes a block of code only if a certain condition is met.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-{% if product.title == 'Awesome Shoes' %}
-  These shoes are awesome!
-{% endif %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-These shoes are awesome!
-{% endraw %}{% endhighlight %}
-</div>
diff --git a/_docs/tags/control-flow/unless.md b/_docs/tags/control-flow/unless.md
deleted file mode 100644
index 3733404c..00000000
--- a/_docs/tags/control-flow/unless.md
+++ /dev/null
@@ -1,31 +0,0 @@
-## unless
-
-<p>Similar to <code>if</code>, but executes a block of code only if a certain condition is <strong>not</strong> met.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-  {% unless product.title == 'Awesome Shoes' %}
-    These shoes are not awesome.
-  {% endunless %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-These shoes are not awesome.
-{% endraw %}{% endhighlight %}
-</div>
-
-This would be the equivalent of doing the following:
-
-<div>
-{% highlight html %}{% raw %}
-  {% if product.title != 'Awesome Shoes' %}
-    These shoes are not awesome.
-  {% endif %}
-{% endraw %}{% endhighlight %}
-</div>
diff --git a/_layouts/default.html b/_layouts/default.html
index c1ece511..28a03eb8 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -27,11 +27,13 @@
           <li>
             <h3 class="section__header">Basics</h3>
             <ul class="section__links">
-              {% for doc in site.docs %}
+              {% for doc in site.pages %}
                 {% if doc.type == "basics" %}
+                  {% unless doc.path contains "index.html" %}
                   <li>
-                    <a href="/docs/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
+                    <a href="/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
                   </li>
+                  {% endunless %}
                 {% endif %}
               {% endfor %}
             </ul>
@@ -43,11 +45,13 @@
           <li>
             <h3 class="section__header">Tags</h3>
             <ul class="section__links">
-              {% for doc in site.docs %}
+              {% for doc in site.pages %}
                 {% if doc.type == "tags" %}
+                  {% unless doc.path contains "index.html" %}
                   <li>
-                    <a href="/docs/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
+                    <a href="/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
                   </li>
+                  {% endunless %}
                 {% endif %}
               {% endfor %}
             </ul>
@@ -59,12 +63,13 @@
           <li>
             <h3 class="section__header">Filters</h3>
             <ul class="section__links">
-              {% for doc in site.docs %}
+              {% for doc in site.pages %}
                 {% if doc.type == "filters" %}
-                  {% capture doc_url %}/docs/{{ doc.type }}/{{ doc.title | slugify }}/{% endcapture %}
+                  {% unless doc.path contains "index.html" %}
                   <li>
-                    <a href="{{ doc_url }}" class="section__link {% if doc_url == page.url %}section__link--is-active{% endif %}">{{ doc.title }}</a>
+                    <a href="/{{ doc.type }}/{{ doc.title | slugify }}" class="section__link">{{ doc.title }}</a>
                   </li>
+                  {% endunless %}
                 {% endif %}
               {% endfor %}
             </ul>
diff --git a/_docs/basics/handles.md b/basics/handles.md
similarity index 100%
rename from _docs/basics/handles.md
rename to basics/handles.md
diff --git a/_docs/basics/operators.md b/basics/operators.md
similarity index 100%
rename from _docs/basics/operators.md
rename to basics/operators.md
diff --git a/_docs/basics/truthy-and-falsy.md b/basics/truthy-and-falsy.md
similarity index 100%
rename from _docs/basics/truthy-and-falsy.md
rename to basics/truthy-and-falsy.md
diff --git a/_docs/basics/types.md b/basics/types.md
similarity index 100%
rename from _docs/basics/types.md
rename to basics/types.md
diff --git a/_docs/filters/append.md b/filters/append.md
similarity index 100%
rename from _docs/filters/append.md
rename to filters/append.md
diff --git a/_docs/filters/capitalize.md b/filters/capitalize.md
similarity index 100%
rename from _docs/filters/capitalize.md
rename to filters/capitalize.md
diff --git a/_docs/filters/ceil.md b/filters/ceil.md
similarity index 100%
rename from _docs/filters/ceil.md
rename to filters/ceil.md
diff --git a/_docs/filters/date.md b/filters/date.md
similarity index 100%
rename from _docs/filters/date.md
rename to filters/date.md
diff --git a/_docs/filters/default.md b/filters/default.md
similarity index 100%
rename from _docs/filters/default.md
rename to filters/default.md
diff --git a/_docs/filters/divided_by.md b/filters/divided_by.md
similarity index 100%
rename from _docs/filters/divided_by.md
rename to filters/divided_by.md
diff --git a/_docs/filters/downcase.md b/filters/downcase.md
similarity index 100%
rename from _docs/filters/downcase.md
rename to filters/downcase.md
diff --git a/_docs/filters/escape.md b/filters/escape.md
similarity index 100%
rename from _docs/filters/escape.md
rename to filters/escape.md
diff --git a/_docs/filters/escape_once.md b/filters/escape_once.md
similarity index 100%
rename from _docs/filters/escape_once.md
rename to filters/escape_once.md
diff --git a/_docs/filters/first.md b/filters/first.md
similarity index 100%
rename from _docs/filters/first.md
rename to filters/first.md
diff --git a/_docs/filters/floor.md b/filters/floor.md
similarity index 100%
rename from _docs/filters/floor.md
rename to filters/floor.md
diff --git a/_docs/filters/join.md b/filters/join.md
similarity index 100%
rename from _docs/filters/join.md
rename to filters/join.md
diff --git a/_docs/filters/last.md b/filters/last.md
similarity index 100%
rename from _docs/filters/last.md
rename to filters/last.md
diff --git a/_docs/filters/lstrip.md b/filters/lstrip.md
similarity index 100%
rename from _docs/filters/lstrip.md
rename to filters/lstrip.md
diff --git a/_docs/filters/map.md b/filters/map.md
similarity index 100%
rename from _docs/filters/map.md
rename to filters/map.md
diff --git a/_docs/filters/minus.md b/filters/minus.md
similarity index 100%
rename from _docs/filters/minus.md
rename to filters/minus.md
diff --git a/_docs/filters/modulo.md b/filters/modulo.md
similarity index 100%
rename from _docs/filters/modulo.md
rename to filters/modulo.md
diff --git a/_docs/filters/newline_to_br.md b/filters/newline_to_br.md
similarity index 100%
rename from _docs/filters/newline_to_br.md
rename to filters/newline_to_br.md
diff --git a/_docs/filters/plus.md b/filters/plus.md
similarity index 100%
rename from _docs/filters/plus.md
rename to filters/plus.md
diff --git a/_docs/filters/prepend.md b/filters/prepend.md
similarity index 100%
rename from _docs/filters/prepend.md
rename to filters/prepend.md
diff --git a/_docs/filters/remove.md b/filters/remove.md
similarity index 100%
rename from _docs/filters/remove.md
rename to filters/remove.md
diff --git a/_docs/filters/remove_first.md b/filters/remove_first.md
similarity index 100%
rename from _docs/filters/remove_first.md
rename to filters/remove_first.md
diff --git a/_docs/filters/replace.md b/filters/replace.md
similarity index 100%
rename from _docs/filters/replace.md
rename to filters/replace.md
diff --git a/_docs/filters/replace_first.md b/filters/replace_first.md
similarity index 100%
rename from _docs/filters/replace_first.md
rename to filters/replace_first.md
diff --git a/_docs/filters/reverse.md b/filters/reverse.md
similarity index 100%
rename from _docs/filters/reverse.md
rename to filters/reverse.md
diff --git a/_docs/filters/round.md b/filters/round.md
similarity index 100%
rename from _docs/filters/round.md
rename to filters/round.md
diff --git a/_docs/filters/rstrip.md b/filters/rstrip.md
similarity index 100%
rename from _docs/filters/rstrip.md
rename to filters/rstrip.md
diff --git a/_docs/filters/size.md b/filters/size.md
similarity index 100%
rename from _docs/filters/size.md
rename to filters/size.md
diff --git a/_docs/filters/slice.md b/filters/slice.md
similarity index 100%
rename from _docs/filters/slice.md
rename to filters/slice.md
diff --git a/_docs/filters/sort.md b/filters/sort.md
similarity index 100%
rename from _docs/filters/sort.md
rename to filters/sort.md
diff --git a/_docs/filters/split.md b/filters/split.md
similarity index 100%
rename from _docs/filters/split.md
rename to filters/split.md
diff --git a/_docs/filters/strip.md b/filters/strip.md
similarity index 100%
rename from _docs/filters/strip.md
rename to filters/strip.md
diff --git a/_docs/filters/strip_html.md b/filters/strip_html.md
similarity index 100%
rename from _docs/filters/strip_html.md
rename to filters/strip_html.md
diff --git a/_docs/filters/strip_newlines.md b/filters/strip_newlines.md
similarity index 100%
rename from _docs/filters/strip_newlines.md
rename to filters/strip_newlines.md
diff --git a/_docs/filters/times.md b/filters/times.md
similarity index 100%
rename from _docs/filters/times.md
rename to filters/times.md
diff --git a/_docs/filters/truncate.md b/filters/truncate.md
similarity index 100%
rename from _docs/filters/truncate.md
rename to filters/truncate.md
diff --git a/_docs/filters/truncatewords.md b/filters/truncatewords.md
similarity index 100%
rename from _docs/filters/truncatewords.md
rename to filters/truncatewords.md
diff --git a/_docs/filters/uniq.md b/filters/uniq.md
similarity index 100%
rename from _docs/filters/uniq.md
rename to filters/uniq.md
diff --git a/_docs/filters/upcase.md b/filters/upcase.md
similarity index 100%
rename from _docs/filters/upcase.md
rename to filters/upcase.md
diff --git a/_docs/filters/url_encode.md b/filters/url_encode.md
similarity index 100%
rename from _docs/filters/url_encode.md
rename to filters/url_encode.md
diff --git a/tags/control-flow/case-when.md b/tags/control-flow/case-when.md
deleted file mode 100644
index ddc67c8c..00000000
--- a/tags/control-flow/case-when.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-category: control-flow
----
-
-
-## case/when
-
-<p>Creates a switch statement to compare a variable with different values. <code>case</code> initializes the switch statement, and <code>when</code> compares its values.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-{% assign handle = 'cake' %}
-{% case handle %}
-  {% when 'cake' %}
-     This is a cake
-  {% when 'cookie' %}
-     This is a cookie
-  {% else %}
-     This is not a cake nor a cookie
-{% endcase %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-This is a cake
-{% endraw %}{% endhighlight %}
-</div>
diff --git a/tags/control-flow/elsif-else.md b/tags/control-flow/elsif-else.md
deleted file mode 100644
index e08623d1..00000000
--- a/tags/control-flow/elsif-else.md
+++ /dev/null
@@ -1,26 +0,0 @@
-## elsif / else
-
-<p>Adds more conditions within an <code>if</code> or <code>unless</code> block.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-  <!-- If customer.name = 'anonymous' -->
-  {% if customer.name == 'kevin' %}
-    Hey Kevin!
-  {% elsif customer.name == 'anonymous' %}
-    Hey Anonymous!
-  {% else %}
-    Hi Stranger!
-  {% endif %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-Hey Anonymous!
-{% endraw %}{% endhighlight %}
-</div>
diff --git a/tags/control-flow/if.md b/tags/control-flow/if.md
deleted file mode 100644
index f41b842a..00000000
--- a/tags/control-flow/if.md
+++ /dev/null
@@ -1,21 +0,0 @@
-## if
-
-<p>Executes a block of code only if a certain condition is met.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-{% if product.title == 'Awesome Shoes' %}
-  These shoes are awesome!
-{% endif %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-These shoes are awesome!
-{% endraw %}{% endhighlight %}
-</div>
diff --git a/tags/control-flow/index.html b/tags/control-flow/index.html
deleted file mode 100644
index 9d08db02..00000000
--- a/tags/control-flow/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: default
----
-
-TAGS!
-
-{% for doc in site.collections["tags"].docs %}
-  <div id="{{ doc.title }}" class="content__item">
-    <h2 class="content__header">{{ doc.title }}</h2>
-    <div class="content">
-      {{ doc.content }}
-    </div>
-  </div>
-{% endfor %}
diff --git a/tags/control-flow/unless.md b/tags/control-flow/unless.md
deleted file mode 100644
index 3733404c..00000000
--- a/tags/control-flow/unless.md
+++ /dev/null
@@ -1,31 +0,0 @@
-## unless
-
-<p>Similar to <code>if</code>, but executes a block of code only if a certain condition is <strong>not</strong> met.</p>
-
-<p class="input">Input</p>
-
-<div>
-{% highlight html %}{% raw %}
-  {% unless product.title == 'Awesome Shoes' %}
-    These shoes are not awesome.
-  {% endunless %}
-{% endraw %}{% endhighlight %}
-</div>
-
-<p class="output">Output</p>
-
-<div>
-{% highlight html %}{% raw %}
-These shoes are not awesome.
-{% endraw %}{% endhighlight %}
-</div>
-
-This would be the equivalent of doing the following:
-
-<div>
-{% highlight html %}{% raw %}
-  {% if product.title != 'Awesome Shoes' %}
-    These shoes are not awesome.
-  {% endif %}
-{% endraw %}{% endhighlight %}
-</div>
diff --git a/tags/control.flow.md b/tags/control.flow.md
new file mode 100644
index 00000000..881df7df
--- /dev/null
+++ b/tags/control.flow.md
@@ -0,0 +1,113 @@
+---
+---
+
+TAGS!
+
+## case/when
+
+<p>Creates a switch statement to compare a variable with different values. <code>case</code> initializes the switch statement, and <code>when</code> compares its values.</p>
+
+<p class="input">Input</p>
+
+<div>
+{% highlight html %}{% raw %}
+{% assign handle = 'cake' %}
+{% case handle %}
+  {% when 'cake' %}
+     This is a cake
+  {% when 'cookie' %}
+     This is a cookie
+  {% else %}
+     This is not a cake nor a cookie
+{% endcase %}
+{% endraw %}{% endhighlight %}
+</div>
+
+<p class="output">Output</p>
+
+<div>
+{% highlight html %}{% raw %}
+This is a cake
+{% endraw %}{% endhighlight %}
+</div>
+
+## if
+
+<p>Executes a block of code only if a certain condition is met.</p>
+
+<p class="input">Input</p>
+
+<div>
+{% highlight html %}{% raw %}
+{% if product.title == 'Awesome Shoes' %}
+  These shoes are awesome!
+{% endif %}
+{% endraw %}{% endhighlight %}
+</div>
+
+<p class="output">Output</p>
+
+<div>
+{% highlight html %}{% raw %}
+These shoes are awesome!
+{% endraw %}{% endhighlight %}
+</div>
+
+## elsif / else
+
+<p>Adds more conditions within an <code>if</code> or <code>unless</code> block.</p>
+
+<p class="input">Input</p>
+
+<div>
+{% highlight html %}{% raw %}
+  <!-- If customer.name = 'anonymous' -->
+  {% if customer.name == 'kevin' %}
+    Hey Kevin!
+  {% elsif customer.name == 'anonymous' %}
+    Hey Anonymous!
+  {% else %}
+    Hi Stranger!
+  {% endif %}
+{% endraw %}{% endhighlight %}
+</div>
+
+<p class="output">Output</p>
+
+<div>
+{% highlight html %}{% raw %}
+Hey Anonymous!
+{% endraw %}{% endhighlight %}
+</div>
+
+## unless
+
+<p>Similar to <code>if</code>, but executes a block of code only if a certain condition is <strong>not</strong> met.</p>
+
+<p class="input">Input</p>
+
+<div>
+{% highlight html %}{% raw %}
+  {% unless product.title == 'Awesome Shoes' %}
+    These shoes are not awesome.
+  {% endunless %}
+{% endraw %}{% endhighlight %}
+</div>
+
+<p class="output">Output</p>
+
+<div>
+{% highlight html %}{% raw %}
+These shoes are not awesome.
+{% endraw %}{% endhighlight %}
+</div>
+
+This would be the equivalent of doing the following:
+
+<div>
+{% highlight html %}{% raw %}
+  {% if product.title != 'Awesome Shoes' %}
+    These shoes are not awesome.
+  {% endif %}
+{% endraw %}{% endhighlight %}
+</div>
diff --git a/_docs/tags/iteration.md b/tags/iteration.md
similarity index 100%
rename from _docs/tags/iteration.md
rename to tags/iteration.md
diff --git a/_docs/tags/theme.md b/tags/theme.md
similarity index 100%
rename from _docs/tags/theme.md
rename to tags/theme.md
diff --git a/_docs/tags/variable.md b/tags/variable.md
similarity index 100%
rename from _docs/tags/variable.md
rename to tags/variable.md