diff --git a/WebContent/WEB-INF/web_debug.xml b/WebContent/WEB-INF/web_debug.xml
new file mode 100644
index 0000000..51220ff
--- /dev/null
+++ b/WebContent/WEB-INF/web_debug.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+  <display-name>Zallery</display-name>
+ 
+  <welcome-file-list>
+    <welcome-file>gallery</welcome-file>
+  </welcome-file-list>
+  
+  <servlet>
+    <servlet-name>Zallery</servlet-name>
+    <servlet-class>zall.Zallery</servlet-class>    
+    <init-param>
+		<param-name>WEBSITE_NAME</param-name>
+		<param-value>Koc.se Gallery</param-value>
+	</init-param>
+	<init-param>
+		<param-name>WEBSITE_URL</param-name>
+		<param-value>http://koc.se/Zallery/</param-value>
+	</init-param>
+	<init-param>
+		<param-name>SMTP_HOST</param-name>
+		<param-value>192.168.0.10</param-value>
+	</init-param>
+    <init-param>
+		<param-name>THEME</param-name>
+		<param-value></param-value>
+	</init-param>
+	<init-param>
+		<param-name>DATA_PATH</param-name>
+		<param-value>C:\\Users\\Ziver\\Desktop\\Downloads\\temp\\album</param-value>
+	</init-param>
+	<load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Zallery</servlet-name>
+    <url-pattern>/gallery</url-pattern>
+    <url-pattern>/media</url-pattern>
+    <url-pattern>/slideshow</url-pattern>
+    <url-pattern>/login</url-pattern>
+    <url-pattern>/logout</url-pattern>
+    <url-pattern>/upload</url-pattern>
+    <url-pattern>/profile</url-pattern>
+    <url-pattern>/users</url-pattern>
+    <url-pattern>/register</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>Content</servlet-name>
+    <servlet-class>zall.ZalleryContent</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Content</servlet-name>
+    <url-pattern>/content</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>Ajax</servlet-name>
+    <servlet-class>zall.ZalleryAjax</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Ajax</servlet-name>
+    <url-pattern>/ajax</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+	<servlet-name>Upload</servlet-name>
+	<servlet-class>zall.UploadServlet</servlet-class>
+	<init-param>
+		<param-name>TEMP_PATH</param-name>
+		<param-value>C:\\Users\\Ziver\\Desktop\\Downloads\\temp\\</param-value>
+	</init-param>
+	<init-param>
+		<param-name>ALLOWED_EXTENSIONS</param-name>
+		<param-value>png,jpg,jpeg,gif,tif,bmp,avi,wmv,mov,mp4,mpeg,flv,m4v,divx,xvid</param-value>
+	</init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Upload</servlet-name>
+    <url-pattern>/uploadserv</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>transcoder</servlet-name>
+    <servlet-class>zall.ZalleryTranscoder</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <welcome-file-list>
+    <welcome-file>gallery</welcome-file>
+  </welcome-file-list>
+</web-app>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web_server.xml b/WebContent/WEB-INF/web_server.xml
new file mode 100644
index 0000000..fd41747
--- /dev/null
+++ b/WebContent/WEB-INF/web_server.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+  <display-name>Zallery</display-name>
+ 
+  <welcome-file-list>
+    <welcome-file>gallery</welcome-file>
+  </welcome-file-list>
+  
+  <servlet>
+    <servlet-name>Zallery</servlet-name>
+    <servlet-class>zall.Zallery</servlet-class>    
+    <init-param>
+		<param-name>WEBSITE_NAME</param-name>
+		<param-value>Koc.se Gallery</param-value>
+	</init-param>
+	<init-param>
+		<param-name>WEBSITE_URL</param-name>
+		<param-value>http://koc.se/Zallery/</param-value>
+	</init-param>
+	<init-param>
+		<param-name>SMTP_HOST</param-name>
+		<param-value>192.168.0.10</param-value>
+	</init-param>
+    <init-param>
+		<param-name>THEME</param-name>
+		<param-value></param-value>
+	</init-param>
+	<init-param>
+		<param-name>DATA_PATH</param-name>
+		<param-value>/home/tomcat/ZalleryData/</param-value>
+	</init-param>
+	<load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Zallery</servlet-name>
+    <url-pattern>/gallery</url-pattern>
+    <url-pattern>/media</url-pattern>
+    <url-pattern>/slideshow</url-pattern>
+    <url-pattern>/login</url-pattern>
+    <url-pattern>/logout</url-pattern>
+    <url-pattern>/upload</url-pattern>
+    <url-pattern>/profile</url-pattern>
+    <url-pattern>/users</url-pattern>
+    <url-pattern>/register</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>Content</servlet-name>
+    <servlet-class>zall.ZalleryContent</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Content</servlet-name>
+    <url-pattern>/content</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>Ajax</servlet-name>
+    <servlet-class>zall.ZalleryAjax</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Ajax</servlet-name>
+    <url-pattern>/ajax</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+	<servlet-name>Upload</servlet-name>
+	<servlet-class>zall.UploadServlet</servlet-class>
+	<init-param>
+		<param-name>ALLOWED_EXTENSIONS</param-name>
+		<param-value>png,jpg,jpeg,gif,tif,bmp,avi,wmv,mov,mp4,mpeg,flv,m4v,divx,xvid</param-value>
+	</init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Upload</servlet-name>
+    <url-pattern>/uploadserv</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>transcoder</servlet-name>
+    <servlet-class>zall.ZalleryTranscoder</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  
+  <welcome-file-list>
+    <welcome-file>gallery</welcome-file>
+  </welcome-file-list>
+</web-app>
\ No newline at end of file
diff --git a/prototype/img/folder1.jpg b/prototype/img/folder1.jpg
new file mode 100644
index 0000000..1c8ce4e
Binary files /dev/null and b/prototype/img/folder1.jpg differ
diff --git a/prototype/img/folder2.jpg b/prototype/img/folder2.jpg
new file mode 100644
index 0000000..e0859ae
Binary files /dev/null and b/prototype/img/folder2.jpg differ
diff --git a/prototype/img/folder3.jpg b/prototype/img/folder3.jpg
new file mode 100644
index 0000000..6f2c52f
Binary files /dev/null and b/prototype/img/folder3.jpg differ
diff --git a/prototype/main.html b/prototype/main.html
index 3bb3c82..1aef63f 100755
--- a/prototype/main.html
+++ b/prototype/main.html
@@ -81,8 +81,9 @@
         <div class="row col-center col-md-11">
           <div class="grid folder-grid">
             <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4"><img class="img-responsive" src="http://koc.se/Zallery/img/folder.png" /></div>
-            <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4"><img class="img-responsive" src="http://koc.se/Zallery/img/folder.png" /></div>
-            <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4"><img class="img-responsive" src="http://koc.se/Zallery/img/folder.png" /></div>
+            <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4"><img class="img-responsive" src="img/folder1.jpg" /></div>
+            <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4"><img class="img-responsive" src="img/folder2.jpg" /></div>
+            <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4"><img class="img-responsive" src="img/folder3.jpg" /></div>
           </div>
           <hr>
         </div>