diff --git a/apps/addons/helpers.py b/apps/addons/helpers.py
index 1452d86337..23e22f64bd 100644
--- a/apps/addons/helpers.py
+++ b/apps/addons/helpers.py
@@ -123,14 +123,14 @@ def tags_box(context, addon, dev_tags, user_tags):
     return c
 
 
-@register.inclusion_tag('addons/listing_items.html')
+@register.inclusion_tag('addons/listing/items.html')
 @jinja2.contextfunction
 def addon_listing_items(context, addons, show_added_date=False):
     """`show_added_date` will show the added versus the updated date."""
     return new_context(**locals())
 
 
-@register.inclusion_tag('addons/listing_items_compact.html')
+@register.inclusion_tag('addons/listing/items_compact.html')
 @jinja2.contextfunction
 def addon_listing_items_compact(context, addons, show_added_date=False):
     """`show_added_date` will show the added versus the updated date."""
diff --git a/apps/addons/templates/addons/listing/items.html b/apps/addons/templates/addons/listing/items.html
new file mode 100644
index 0000000000..6da4e126ec
--- /dev/null
+++ b/apps/addons/templates/addons/listing/items.html
@@ -0,0 +1,18 @@
+{% from "addons/listing/macros.html" import heading, item_info %}
+{% cache addons %}
+{% for addon in addons %}
+  {% cache addon %}
+    <div class="item">
+      {{ heading(addon) }}
+      <div class="item-info">
+        {{ install_button(addon) }}
+        {{ item_info(addon, amo) }}
+      </div>
+      <blockquote>
+        <div>{{ addon.description|truncate(250)|nl2br }}</div>
+        {{ support_addon(addon) }}
+      </blockquote>
+    </div>
+  {% endcache %}
+{% endfor %}
+{% endcache %}
diff --git a/apps/addons/templates/addons/listing_items_compact.html b/apps/addons/templates/addons/listing/items_compact.html
similarity index 85%
rename from apps/addons/templates/addons/listing_items_compact.html
rename to apps/addons/templates/addons/listing/items_compact.html
index d35abfba07..aa0dc92632 100644
--- a/apps/addons/templates/addons/listing_items_compact.html
+++ b/apps/addons/templates/addons/listing/items_compact.html
@@ -1,4 +1,4 @@
-{% from "addons/listing_items.html" import heading, item_info %}
+{% from "addons/listing/macros.html" import heading, item_info %}
 
 {% cache addons %}
 {% for addon in addons %}
diff --git a/apps/addons/templates/addons/listing_items.html b/apps/addons/templates/addons/listing/macros.html
similarity index 70%
rename from apps/addons/templates/addons/listing_items.html
rename to apps/addons/templates/addons/listing/macros.html
index 3e82f4db27..b5c8a96aa0 100644
--- a/apps/addons/templates/addons/listing_items.html
+++ b/apps/addons/templates/addons/listing/macros.html
@@ -32,21 +32,3 @@
     </p>
   {% endif %}
 {% endmacro %}
-
-{% cache addons %}
-{% for addon in addons %}
-  {% cache addon %}
-    <div class="item">
-      {{ heading(addon) }}
-      <div class="item-info">
-        {{ install_button(addon) }}
-        {{ item_info(addon, amo) }}
-      </div>
-      <blockquote>
-        <div>{{ addon.description|truncate(250)|nl2br }}</div>
-        {{ support_addon(addon) }}
-      </blockquote>
-    </div>
-  {% endcache %}
-{% endfor %}
-{% endcache %}
diff --git a/media/js b/media/js
index 40b6a3f3e2..e70abe79eb 160000
--- a/media/js
+++ b/media/js
@@ -1 +1 @@
-Subproject commit 40b6a3f3e2c392e71a4f6f817b44e583110f7546
+Subproject commit e70abe79eb3b34ae5da51e284cb7ddf1e8819241