diff --git a/datastore_server/dist/data/processing/.gitignore b/datastore_server/dist/data/processing/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/datastore_server/dist/etc/etlserver.conf b/datastore_server/dist/etc/datastore_server.conf
similarity index 100%
rename from datastore_server/dist/etc/etlserver.conf
rename to datastore_server/dist/etc/datastore_server.conf
diff --git a/datastore_server/dist/etc/openBIS.keystore b/datastore_server/dist/etc/openBIS.keystore
index b727bd0fb777fddb3463c81cb56963a7541f7b45..3982a68319e9e1fed5ace51f72682d79e448eaa2 100644
Binary files a/datastore_server/dist/etc/openBIS.keystore and b/datastore_server/dist/etc/openBIS.keystore differ
diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index ac44c7717d06af8cc5e1291c70ed2788193787ff..7925bffc5a4b832776223ac35654b4c3ec491351 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -1,6 +1,21 @@
 # The root directory of the data store
 storeroot-dir = data/store
 
+# Port
+port = 8444
+
+# Session timeout in minutes
+session-timeout = 30
+
+# Path to the keystore
+keystore.path = etc/jetty-keystore
+
+# Password of the keystore
+keystore.password = changeit
+
+# Key password of the keystore
+keystore.key-password = changeit
+
 # The check interval (in seconds)
 check-interval = 60
 
@@ -14,7 +29,7 @@ shutdown-timeout = 180
 # If free disk space goes below value defined here, a notification email will be sent.
 # Value must be specified in kilobytes (1048576 = 1024 * 1024 = 1GB). If no high water mark is
 # specified or if value is negative, the system will not be watching.
-highwater-mark = 1048576
+highwater-mark = -1
 
 # If a data set is successfully registered it sends out an email to the registrator. 
 # If this property is not specified, no email is sent to the registrator. This property
@@ -22,13 +37,13 @@ highwater-mark = 1048576
 notify-successful-registration = false
 
 # The URL of the openBIS server
-server-url = https://localhost:8443/openbis
+server-url = https://localhost:8443/openbis/openbis
 
 # The username to use when contacting the openBIS server
 username = etlserver
 
 # The password to use when contacting the openBIS server
-password = <change this>
+password = etlserver
 
 # SMTP properties (must start with 'mail' to be considered). 
 # mail.smtp.host = localhost
@@ -64,7 +79,7 @@ default-prefix-for-absolute-paths =
 
 processors = DATA_ACQUISITION
 processor.DATA_ACQUISITION.prefix-for-absolute-paths = ${default-prefix-for-absolute-paths}
-processor.DATA_ACQUISITION.prefix-for-relative-paths = targets/processing
+processor.DATA_ACQUISITION.prefix-for-relative-paths = data/processing
 processor.DATA_ACQUISITION.parameters-file = parameters
 processor.DATA_ACQUISITION.data-set-code-prefix-glue = ${data-set-file-name-entity-separator}
 processor.DATA_ACQUISITION.finished-file-template = .MARKER_is_finished_{0}
@@ -79,7 +94,8 @@ inputs=main-thread
 # ---------------------------------------------------------------------------
 # 'main-thread' thread configuration
 # ---------------------------------------------------------------------------
-
+# The group 
+main-thread.group-code = TEST
 # The directory to watch for incoming data.
 main-thread.incoming-dir = data/incoming
 # The group the samples extracted by this thread belong to. If commented out or empty, then samples
@@ -87,7 +103,6 @@ main-thread.incoming-dir = data/incoming
 # main-thread.group-code = <change this>
 
 # ---------------- Plugin properties
-
 # The extractor class to use for code extraction
 main-thread.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
 # Separator used to extract the barcode in the data set file name
@@ -107,4 +122,3 @@ main-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcess
 # main-thread.storage-processor.sampleTypeCode = CELL_PLATE
 # main-thread.storage-processor.sampleTypeDescription = Screening Plate
 # main-thread.storage-processor.format = UNKNOWN V1.0
-