diff --git a/deep_sequencing_unit/resource/DSU TrackingClient.launch b/deep_sequencing_unit/resource/DSU TrackingClient.launch
index 2b5cc3f75d02b078f2e980e5ab5f2d6cb0a42063..1d84c5bcece946e60d2e97ec59b8227b96e583b8 100644
--- a/deep_sequencing_unit/resource/DSU TrackingClient.launch
+++ b/deep_sequencing_unit/resource/DSU TrackingClient.launch
@@ -8,4 +8,5 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.ethz.bsse.cisd.dsu.tracking.main.TrackingClient"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="deep_sequencing_unit"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:deep_sequencing_unit/tracking}"/>
</launchConfiguration>
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java
index 95ed67a83fbd01e43837cde770d90760c995fbaa..3974e582abdfe208191cf1400b8d9992ba3ea41e 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingClient.java
@@ -40,11 +40,11 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
*/
public class TrackingClient
{
- private static final String SERVICE_PROPERTIES_FILE = "etc/tracking-service.properties";
+ private static final String SERVICE_PROPERTIES_FILE = "etc/service.properties";
private static final String LOCAL_STORAGE_FILE = "etc/tracking-local-database";
- private static final String EMAIL_TEMPLATE_FILE = "etc/tracking-email.template";
+ private static final String EMAIL_TEMPLATE_FILE = "etc/email-template.txt";
private static final String OPENBIS_RMI_TRACKING = "/rmi-tracking";
diff --git a/deep_sequencing_unit/dist/tracking/etc/tracking-email.template b/deep_sequencing_unit/tracking/dist/etc/email-template.txt
similarity index 100%
rename from deep_sequencing_unit/dist/tracking/etc/tracking-email.template
rename to deep_sequencing_unit/tracking/dist/etc/email-template.txt
diff --git a/deep_sequencing_unit/tracking/dist/etc/log.xml b/deep_sequencing_unit/tracking/dist/etc/log.xml
new file mode 100644
index 0000000000000000000000000000000000000000..31783966345eca176f0fe4bcfca2a1a3ff717be9
--- /dev/null
+++ b/deep_sequencing_unit/tracking/dist/etc/log.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
+
+ <appender name="DEFAULT" class="org.apache.log4j.DailyRollingFileAppender">
+
+ <param name="File" value="log/datastore_server_log.txt"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%t] %c - %m%n"/>
+ </layout>
+
+ </appender>
+
+ <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%t] %c - %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="NULL" class="org.apache.log4j.varia.NullAppender" />
+
+ <appender name="EMAIL" class="org.apache.log4j.net.SMTPAppender">
+
+ <param name="BufferSize" value="512" />
+ <param name="SMTPHost" value="localhost" />
+ <param name="From" value="dsu@localhost" />
+ <param name="To" value="root@localhost" />
+ <param name="Subject" value="ATTENTION: DSU Progress Tracking" />
+ <param name="EvaluatorClass" value="ch.systemsx.cisd.common.logging.AlwaysTrueTriggeringEventEvaluator" />
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%t] %c - %m%n"/>
+ </layout>
+
+ <!--filter class="org.apache.log4j.varia.LevelRangeFilter">
+ <param name="LevelMin" value="ERROR"/>
+ <param name="LevelMax" value="FATAL"/>
+ </filter-->
+
+ </appender>
+
+ <category name="NOTIFY">
+ <priority value="info" />
+ <appender-ref ref="EMAIL" />
+ </category>
+
+ <root>
+ <priority value="info" />
+ <appender-ref ref="DEFAULT" />
+ </root>
+
+</log4j:configuration>
diff --git a/deep_sequencing_unit/dist/tracking/etc/tracking-service.properties b/deep_sequencing_unit/tracking/dist/etc/service.properties
similarity index 100%
rename from deep_sequencing_unit/dist/tracking/etc/tracking-service.properties
rename to deep_sequencing_unit/tracking/dist/etc/service.properties
diff --git a/deep_sequencing_unit/dist/tracking/etc/tracking-local-database b/deep_sequencing_unit/tracking/dist/etc/tracking-local-database
similarity index 100%
rename from deep_sequencing_unit/dist/tracking/etc/tracking-local-database
rename to deep_sequencing_unit/tracking/dist/etc/tracking-local-database
diff --git a/deep_sequencing_unit/dist/tracking/tracking.sh b/deep_sequencing_unit/tracking/dist/tracking.sh
similarity index 100%
rename from deep_sequencing_unit/dist/tracking/tracking.sh
rename to deep_sequencing_unit/tracking/dist/tracking.sh
diff --git a/deep_sequencing_unit/etc/tracking-email.template b/deep_sequencing_unit/tracking/etc/email-template.txt
similarity index 100%
rename from deep_sequencing_unit/etc/tracking-email.template
rename to deep_sequencing_unit/tracking/etc/email-template.txt
diff --git a/deep_sequencing_unit/tracking/etc/log.xml b/deep_sequencing_unit/tracking/etc/log.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cee0a68436a19a6c4ec4b14b580e6d9f75bf84f
--- /dev/null
+++ b/deep_sequencing_unit/tracking/etc/log.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
+
+ <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%t] %c - %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="NULL" class="org.apache.log4j.varia.NullAppender" />
+
+ <root>
+ <priority value ="info" />
+ <appender-ref ref="STDOUT" />
+ </root>
+
+</log4j:configuration>
diff --git a/deep_sequencing_unit/etc/tracking-service.properties b/deep_sequencing_unit/tracking/etc/service.properties
similarity index 91%
rename from deep_sequencing_unit/etc/tracking-service.properties
rename to deep_sequencing_unit/tracking/etc/service.properties
index a2206ee31c57a45fd6707c6b3dafbc30da65f6f4..15eec5bd9ee76f60e9af29d7fa73c587d5ed6f09 100644
--- a/deep_sequencing_unit/etc/tracking-service.properties
+++ b/deep_sequencing_unit/tracking/etc/service.properties
@@ -3,7 +3,7 @@ openbis-password=xxx
openbis-server-url = http://localhost:8888/openbis
-mail.smtp.host = file://targets
+mail.smtp.host = file://../targets
mail.smtp.user =
mail.smtp.password =
diff --git a/deep_sequencing_unit/etc/tracking-local-database b/deep_sequencing_unit/tracking/etc/tracking-local-database
similarity index 86%
rename from deep_sequencing_unit/etc/tracking-local-database
rename to deep_sequencing_unit/tracking/etc/tracking-local-database
index c77dee7ccd1a19744fafe3bfed214267e3ae2ada..5749013539a9e16e4e4fe6a886e4d621b6cc342b 100644
--- a/deep_sequencing_unit/etc/tracking-local-database
+++ b/deep_sequencing_unit/tracking/etc/tracking-local-database
@@ -1,2 +1,2 @@
lastSeenSequencingSampleId lastSeenFlowLaneSampleId lastSeenDatasetId
-0 0 0
\ No newline at end of file
+409 418 66