diff --git a/li.strolch.tutorialapp/pom.xml b/li.strolch.tutorialapp/pom.xml
index 94cc8cf87..ac509e560 100644
--- a/li.strolch.tutorialapp/pom.xml
+++ b/li.strolch.tutorialapp/pom.xml
@@ -66,6 +66,13 @@
 					<include>**/componentVersion.properties</include>
 				</includes>
 			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<excludes>
+					<exclude>**/componentVersion.properties</exclude>
+				</excludes>
+			</resource>
 		</resources>
 		<plugins>
 			<plugin>
diff --git a/li.strolch.tutorialapp/src/main/resources/runtime/config/PrivilegeConfig.xml b/li.strolch.tutorialapp/src/main/resources/runtime/config/PrivilegeConfig.xml
deleted file mode 100644
index e264a8929..000000000
--- a/li.strolch.tutorialapp/src/main/resources/runtime/config/PrivilegeConfig.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Privilege>
-
-	<Container>
-
-		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="autoPersistOnPasswordChange" value="true" />
-		</Parameters>
-
-		<EncryptionHandler class="ch.eitchnet.privilege.handler.DefaultEncryptionHandler">
-			<Parameters>
-				<Parameter name="hashAlgorithm" value="SHA-256" />
-			</Parameters>
-		</EncryptionHandler>
-
-		<PersistenceHandler class="ch.eitchnet.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="basePath" value="config/" />
-				<Parameter name="modelXmlFile" value="PrivilegeModel.xml" />
-			</Parameters>
-		</PersistenceHandler>
-
-	</Container>
-
-	<Policies>
-		<Policy name="DefaultPrivilege" class="ch.eitchnet.privilege.policy.DefaultPrivilege" />
-	</Policies>
-
-</Privilege>
\ No newline at end of file
diff --git a/li.strolch.tutorialapp/src/main/resources/runtime/config/PrivilegeModel.xml b/li.strolch.tutorialapp/src/main/resources/runtime/config/PrivilegeModel.xml
deleted file mode 100644
index dd2a01565..000000000
--- a/li.strolch.tutorialapp/src/main/resources/runtime/config/PrivilegeModel.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UsersAndRoles>
-
-	<Users>
-		<User userId="0" username="agent">
-			<State>SYSTEM</State>
-			<Roles>
-				<Role>agent</Role>
-			</Roles>
-		</User>
-		<User userId="1" username="admin" password="8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918">
-			<Firstname>Application</Firstname>
-			<Lastname>Administrator</Lastname>
-			<State>ENABLED</State>
-			<Locale>en_GB</Locale>
-			<Roles>
-				<Role>PrivilegeAdmin</Role>
-				<Role>AppUser</Role>
-			</Roles>
-			<Properties>
-				<Property name="organization" value="eitchnet.ch" />
-				<Property name="organizationalUnit" value="Development" />
-			</Properties>
-		</User>
-
-		<User userId="2" username="bob" password="81b637d8fcd2c6da6359e6963113a1170de795e4b725b84d1e0b4cfd9ec58ce9">
-			<Firstname>Bob</Firstname>
-			<Lastname>Bernstein</Lastname>
-			<State>ENABLED</State>
-			<Locale>en_GB</Locale>
-			<Roles>
-				<Role>AppUser</Role>
-			</Roles>
-
-		</User>
-		<User userId="3" username="jill" password="8cf37351b60f00084392043ce2e6256b96cea92949f90c7abce464cf164fbfa6">
-			<Firstname>Jill</Firstname>
-			<Lastname>Johnson</Lastname>
-			<State>ENABLED</State>
-			<Locale>en_GB</Locale>
-			<Roles>
-				<Role>OnlyGreetingServiceRole</Role>
-			</Roles>
-
-		</User>
-		<User userId="4" username="sysAdmin" password="8cffb494ef5ff3f74a571206e141d4fb84f833e431b98c8b3be43727c4cbddc1">
-			<Firstname>System User</Firstname>
-			<Lastname>Administrator</Lastname>
-			<State>SYSTEM</State>
-			<Locale>en_GB</Locale>
-			<Roles>
-				<Role>sysAdmin</Role>
-				<Role>AppUser</Role>
-			</Roles>
-
-		</User>
-	</Users>
-
-	<Roles>
-
-		<Role name="PrivilegeAdmin" />
-
-		<Role name="agent">
-			<Privilege name="li.strolch.agent.impl.StartRealms" policy="DefaultPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-		</Role>
-
-		<Role name="AppUser">
-			<Privilege name="li.strolch.service.api.Service" policy="DefaultPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-			<Privilege name="li.strolch.model.query.StrolchQuery" policy="DefaultPrivilege">
-				<AllAllowed>true</AllAllowed>
-			</Privilege>
-		</Role>
-
-		<Role name="sysAdmin">
-		</Role>
-
-		<Role name="OnlyGreetingServiceRole">
-			<Privilege name="li.strolch.service.api.Service" policy="DefaultPrivilege">
-				<Allow>li.strolch.service.test.GreetingService</Allow>
-			</Privilege>
-		</Role>
-
-	</Roles>
-</UsersAndRoles>
\ No newline at end of file
diff --git a/li.strolch.tutorialapp/src/main/resources/runtime/config/StrolchConfiguration.xml b/li.strolch.tutorialapp/src/main/resources/runtime/config/StrolchConfiguration.xml
deleted file mode 100644
index 199e015ce..000000000
--- a/li.strolch.tutorialapp/src/main/resources/runtime/config/StrolchConfiguration.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StrolchConfiguration>
-	<env id="dev">
-		<Runtime>
-			<applicationName>StrolchTutorialApp</applicationName>
-			<Properties>
-				<verbose>true</verbose>
-			</Properties>
-		</Runtime>
-		<Component>
-			<name>PrivilegeHandler</name>
-			<api>li.strolch.runtime.privilege.PrivilegeHandler</api>
-			<impl>li.strolch.runtime.privilege.DefaultStrolchPrivilegeHandler</impl>
-			<Properties>
-				<privilegeConfigFile>PrivilegeConfig.xml</privilegeConfigFile>
-			</Properties>
-		</Component>
-		<Component>
-			<name>RealmHandler</name>
-			<api>li.strolch.agent.api.RealmHandler</api>
-			<impl>li.strolch.agent.impl.DefaultRealmHandler</impl>
-			<depends>PrivilegeHandler</depends>
-			<depends>PersistenceHandler</depends>
-			<Properties>
-				<dataStoreMode>TRANSIENT</dataStoreMode>
-				<dataStoreFile>StrolchModel.xml</dataStoreFile>
-			</Properties>
-		</Component>
-		<Component>
-			<name>ServiceHandler</name>
-			<api>li.strolch.service.api.ServiceHandler</api>
-			<impl>li.strolch.service.api.DefaultServiceHandler</impl>
-			<depends>RealmHandler</depends>
-			<depends>PrivilegeHandler</depends>
-			<Properties>
-				<verbose>true</verbose>
-			</Properties>
-		</Component>
-		<Component>
-			<name>PostInitializer</name>
-			<api>li.strolch.agent.api.PostInitializer</api>
-			<impl>li.strolch.tutorialapp.postinitializer.PostInitializer</impl>
-			<depends>ServiceHandler</depends>
-			<Properties>
-			</Properties>
-		</Component>
-		<Component>
-			<name>PersistenceHandler</name>
-			<api>li.strolch.persistence.api.PersistenceHandler</api>
-			<impl>li.strolch.persistence.xml.XmlPersistenceHandler</impl>
-			<Properties>
-				<verbose>true</verbose>
-			</Properties>
-		</Component>
-		<Component>
-			<name>EnumHandler</name>
-			<api>li.strolch.runtime.query.enums.EnumHandler</api>
-			<impl>li.strolch.runtime.query.enums.DefaultEnumHandler</impl>
-			<depends>RealmHandler</depends>
-			<Properties>
-				<realm>defaultRealm</realm>
-				<salutations>Resource/Enumeration/salutations</salutations>
-				<sex>Resource/Enumeration/sex</sex>
-				<religions>Resource/Enumeration/religions</religions>
-			</Properties>
-		</Component>
-	</env>
-</StrolchConfiguration>
diff --git a/li.strolch.tutorialapp/src/main/resources/runtime/data/Orders.xml b/li.strolch.tutorialapp/src/main/resources/runtime/data/Orders.xml
deleted file mode 100644
index 55358bcaa..000000000
--- a/li.strolch.tutorialapp/src/main/resources/runtime/data/Orders.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="CREATED">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
-</StrolchModel>
diff --git a/li.strolch.tutorialapp/src/main/resources/runtime/data/Resources.xml b/li.strolch.tutorialapp/src/main/resources/runtime/data/Resources.xml
deleted file mode 100644
index e6259cb83..000000000
--- a/li.strolch.tutorialapp/src/main/resources/runtime/data/Resources.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel>
-	<Resource Id="MyTestResource" Name="Test Name" Type="TestType">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
-</StrolchModel>
diff --git a/li.strolch.tutorialapp/src/main/resources/runtime/data/StrolchModel.xml b/li.strolch.tutorialapp/src/main/resources/runtime/data/StrolchModel.xml
deleted file mode 100644
index 2d9d4958e..000000000
--- a/li.strolch.tutorialapp/src/main/resources/runtime/data/StrolchModel.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel>
-	<Resource Id="TestType" Name="TestType Template" Type="Template">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
-	<Order Id="TestType" Name="MyTestOrder Template" Type="Template">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
-			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
-			<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" />
-			<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" />
-			<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" />
-			<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
-
-	<IncludeFile file="Resources.xml" />
-	<IncludeFile file="Orders.xml" />
-	<IncludeFile file="Enums.xml" />
-
-</StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.tutorialapp/src/main/scripts/startup.sh b/li.strolch.tutorialapp/src/main/scripts/startup.sh
index f01f51379..8f80460c3 100644
--- a/li.strolch.tutorialapp/src/main/scripts/startup.sh
+++ b/li.strolch.tutorialapp/src/main/scripts/startup.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -classpath lib/ -jar ${artifactId}-${project.version}.jar --root-path=./
\ No newline at end of file
+java -classpath lib/ -jar ${artifactId}-${project.version}.jar --root-path=./ --env=dev
diff --git a/li.strolch.tutorialapp/src/runtime/config/StrolchConfiguration.xml b/li.strolch.tutorialapp/src/runtime/config/StrolchConfiguration.xml
index e19aaeac7..199e015ce 100644
--- a/li.strolch.tutorialapp/src/runtime/config/StrolchConfiguration.xml
+++ b/li.strolch.tutorialapp/src/runtime/config/StrolchConfiguration.xml
@@ -30,6 +30,8 @@
 			<name>ServiceHandler</name>
 			<api>li.strolch.service.api.ServiceHandler</api>
 			<impl>li.strolch.service.api.DefaultServiceHandler</impl>
+			<depends>RealmHandler</depends>
+			<depends>PrivilegeHandler</depends>
 			<Properties>
 				<verbose>true</verbose>
 			</Properties>
@@ -50,5 +52,17 @@
 				<verbose>true</verbose>
 			</Properties>
 		</Component>
+		<Component>
+			<name>EnumHandler</name>
+			<api>li.strolch.runtime.query.enums.EnumHandler</api>
+			<impl>li.strolch.runtime.query.enums.DefaultEnumHandler</impl>
+			<depends>RealmHandler</depends>
+			<Properties>
+				<realm>defaultRealm</realm>
+				<salutations>Resource/Enumeration/salutations</salutations>
+				<sex>Resource/Enumeration/sex</sex>
+				<religions>Resource/Enumeration/religions</religions>
+			</Properties>
+		</Component>
 	</env>
 </StrolchConfiguration>
diff --git a/li.strolch.tutorialapp/src/main/resources/runtime/data/Enums.xml b/li.strolch.tutorialapp/src/runtime/data/Enums.xml
similarity index 100%
rename from li.strolch.tutorialapp/src/main/resources/runtime/data/Enums.xml
rename to li.strolch.tutorialapp/src/runtime/data/Enums.xml
diff --git a/li.strolch.tutorialapp/src/runtime/data/StrolchModel.xml b/li.strolch.tutorialapp/src/runtime/data/StrolchModel.xml
index cb2396975..2d9d4958e 100644
--- a/li.strolch.tutorialapp/src/runtime/data/StrolchModel.xml
+++ b/li.strolch.tutorialapp/src/runtime/data/StrolchModel.xml
@@ -11,7 +11,7 @@
 			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
 		</ParameterBag>
 	</Resource>
-	<Order Id="Template" Name="MyTestOrder Template" Type="MyTestOrder">
+	<Order Id="TestType" Name="MyTestOrder Template" Type="Template">
 		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
 			<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" />
 			<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" />
@@ -25,5 +25,6 @@
 
 	<IncludeFile file="Resources.xml" />
 	<IncludeFile file="Orders.xml" />
+	<IncludeFile file="Enums.xml" />
 
 </StrolchModel>
\ No newline at end of file
diff --git a/li.strolch.tutorialapp/src/main/resources/runtime/dbStore/.placeholder b/li.strolch.tutorialapp/src/runtime/dbStore/.placeholder
similarity index 100%
rename from li.strolch.tutorialapp/src/main/resources/runtime/dbStore/.placeholder
rename to li.strolch.tutorialapp/src/runtime/dbStore/.placeholder