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 @@
{{ page.title | titlecase }}
{% endif %}
{% unless page.no_meta %}
- {% include post_date.html %}
+ {% include post/date.html %}
{% endunless %}
- {% if index %}
- {% endif %}
{% endunless %}
{% if index %}
{{ content | exerpt | smart_quotes }}
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
{{ content | smart_quotes }}
{% unless page.no_footer %}
{% endunless %}
@@ -25,7 +25,7 @@ layout: default
{% if site.disqus_short_name and page.comments == true %}
{% endif %}
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 %}
{% if site.disqus_short_name and page.no_comments != true %}
{% endif %}