diff --git a/ng2-components/ng2-alfresco-documentlist/index.ts b/ng2-components/ng2-alfresco-documentlist/index.ts
index 946923d327..7c2f142c61 100644
--- a/ng2-components/ng2-alfresco-documentlist/index.ts
+++ b/ng2-components/ng2-alfresco-documentlist/index.ts
@@ -21,7 +21,7 @@ import { ContentColumnList } from './src/components/content-column-list';
 import { ContentAction } from './src/components/content-action';
 import { ContentActionList } from './src/components/content-action-list';
 import { EmptyFolderContent } from './src/components/empty-folder-content';
-import { DocumentListBreadcrumb } from './src/components/document-list-breadcrumb.component';
+import { DocumentListBreadcrumb } from './src/components/breadcrumb/breadcrumb.component';
 
 import { FolderActionsService } from './src/services/folder-actions.service';
 import { DocumentActionsService } from './src/services/document-actions.service';
@@ -34,7 +34,7 @@ export * from './src/components/content-column-list';
 export * from './src/components/content-action';
 export * from './src/components/content-action-list';
 export * from './src/components/empty-folder-content';
-export * from './src/components/document-list-breadcrumb.component';
+export * from './src/components/breadcrumb/breadcrumb.component';
 
 // services
 export * from './src/services/folder-actions.service';
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.css b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.css
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.css
rename to ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.css
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.html
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.html
rename to ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.html
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts
similarity index 97%
rename from ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.spec.ts
rename to ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts
index 47a688a106..aad08a8088 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts
@@ -25,8 +25,8 @@ import {
 import {
     DocumentListBreadcrumb,
     PathNode
-} from './document-list-breadcrumb.component';
-import { DocumentList } from './document-list';
+} from './breadcrumb.component';
+import { DocumentList } from '../document-list';
 
 describe('DocumentListBreadcrumb', () => {
 
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts
similarity index 94%
rename from ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.ts
rename to ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts
index 40e1c13308..2cbce772ee 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list-breadcrumb.component.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.ts
@@ -21,15 +21,15 @@ import {
     Output,
     EventEmitter
 } from '@angular/core';
-import { DocumentList } from './document-list';
+import { DocumentList } from '../document-list';
 
 declare let __moduleName: string;
 
 @Component({
     moduleId: __moduleName,
     selector: 'alfresco-document-list-breadcrumb',
-    templateUrl: './document-list-breadcrumb.component.html',
-    styleUrls: ['./document-list-breadcrumb.component.css']
+    templateUrl: './breadcrumb.component.html',
+    styleUrls: ['./breadcrumb.component.css']
 })
 export class DocumentListBreadcrumb {
 
diff --git a/ng2-components/ng2-alfresco-documentlist/src/models/document-library.model.ts b/ng2-components/ng2-alfresco-documentlist/src/models/document-library.model.ts
index 13f99549c9..3db16122ae 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/models/document-library.model.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/models/document-library.model.ts
@@ -26,6 +26,7 @@ export class NodePagingList {
     entries: MinimalNodeEntity[];
 }
 
+// TODO: rename to NodeMinimalEntry
 export class MinimalNodeEntity {
     entry: MinimalNodeEntryEntity;
 }
@@ -38,6 +39,7 @@ export class Pagination {
     maxItems: number;
 }
 
+// TODO: rename to NodeMinimal
 export class MinimalNodeEntryEntity {
     id: string;
     parentId: string;
diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
index 6a78992fd7..dccc26840c 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
@@ -82,7 +82,6 @@ export class DocumentListService {
         };
         return apiInstance.getNodeChildren(nodeId, opts);
     }
-
     deleteNode(nodeId: string) {
         let client = this.getAlfrescoClient();
         let nodesApi = new AlfrescoApi.Core.NodesApi(client);
@@ -95,7 +94,7 @@ export class DocumentListService {
      * @param folder Path to folder.
      * @returns {Observable<NodePaging>} Folder entity.
      */
-    getFolder(folder: string) {
+    getFolder(folder: string): Observable<NodePaging> {
         return Observable.fromPromise(this.getNodesPromise(folder))
             .map(res => <NodePaging> res)
             // .do(data => console.log('Node data', data)) // eyeball results in the console
@@ -107,7 +106,7 @@ export class DocumentListService {
      * @param node Node to get URL for.
      * @returns {string} URL address.
      */
-    getDocumentThumbnailUrl(node: MinimalNodeEntity) {
+    getDocumentThumbnailUrl(node: MinimalNodeEntity): string {
         if (node && this.contentService) {
             return this.contentService.getDocumentThumbnailUrl(node);
         }