diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html
index 603c2f9..90257b8 100644
--- a/.themes/classic/source/_includes/article.html
+++ b/.themes/classic/source/_includes/article.html
@@ -6,11 +6,9 @@
       <h1 class="entry-title">{{ page.title | titlecase }}</h1>
     {% endif %}
     {% unless page.no_meta %}
-      <p class="meta">{% include post_date.html %}</p>
+      <p class="meta">{% include post/date.html %}</p>
     {% endunless %}
   </header>
-  {% if index %}
-  {% endif %}
 {% endunless %}
 {% if index %}
   <div class="entry-content">{{ content | exerpt | smart_quotes }}</div>
diff --git a/.themes/classic/source/_includes/post_author.html b/.themes/classic/source/_includes/post/author.html
similarity index 100%
rename from .themes/classic/source/_includes/post_author.html
rename to .themes/classic/source/_includes/post/author.html
diff --git a/.themes/classic/source/_includes/post_categories.html b/.themes/classic/source/_includes/post/categories.html
similarity index 100%
rename from .themes/classic/source/_includes/post_categories.html
rename to .themes/classic/source/_includes/post/categories.html
diff --git a/.themes/classic/source/_includes/post_date.html b/.themes/classic/source/_includes/post/date.html
similarity index 100%
rename from .themes/classic/source/_includes/post_date.html
rename to .themes/classic/source/_includes/post/date.html
diff --git a/.themes/classic/source/_includes/disqus_thread.html b/.themes/classic/source/_includes/post/disqus_thread.html
similarity index 100%
rename from .themes/classic/source/_includes/disqus_thread.html
rename to .themes/classic/source/_includes/post/disqus_thread.html
diff --git a/.themes/classic/source/_includes/sharing.html b/.themes/classic/source/_includes/post/sharing.html
similarity index 100%
rename from .themes/classic/source/_includes/sharing.html
rename to .themes/classic/source/_includes/post/sharing.html
diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html
index fe990dd..fb51816 100644
--- a/.themes/classic/source/_layouts/page.html
+++ b/.themes/classic/source/_layouts/page.html
@@ -6,18 +6,18 @@ layout: default
 <article>
   <header>
     <h1 class="entry-title">{{ page.title | titlecase }}</h1>
-    {% unless page.no_meta or !index %}<p class="meta">{% include post_date.html %}</p>{% endunless %}
+    {% unless page.no_meta or !index %}<p class="meta">{% include post/date.html %}</p>{% endunless %}
   </header>
   {{ content | smart_quotes }}
   {% unless page.no_footer %}
     <footer>
       {% if page.date %}
       <p class="meta">
-        {% include post_date.html %}
+        {% include post/date.html %}
       </p>
       {% endif %}
       {% unless page.no_sharing %}
-        {% include sharing.html %}
+        {% include post/sharing.html %}
       {% endunless %}
     </footer>
   {% endunless %}
@@ -25,7 +25,7 @@ layout: default
 {% if site.disqus_short_name and page.comments == true %}
   <section>
     <h1>Comments</h1>
-    <div id="disqus_thread">{% include disqus_thread.html %}</div>
+    <div id="disqus_thread">{% include post/disqus_thread.html %}</div>
   </section>
 {% endif %}
 </div>
diff --git a/.themes/classic/source/_layouts/post.html b/.themes/classic/source/_layouts/post.html
index 1e35ac7..2ec379c 100644
--- a/.themes/classic/source/_layouts/post.html
+++ b/.themes/classic/source/_layouts/post.html
@@ -8,19 +8,19 @@ single: true
   {% include article.html %}
   <footer>
     <p class="meta">
-      {% include post_author.html %}
-      {% include post_date.html %}
-      {% include post_categories.html %}
+      {% include post/author.html %}
+      {% include post/date.html %}
+      {% include post/categories.html %}
     </p>
     {% unless page.no_sharing %}
-    {% include sharing.html %}
+    {% include post/sharing.html %}
     {% endunless %}
   </footer>
 </article>
 {% if site.disqus_short_name and page.no_comments != true %}
   <section>
     <h1>Comments</h1>
-    <div id="disqus_thread">{% include disqus_thread.html %}</div>
+    <div id="disqus_thread">{% include post/disqus_thread.html %}</div>
   </section>
 {% endif %}
 </div>