diff --git a/microservice-server/README.md b/microservice-server/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..404d6e820c05d893527631e0f878cbd344b38113
--- /dev/null
+++ b/microservice-server/README.md
@@ -0,0 +1,80 @@
+## MICROSERVICE SERVER ##
+
+# Introduction #
+
+This project holds is supposed to be used to developed Java micro services.
+
+# Configuration #
+
+A json file with the configuration should be given during the startup as an argument, if not given the default "config.json" will be loaded (mostly used for distribution) and if not found "./conf/config.json" is loaded (mostly used for development).
+
+# Build #
+
+./gradlew distZip
+
+The build will be found at ./build/distributions/microservice-server.zip
+
+# Startup #
+
+Unzip the build and execute
+
+./bin/microservice-server
+
+# Main packages #
+
+## ch.ethz.sis.microservices.api ##
+Supposed to contain only immutable DTOs annotated with lombok's @Data.
+
+## ch.ethz.sis.microservices.server.json ##
+JSON object mapper interface and implementations.
+
+## ch.ethz.sis.microservices.server.logging ##
+Logging interface and implementation.
+
+## ch.ethz.sis.microservices.server.services ##
+Service interface and implementation.
+
+## ch.ethz.sis.microservices.server.startup ##
+Main class and launcher.
+
+## ch.ethz.sis.microservices.util ##
+Utility classes.
+
+# Configuration #
+
+The json configuration file currently have two sections.
+
+{
+	"port" : 8080,
+	"services" : []
+}
+
+The port used by the web server and a list of Services.
+
+## ch.ethz.sis.microservices.server.services.store.FileInfoHandler ##
+
+{	
+			"className" : "ch.ethz.sis.microservices.server.services.store.FileInfoHandler", 
+			"url" : "/file-information",
+			"parameters" : {
+				"openbis-url" : "http://localhost:8888/openbis/openbis/rmi-application-server-v3",
+				"datastore-url" : "http://localhost:8889/datastore_server/rmi-data-store-server-v3",
+				"services-timeout" : "10000",
+				"allowedExternalDMSCode" : "ADMIN-BS-MBPR28.D.ETHZ.CH-E96954A7",
+				"allowedContentCopyPath" : "/Users/localadmin/obis_data/"
+			}
+}
+
+## ch.ethz.sis.microservices.server.services.store.DownloadHandler ##
+
+{ 
+			"className" : "ch.ethz.sis.microservices.server.services.store.DownloadHandler", 
+			"url" : "/download",
+			"parameters" : { 
+				"openbis-url" : "http://localhost:8888/openbis/openbis/rmi-application-server-v3",
+				"datastore-url" : "http://localhost:8889/datastore_server/rmi-data-store-server-v3",
+				"services-timeout" : "10000",
+				"allowedExternalDMSCode" : "ADMIN-BS-MBPR28.D.ETHZ.CH-E96954A7",
+				"allowedContentCopyPath" : "/Users/localadmin/obis_data/"
+			}
+}
\ No newline at end of file
diff --git a/microservice-server/build.gradle b/microservice-server/build.gradle
index 102904d066390e9b8f32243d7a0bcaf451b2426d..646dd1cdbfecdca95918ae4d6ebe6eea19cdf337 100644
--- a/microservice-server/build.gradle
+++ b/microservice-server/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 }
 
 
-mainClassName = "ch.ethz.sis.microservices.download.server.startup.Main"
+mainClassName = "ch.ethz.sis.microservices.server.startup.Main"
 
 distZip {
     into(project.name) {
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java
index 2fc922e26a4da911279c6a874b0f6093226d8eb7..9194cdb64d5ec35d4edf8ef7bcc627e9d4593468 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java
@@ -27,7 +27,14 @@ public class Main
         if (args.length < 1)
         {
             configFile = new File("./conf/config.json");
-            logger.info("No arguments given, starting with default config file: " + (configFile.getAbsolutePath()));
+            if(configFile.exists()) {
+            		logger.info("No arguments given, starting with default config file: " + (configFile.getAbsolutePath()));
+            } else {
+            		configFile = new File("./config.json");
+            		if(configFile.exists()) {
+                		logger.info("No arguments given, starting with default config file: " + (configFile.getAbsolutePath()));
+                }
+            }
         } else
         {
             configFile = new File(args[0]);
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/util/HttpClient.java
similarity index 97%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/util/HttpClient.java
index ce95d4f4bb9c07c45eb346bea3d5e58ec7a9b7a1..5e1ef57a354b9fb46c915d2173fdeeccab87ac1b 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/util/HttpClient.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.server.startup;
+package ch.ethz.sis.microservices.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java
index 3652c69da6155d89d700484e7e8451d1cff45832..4dcf5b8da81804b0506750573a26174e18c9f899 100644
--- a/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java
+++ b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java
@@ -5,7 +5,7 @@ import java.util.Map;
 
 import ch.ethz.sis.microservices.server.logging.LogManager;
 import ch.ethz.sis.microservices.server.logging.log4j.Log4J2LogFactory;
-import ch.ethz.sis.microservices.server.startup.HttpClient;
+import ch.ethz.sis.microservices.util.HttpClient;
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
 import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/exception/UndefinedSpaceException.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/exception/UndefinedSpaceException.java
index 06325e17d2d173f739fcbe1396a5f06ea719187c..252e810c98a813f31f6a4bacb7984450fb73db2f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/exception/UndefinedSpaceException.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/exception/UndefinedSpaceException.java
@@ -25,7 +25,8 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
  */
 public final class UndefinedSpaceException extends UserFailureException
 {
-    private static final long serialVersionUID = 1L;
+
+	private static final long serialVersionUID = 1L;
 
     private final static String MESSAGE = "Space not specified, home space unknown";
 
@@ -33,4 +34,5 @@ public final class UndefinedSpaceException extends UserFailureException
     {
         super(MESSAGE);
     }
+
 }