diff --git a/app/components/directory-listing/template.hbs b/app/components/directory-listing/template.hbs
index 5ed9e06..7a989e4 100644
--- a/app/components/directory-listing/template.hbs
+++ b/app/components/directory-listing/template.hbs
@@ -1,11 +1,20 @@
 <ul class="listing">
   {{#each items as |item|}}
   <li>
-    {{#link-to "index"}}
-      <span class="icon">{{item-icon type=item.type}}</span>
-      <span class="name">{{item.name}}</span>
-      <span class="type">{{item.type}}</span>
-    {{/link-to}}
+    {{#if item.isFolder}}
+      {{#link-to "index" (query-params path=item.path)}}
+        <span class="icon">{{item-icon type=item.type}}</span>
+        <span class="name">{{item.name}}</span>
+        <span class="type">{{item.type}}</span>
+      {{/link-to}}
+    {{else}}
+      <!-- TODO link to item -->
+      {{#link-to "index"}}
+        <span class="icon">{{item-icon type=item.type}}</span>
+        <span class="name">{{item.name}}</span>
+        <span class="type">{{item.type}}</span>
+      {{/link-to}}
+    {{/if}}
   </li>
   {{/each}}
 </ul>
\ No newline at end of file
diff --git a/app/services/storage.js b/app/services/storage.js
index 09fd518..fb5cdf2 100644
--- a/app/services/storage.js
+++ b/app/services/storage.js
@@ -97,7 +97,9 @@ export default Service.extend({
         items.push(EmberObject.create({
           name: name,
           type: type,
-          size: item['Content-Length'] || null
+          isFolder: type === 'folder',
+          size: item['Content-Length'] || null,
+          path: path + name
         }));
       });