diff --git a/src/includes/blocks/addon-links.liquid b/src/includes/blocks/addon-links.liquid
deleted file mode 100644
index fb5a8b06..00000000
--- a/src/includes/blocks/addon-links.liquid
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="addon-links">
-  {%- if popularPosts.size > 0 -%}
-    {% render "blocks/popular-posts.liquid", popularPosts:popularPosts %}
-  {%- endif -%}
-  {%- if links.size > 0 -%}
-    {% render "blocks/recent-links.liquid", links:links %}
-  {%- endif -%}
-</div>
\ No newline at end of file
diff --git a/src/includes/blocks/index.liquid b/src/includes/blocks/index.liquid
index 45d01c34..f3e6bbe7 100644
--- a/src/includes/blocks/index.liquid
+++ b/src/includes/blocks/index.liquid
@@ -15,6 +15,6 @@
     {%- when 'divider' -%}
       {{ block.markup | markdown }}
     {%- when 'addon_links' -%}
-      {% render "blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %}
+      {% render "blocks/links/addon-links.liquid", popularPosts:collections.popularPosts, links:links %}
   {%- endcase -%}
 {%- endfor -%}
\ No newline at end of file
diff --git a/src/includes/blocks/links/addon-links.liquid b/src/includes/blocks/links/addon-links.liquid
new file mode 100644
index 00000000..4428c8b6
--- /dev/null
+++ b/src/includes/blocks/links/addon-links.liquid
@@ -0,0 +1,9 @@
+
+<div class="addon-links">
+  {%- if popularPosts.size > 0 -%}
+    {% render "blocks/links/popular-posts.liquid", popularPosts:popularPosts %}
+  {%- endif -%}
+  {%- if links.size > 0 -%}
+    {% render "blocks/links/recent-links.liquid", links:links %}
+  {%- endif -%}
+</div>
\ No newline at end of file
diff --git a/src/includes/blocks/popular-posts.liquid b/src/includes/blocks/links/popular-posts.liquid
similarity index 65%
rename from src/includes/blocks/popular-posts.liquid
rename to src/includes/blocks/links/popular-posts.liquid
index 17f18bdc..3e191eab 100644
--- a/src/includes/blocks/popular-posts.liquid
+++ b/src/includes/blocks/links/popular-posts.liquid
@@ -1,8 +1,10 @@
 {%- if popularPosts.size > 0 -%}
   <article>
-    <h3 class="article">
-      {% tablericon "chart-bar-popular" "Popular" %}
-      Popular posts
+    <h3>
+      <a class="article" href="/posts">
+        {% tablericon "chart-bar-popular" "Popular" %}
+        Popular posts
+      </a>
     </h3>
     <ol type="1">
       {%- for post in popularPosts limit: 5 -%}
diff --git a/src/includes/blocks/recent-links.liquid b/src/includes/blocks/links/recent-links.liquid
similarity index 76%
rename from src/includes/blocks/recent-links.liquid
rename to src/includes/blocks/links/recent-links.liquid
index 0a3789a3..1051c9fe 100644
--- a/src/includes/blocks/recent-links.liquid
+++ b/src/includes/blocks/links/recent-links.liquid
@@ -1,8 +1,10 @@
 {%- if links.size > 0 -%}
   <article>
-    <h3 class="link">
-      {% tablericon "link" "Links" %}
-      Recent links
+    <h3>
+      <a class="link" href="/links">
+        {% tablericon "link" "Links" %}
+        Recent links
+      </a>
     </h3>
     <ul>
       {%- for link in links limit: 5 -%}
diff --git a/src/pages/posts/post.html b/src/pages/posts/post.html
index 804e5071..335188e1 100644
--- a/src/pages/posts/post.html
+++ b/src/pages/posts/post.html
@@ -51,6 +51,6 @@ schema: blog
       shows: post.shows
     %}
     {% render "blocks/banners/coffee.liquid" %}
-    {% render "blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %}
+    {% render "blocks/links/addon-links.liquid", popularPosts:collections.popularPosts, links:links %}
   </div>
 </article>
\ No newline at end of file