diff --git a/app/components/breadcrumb/index.hbs b/app/components/breadcrumb/index.hbs
index cf382579d24a4951758d0b746cd83f5dcb8a001a..f57949e7e4b69e2119d6fd6789f9051c7cf3d9c3 100644
--- a/app/components/breadcrumb/index.hbs
+++ b/app/components/breadcrumb/index.hbs
@@ -3,11 +3,15 @@
     {{#each this.nodes as |node|}}
       <li class="breadcrumb-item">
         {{#if (is_equal @hint "left")}}
-          <Commander::LinkToLeft
-            @node={{node}}
-            @extranode={{@extranode}} />
+          {{#if (is_equal node.nodeType "document") }}
+            <Document::LinkToLeft @node={{node}} />
+          {{else}}
+            <Folder::LinkToLeft
+              @node={{node}}
+              @extranode={{@extranode}} />
+          {{/if}}
         {{else}}
-          <Commander::LinkToRight
+          <Folder::LinkToRight
             @node={{@extranode}}
             @extranode={{node}} />
         {{/if}}
diff --git a/app/components/commander/index.hbs b/app/components/commander/index.hbs
index 8e1a89889f93f3a7adc8172ea145a9c5fc216c77..aa195fe7922b080ef6c736c1880c8b48412372ce 100644
--- a/app/components/commander/index.hbs
+++ b/app/components/commander/index.hbs
@@ -45,11 +45,11 @@
           @selectedNodes={{this.selected_nodes}}
           @onCheckboxChange={{this.onCheckboxChange}} >
           {{#if (is_equal @hint "left")}}
-            <Commander::LinkToLeft
+            <Folder::LinkToLeft
               @node={{node}}
               @extranode={{@extranode}} />
           {{else}}
-            <Commander::LinkToRight
+            <Folder::LinkToRight
               @node={{@extranode}}
               @extranode={{node}} />
           {{/if}}
diff --git a/app/components/document.hbs b/app/components/document/index.hbs
similarity index 100%
rename from app/components/document.hbs
rename to app/components/document/index.hbs
diff --git a/app/components/document.js b/app/components/document/index.js
similarity index 64%
rename from app/components/document.js
rename to app/components/document/index.js
index c2c186834794f2640ae8b2df3ec96b0ff50d6f16..8e31ea014b0c27e987e5477fed9c905d8df583ac 100644
--- a/app/components/document.js
+++ b/app/components/document/index.js
@@ -1,4 +1,4 @@
-import NodeComponent from "./node";
+import NodeComponent from "../node";
 
 
 export default class DocumentComponent extends NodeComponent {
diff --git a/app/components/document/link_to_left.hbs b/app/components/document/link_to_left.hbs
new file mode 100644
index 0000000000000000000000000000000000000000..b37c748b1b305759b446c730633298ecffeac66e
--- /dev/null
+++ b/app/components/document/link_to_left.hbs
@@ -0,0 +1,14 @@
+{{#if @extranode}}
+  <LinkTo
+    @route="authenticated.nodes"
+    @model={{@node.id}}
+    @query={{hash extranode_id=@extranode.id}}>
+      {{@node.title}}
+  </LinkTo>
+{{else}}
+  <LinkTo
+    @route="authenticated.document"
+    @model={{@node.id}}>
+      {{@node.title}}
+  </LinkTo>
+{{/if}}
\ No newline at end of file
diff --git a/app/components/folder.hbs b/app/components/folder/index.hbs
similarity index 100%
rename from app/components/folder.hbs
rename to app/components/folder/index.hbs
diff --git a/app/components/folder.js b/app/components/folder/index.js
similarity index 87%
rename from app/components/folder.js
rename to app/components/folder/index.js
index 0fd871d64f4f0472ae9f1bb8197de5ce92009efa..5a641a2104960988d46dad224984793fd39f7497 100644
--- a/app/components/folder.js
+++ b/app/components/folder/index.js
@@ -1,4 +1,4 @@
-import NodeComponent from "./node";
+import NodeComponent from "../node";
 
 
 export default class FolderComponent extends NodeComponent {
diff --git a/app/components/commander/link_to_left.hbs b/app/components/folder/link_to_left.hbs
similarity index 100%
rename from app/components/commander/link_to_left.hbs
rename to app/components/folder/link_to_left.hbs
diff --git a/app/components/commander/link_to_right.hbs b/app/components/folder/link_to_right.hbs
similarity index 100%
rename from app/components/commander/link_to_right.hbs
rename to app/components/folder/link_to_right.hbs