diff --git a/demo/images/emptydirectory/.placeholder b/demo/images/emptydirectory/.placeholder
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/app/gallery/directory/directory.gallery.component.html b/frontend/app/gallery/directory/directory.gallery.component.html
new file mode 100644
index 00000000..a442264d
--- /dev/null
+++ b/frontend/app/gallery/directory/directory.gallery.component.html
@@ -0,0 +1 @@
+<span>{{directory.name}}</span>
\ No newline at end of file
diff --git a/frontend/app/gallery/directory/directory.gallery.component.ts b/frontend/app/gallery/directory/directory.gallery.component.ts
new file mode 100644
index 00000000..65b89ab8
--- /dev/null
+++ b/frontend/app/gallery/directory/directory.gallery.component.ts
@@ -0,0 +1,19 @@
+///<reference path="../../../browser.d.ts"/>
+
+import {Component, Input, OnInit} from 'angular2/core'; 
+import {Directory} from "../../../../common/entities/Directory";
+
+@Component({
+    selector: 'gallery-directory',
+    templateUrl: 'app/gallery/directory/directory.gallery.component.html'
+})
+export class GalleryDirectoryComponent{
+    @Input() directory: Directory;
+    
+    constructor() {
+    }
+
+ 
+    
+}
+
diff --git a/frontend/app/gallery/gallery.component.html b/frontend/app/gallery/gallery.component.html
index bdedb5e1..648443bc 100644
--- a/frontend/app/gallery/gallery.component.html
+++ b/frontend/app/gallery/gallery.component.html
@@ -1,4 +1,8 @@
 <h1>Gallery</h1>
+
+<div *ngIf="directory" *ngFor="#directory of directory.directories" >
+  <gallery-directory *ngIf="directory" [directory]="directory" ></gallery-directory>
+</div>
 <div *ngIf="directory" *ngFor="#photo of directory.photos" >
-  <gallery-photo *ngIf="photo" [photo]="photo" >a photo</gallery-photo>
+  <gallery-photo *ngIf="photo" [photo]="photo" ></gallery-photo>
 </div>
\ No newline at end of file
diff --git a/frontend/app/gallery/gallery.component.ts b/frontend/app/gallery/gallery.component.ts
index 8ca85652..85eef5dc 100644
--- a/frontend/app/gallery/gallery.component.ts
+++ b/frontend/app/gallery/gallery.component.ts
@@ -7,11 +7,13 @@ import {GalleryService} from "./gallery.service";
 import {Directory} from "../../../common/entities/Directory";
 import {Message} from "../../../common/entities/Message";
 import {GalleryPhotoComponent} from "./photo/photo.gallery.component";
+import {GalleryDirectoryComponent} from "./directory/directory.gallery.component";
 
 @Component({
     selector: 'gallery',
     templateUrl: 'app/gallery/gallery.component.html',
-    directives:[GalleryPhotoComponent]
+    directives:[GalleryPhotoComponent,
+                GalleryDirectoryComponent]
 })
 export class GalleryComponent implements OnInit{