diff --git a/li.strolch.agent/.gitignore b/agent/.gitignore
similarity index 100%
rename from li.strolch.agent/.gitignore
rename to agent/.gitignore
diff --git a/li.strolch.agent/LICENSE b/agent/LICENSE
similarity index 100%
rename from li.strolch.agent/LICENSE
rename to agent/LICENSE
diff --git a/li.strolch.agent/README.md b/agent/README.md
similarity index 100%
rename from li.strolch.agent/README.md
rename to agent/README.md
diff --git a/li.strolch.agent/pom.xml b/agent/pom.xml
similarity index 90%
rename from li.strolch.agent/pom.xml
rename to agent/pom.xml
index a4c57fb2e..4b38d7ab7 100644
--- a/li.strolch.agent/pom.xml
+++ b/agent/pom.xml
@@ -5,13 +5,13 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.agent</artifactId>
-    <name>li.strolch.agent</name>
+    <artifactId>agent</artifactId>
+    <name>agent</name>
     <description>Strolch Agent which is the runtime for Strolch</description>
     <inceptionYear>2011</inceptionYear>
 
@@ -37,11 +37,11 @@
         <!-- main -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.privilege</artifactId>
+            <artifactId>privilege</artifactId>
         </dependency>
 
         <dependency>
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/I18nAgent.java b/agent/src/main/java/li/strolch/agent/I18nAgent.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/I18nAgent.java
rename to agent/src/main/java/li/strolch/agent/I18nAgent.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/AbstractModelObserver.java b/agent/src/main/java/li/strolch/agent/api/AbstractModelObserver.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/AbstractModelObserver.java
rename to agent/src/main/java/li/strolch/agent/api/AbstractModelObserver.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/ActivityMap.java b/agent/src/main/java/li/strolch/agent/api/ActivityMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/ActivityMap.java
rename to agent/src/main/java/li/strolch/agent/api/ActivityMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/AgentVersion.java b/agent/src/main/java/li/strolch/agent/api/AgentVersion.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/AgentVersion.java
rename to agent/src/main/java/li/strolch/agent/api/AgentVersion.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/AuditTrail.java b/agent/src/main/java/li/strolch/agent/api/AuditTrail.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/AuditTrail.java
rename to agent/src/main/java/li/strolch/agent/api/AuditTrail.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/ComponentContainer.java b/agent/src/main/java/li/strolch/agent/api/ComponentContainer.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/ComponentContainer.java
rename to agent/src/main/java/li/strolch/agent/api/ComponentContainer.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/ComponentState.java b/agent/src/main/java/li/strolch/agent/api/ComponentState.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/ComponentState.java
rename to agent/src/main/java/li/strolch/agent/api/ComponentState.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/ComponentVersion.java b/agent/src/main/java/li/strolch/agent/api/ComponentVersion.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/ComponentVersion.java
rename to agent/src/main/java/li/strolch/agent/api/ComponentVersion.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/ElementMap.java b/agent/src/main/java/li/strolch/agent/api/ElementMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/ElementMap.java
rename to agent/src/main/java/li/strolch/agent/api/ElementMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/LockHandler.java b/agent/src/main/java/li/strolch/agent/api/LockHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/LockHandler.java
rename to agent/src/main/java/li/strolch/agent/api/LockHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/LoggingLoader.java b/agent/src/main/java/li/strolch/agent/api/LoggingLoader.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/LoggingLoader.java
rename to agent/src/main/java/li/strolch/agent/api/LoggingLoader.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/Observer.java b/agent/src/main/java/li/strolch/agent/api/Observer.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/Observer.java
rename to agent/src/main/java/li/strolch/agent/api/Observer.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/ObserverEvent.java b/agent/src/main/java/li/strolch/agent/api/ObserverEvent.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/ObserverEvent.java
rename to agent/src/main/java/li/strolch/agent/api/ObserverEvent.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/ObserverHandler.java b/agent/src/main/java/li/strolch/agent/api/ObserverHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/ObserverHandler.java
rename to agent/src/main/java/li/strolch/agent/api/ObserverHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/OrderMap.java b/agent/src/main/java/li/strolch/agent/api/OrderMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/OrderMap.java
rename to agent/src/main/java/li/strolch/agent/api/OrderMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/PostInitializer.java b/agent/src/main/java/li/strolch/agent/api/PostInitializer.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/PostInitializer.java
rename to agent/src/main/java/li/strolch/agent/api/PostInitializer.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/RealmHandler.java b/agent/src/main/java/li/strolch/agent/api/RealmHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/RealmHandler.java
rename to agent/src/main/java/li/strolch/agent/api/RealmHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/ResourceMap.java b/agent/src/main/java/li/strolch/agent/api/ResourceMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/ResourceMap.java
rename to agent/src/main/java/li/strolch/agent/api/ResourceMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/RestrictableElement.java b/agent/src/main/java/li/strolch/agent/api/RestrictableElement.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/RestrictableElement.java
rename to agent/src/main/java/li/strolch/agent/api/RestrictableElement.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchAgent.java b/agent/src/main/java/li/strolch/agent/api/StrolchAgent.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchAgent.java
rename to agent/src/main/java/li/strolch/agent/api/StrolchAgent.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchBootstrapper.java b/agent/src/main/java/li/strolch/agent/api/StrolchBootstrapper.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchBootstrapper.java
rename to agent/src/main/java/li/strolch/agent/api/StrolchBootstrapper.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchComponent.java b/agent/src/main/java/li/strolch/agent/api/StrolchComponent.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchComponent.java
rename to agent/src/main/java/li/strolch/agent/api/StrolchComponent.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchLockException.java b/agent/src/main/java/li/strolch/agent/api/StrolchLockException.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchLockException.java
rename to agent/src/main/java/li/strolch/agent/api/StrolchLockException.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchRealm.java b/agent/src/main/java/li/strolch/agent/api/StrolchRealm.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchRealm.java
rename to agent/src/main/java/li/strolch/agent/api/StrolchRealm.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchVersion.java b/agent/src/main/java/li/strolch/agent/api/StrolchVersion.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchVersion.java
rename to agent/src/main/java/li/strolch/agent/api/StrolchVersion.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/VersionQueryResult.java b/agent/src/main/java/li/strolch/agent/api/VersionQueryResult.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/api/VersionQueryResult.java
rename to agent/src/main/java/li/strolch/agent/api/VersionQueryResult.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingActivityMap.java b/agent/src/main/java/li/strolch/agent/impl/AuditingActivityMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingActivityMap.java
rename to agent/src/main/java/li/strolch/agent/impl/AuditingActivityMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingAuditMapFacade.java b/agent/src/main/java/li/strolch/agent/impl/AuditingAuditMapFacade.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingAuditMapFacade.java
rename to agent/src/main/java/li/strolch/agent/impl/AuditingAuditMapFacade.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingElementMapFacade.java b/agent/src/main/java/li/strolch/agent/impl/AuditingElementMapFacade.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingElementMapFacade.java
rename to agent/src/main/java/li/strolch/agent/impl/AuditingElementMapFacade.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingOrderMap.java b/agent/src/main/java/li/strolch/agent/impl/AuditingOrderMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingOrderMap.java
rename to agent/src/main/java/li/strolch/agent/impl/AuditingOrderMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingResourceMap.java b/agent/src/main/java/li/strolch/agent/impl/AuditingResourceMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/AuditingResourceMap.java
rename to agent/src/main/java/li/strolch/agent/impl/AuditingResourceMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedActivityMap.java b/agent/src/main/java/li/strolch/agent/impl/CachedActivityMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedActivityMap.java
rename to agent/src/main/java/li/strolch/agent/impl/CachedActivityMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedAuditTrail.java b/agent/src/main/java/li/strolch/agent/impl/CachedAuditTrail.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedAuditTrail.java
rename to agent/src/main/java/li/strolch/agent/impl/CachedAuditTrail.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedElementMap.java b/agent/src/main/java/li/strolch/agent/impl/CachedElementMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedElementMap.java
rename to agent/src/main/java/li/strolch/agent/impl/CachedElementMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedOrderMap.java b/agent/src/main/java/li/strolch/agent/impl/CachedOrderMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedOrderMap.java
rename to agent/src/main/java/li/strolch/agent/impl/CachedOrderMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedRealm.java b/agent/src/main/java/li/strolch/agent/impl/CachedRealm.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedRealm.java
rename to agent/src/main/java/li/strolch/agent/impl/CachedRealm.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedRealmLoader.java b/agent/src/main/java/li/strolch/agent/impl/CachedRealmLoader.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedRealmLoader.java
rename to agent/src/main/java/li/strolch/agent/impl/CachedRealmLoader.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedResourceMap.java b/agent/src/main/java/li/strolch/agent/impl/CachedResourceMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedResourceMap.java
rename to agent/src/main/java/li/strolch/agent/impl/CachedResourceMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentContainerImpl.java b/agent/src/main/java/li/strolch/agent/impl/ComponentContainerImpl.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentContainerImpl.java
rename to agent/src/main/java/li/strolch/agent/impl/ComponentContainerImpl.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentContainerStateHandler.java b/agent/src/main/java/li/strolch/agent/impl/ComponentContainerStateHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentContainerStateHandler.java
rename to agent/src/main/java/li/strolch/agent/impl/ComponentContainerStateHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentController.java b/agent/src/main/java/li/strolch/agent/impl/ComponentController.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentController.java
rename to agent/src/main/java/li/strolch/agent/impl/ComponentController.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentDependencyAnalyzer.java b/agent/src/main/java/li/strolch/agent/impl/ComponentDependencyAnalyzer.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/ComponentDependencyAnalyzer.java
rename to agent/src/main/java/li/strolch/agent/impl/ComponentDependencyAnalyzer.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/DataStoreMode.java b/agent/src/main/java/li/strolch/agent/impl/DataStoreMode.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/DataStoreMode.java
rename to agent/src/main/java/li/strolch/agent/impl/DataStoreMode.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultLockHandler.java b/agent/src/main/java/li/strolch/agent/impl/DefaultLockHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultLockHandler.java
rename to agent/src/main/java/li/strolch/agent/impl/DefaultLockHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultObserverHandler.java b/agent/src/main/java/li/strolch/agent/impl/DefaultObserverHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultObserverHandler.java
rename to agent/src/main/java/li/strolch/agent/impl/DefaultObserverHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java b/agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java
rename to agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/ElementMapHelpers.java b/agent/src/main/java/li/strolch/agent/impl/ElementMapHelpers.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/ElementMapHelpers.java
rename to agent/src/main/java/li/strolch/agent/impl/ElementMapHelpers.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/EmptyRealm.java b/agent/src/main/java/li/strolch/agent/impl/EmptyRealm.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/EmptyRealm.java
rename to agent/src/main/java/li/strolch/agent/impl/EmptyRealm.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/InMemoryElementListener.java b/agent/src/main/java/li/strolch/agent/impl/InMemoryElementListener.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/InMemoryElementListener.java
rename to agent/src/main/java/li/strolch/agent/impl/InMemoryElementListener.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/InternalStrolchRealm.java b/agent/src/main/java/li/strolch/agent/impl/InternalStrolchRealm.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/InternalStrolchRealm.java
rename to agent/src/main/java/li/strolch/agent/impl/InternalStrolchRealm.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/NoStrategyAuditTrail.java b/agent/src/main/java/li/strolch/agent/impl/NoStrategyAuditTrail.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/NoStrategyAuditTrail.java
rename to agent/src/main/java/li/strolch/agent/impl/NoStrategyAuditTrail.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/SimplePostInitializer.java b/agent/src/main/java/li/strolch/agent/impl/SimplePostInitializer.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/SimplePostInitializer.java
rename to agent/src/main/java/li/strolch/agent/impl/SimplePostInitializer.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/StoreToDaoElementListener.java b/agent/src/main/java/li/strolch/agent/impl/StoreToDaoElementListener.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/StoreToDaoElementListener.java
rename to agent/src/main/java/li/strolch/agent/impl/StoreToDaoElementListener.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientActivityMap.java b/agent/src/main/java/li/strolch/agent/impl/TransientActivityMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientActivityMap.java
rename to agent/src/main/java/li/strolch/agent/impl/TransientActivityMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientAuditTrail.java b/agent/src/main/java/li/strolch/agent/impl/TransientAuditTrail.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientAuditTrail.java
rename to agent/src/main/java/li/strolch/agent/impl/TransientAuditTrail.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientElementMap.java b/agent/src/main/java/li/strolch/agent/impl/TransientElementMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientElementMap.java
rename to agent/src/main/java/li/strolch/agent/impl/TransientElementMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientOrderMap.java b/agent/src/main/java/li/strolch/agent/impl/TransientOrderMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientOrderMap.java
rename to agent/src/main/java/li/strolch/agent/impl/TransientOrderMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientRealm.java b/agent/src/main/java/li/strolch/agent/impl/TransientRealm.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientRealm.java
rename to agent/src/main/java/li/strolch/agent/impl/TransientRealm.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientResourceMap.java b/agent/src/main/java/li/strolch/agent/impl/TransientResourceMap.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientResourceMap.java
rename to agent/src/main/java/li/strolch/agent/impl/TransientResourceMap.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientTransaction.java b/agent/src/main/java/li/strolch/agent/impl/TransientTransaction.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/agent/impl/TransientTransaction.java
rename to agent/src/main/java/li/strolch/agent/impl/TransientTransaction.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/handler/operationslog/OperationsLog.java b/agent/src/main/java/li/strolch/handler/operationslog/OperationsLog.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/handler/operationslog/OperationsLog.java
rename to agent/src/main/java/li/strolch/handler/operationslog/OperationsLog.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/job/ConfigureMethod.java b/agent/src/main/java/li/strolch/job/ConfigureMethod.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/job/ConfigureMethod.java
rename to agent/src/main/java/li/strolch/job/ConfigureMethod.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/job/JobMode.java b/agent/src/main/java/li/strolch/job/JobMode.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/job/JobMode.java
rename to agent/src/main/java/li/strolch/job/JobMode.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/job/ReloadJobsJob.java b/agent/src/main/java/li/strolch/job/ReloadJobsJob.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/job/ReloadJobsJob.java
rename to agent/src/main/java/li/strolch/job/ReloadJobsJob.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/job/StrolchJob.java b/agent/src/main/java/li/strolch/job/StrolchJob.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/job/StrolchJob.java
rename to agent/src/main/java/li/strolch/job/StrolchJob.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/job/StrolchJobsHandler.java b/agent/src/main/java/li/strolch/job/StrolchJobsHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/job/StrolchJobsHandler.java
rename to agent/src/main/java/li/strolch/job/StrolchJobsHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java b/agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
rename to agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/ActivityDao.java b/agent/src/main/java/li/strolch/persistence/api/ActivityDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/ActivityDao.java
rename to agent/src/main/java/li/strolch/persistence/api/ActivityDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AddActivitiesCommand.java b/agent/src/main/java/li/strolch/persistence/api/AddActivitiesCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/AddActivitiesCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/AddActivitiesCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AddActivityCommand.java b/agent/src/main/java/li/strolch/persistence/api/AddActivityCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/AddActivityCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/AddActivityCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AddOrderCommand.java b/agent/src/main/java/li/strolch/persistence/api/AddOrderCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/AddOrderCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/AddOrderCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AddOrdersCommand.java b/agent/src/main/java/li/strolch/persistence/api/AddOrdersCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/AddOrdersCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/AddOrdersCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AddResourceCommand.java b/agent/src/main/java/li/strolch/persistence/api/AddResourceCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/AddResourceCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/AddResourceCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AddResourcesCommand.java b/agent/src/main/java/li/strolch/persistence/api/AddResourcesCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/AddResourcesCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/AddResourcesCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AuditDao.java b/agent/src/main/java/li/strolch/persistence/api/AuditDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/AuditDao.java
rename to agent/src/main/java/li/strolch/persistence/api/AuditDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/DataArchiveHandler.java b/agent/src/main/java/li/strolch/persistence/api/DataArchiveHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/DataArchiveHandler.java
rename to agent/src/main/java/li/strolch/persistence/api/DataArchiveHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/LogMessageDao.java b/agent/src/main/java/li/strolch/persistence/api/LogMessageDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/LogMessageDao.java
rename to agent/src/main/java/li/strolch/persistence/api/LogMessageDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/ModificationResult.java b/agent/src/main/java/li/strolch/persistence/api/ModificationResult.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/ModificationResult.java
rename to agent/src/main/java/li/strolch/persistence/api/ModificationResult.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/Operation.java b/agent/src/main/java/li/strolch/persistence/api/Operation.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/Operation.java
rename to agent/src/main/java/li/strolch/persistence/api/Operation.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/OrderDao.java b/agent/src/main/java/li/strolch/persistence/api/OrderDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/OrderDao.java
rename to agent/src/main/java/li/strolch/persistence/api/OrderDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/PersistenceHandler.java b/agent/src/main/java/li/strolch/persistence/api/PersistenceHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/PersistenceHandler.java
rename to agent/src/main/java/li/strolch/persistence/api/PersistenceHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveActivitiesCommand.java b/agent/src/main/java/li/strolch/persistence/api/RemoveActivitiesCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveActivitiesCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/RemoveActivitiesCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveActivityCommand.java b/agent/src/main/java/li/strolch/persistence/api/RemoveActivityCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveActivityCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/RemoveActivityCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveOrderCommand.java b/agent/src/main/java/li/strolch/persistence/api/RemoveOrderCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveOrderCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/RemoveOrderCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveOrdersCommand.java b/agent/src/main/java/li/strolch/persistence/api/RemoveOrdersCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveOrdersCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/RemoveOrdersCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveResourceCommand.java b/agent/src/main/java/li/strolch/persistence/api/RemoveResourceCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveResourceCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/RemoveResourceCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveResourcesCommand.java b/agent/src/main/java/li/strolch/persistence/api/RemoveResourcesCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/RemoveResourcesCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/RemoveResourcesCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/ResourceDao.java b/agent/src/main/java/li/strolch/persistence/api/ResourceDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/ResourceDao.java
rename to agent/src/main/java/li/strolch/persistence/api/ResourceDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchDao.java b/agent/src/main/java/li/strolch/persistence/api/StrolchDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchDao.java
rename to agent/src/main/java/li/strolch/persistence/api/StrolchDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchPersistenceException.java b/agent/src/main/java/li/strolch/persistence/api/StrolchPersistenceException.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchPersistenceException.java
rename to agent/src/main/java/li/strolch/persistence/api/StrolchPersistenceException.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchTransaction.java b/agent/src/main/java/li/strolch/persistence/api/StrolchTransaction.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchTransaction.java
rename to agent/src/main/java/li/strolch/persistence/api/StrolchTransaction.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchTransactionException.java b/agent/src/main/java/li/strolch/persistence/api/StrolchTransactionException.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/StrolchTransactionException.java
rename to agent/src/main/java/li/strolch/persistence/api/StrolchTransactionException.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/TransactionCloseStrategy.java b/agent/src/main/java/li/strolch/persistence/api/TransactionCloseStrategy.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/TransactionCloseStrategy.java
rename to agent/src/main/java/li/strolch/persistence/api/TransactionCloseStrategy.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/TransactionResult.java b/agent/src/main/java/li/strolch/persistence/api/TransactionResult.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/TransactionResult.java
rename to agent/src/main/java/li/strolch/persistence/api/TransactionResult.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/TransactionState.java b/agent/src/main/java/li/strolch/persistence/api/TransactionState.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/TransactionState.java
rename to agent/src/main/java/li/strolch/persistence/api/TransactionState.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/TransactionThreadLocal.java b/agent/src/main/java/li/strolch/persistence/api/TransactionThreadLocal.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/TransactionThreadLocal.java
rename to agent/src/main/java/li/strolch/persistence/api/TransactionThreadLocal.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/TxAddStrolchRootElementVisitor.java b/agent/src/main/java/li/strolch/persistence/api/TxAddStrolchRootElementVisitor.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/TxAddStrolchRootElementVisitor.java
rename to agent/src/main/java/li/strolch/persistence/api/TxAddStrolchRootElementVisitor.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/TxRemoveStrolchRootElementVisitor.java b/agent/src/main/java/li/strolch/persistence/api/TxRemoveStrolchRootElementVisitor.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/TxRemoveStrolchRootElementVisitor.java
rename to agent/src/main/java/li/strolch/persistence/api/TxRemoveStrolchRootElementVisitor.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/TxUpdateStrolchRootElementVisitor.java b/agent/src/main/java/li/strolch/persistence/api/TxUpdateStrolchRootElementVisitor.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/TxUpdateStrolchRootElementVisitor.java
rename to agent/src/main/java/li/strolch/persistence/api/TxUpdateStrolchRootElementVisitor.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateActivitiesCommand.java b/agent/src/main/java/li/strolch/persistence/api/UpdateActivitiesCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateActivitiesCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/UpdateActivitiesCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateActivityCommand.java b/agent/src/main/java/li/strolch/persistence/api/UpdateActivityCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateActivityCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/UpdateActivityCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateOrderCommand.java b/agent/src/main/java/li/strolch/persistence/api/UpdateOrderCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateOrderCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/UpdateOrderCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateOrdersCommand.java b/agent/src/main/java/li/strolch/persistence/api/UpdateOrdersCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateOrdersCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/UpdateOrdersCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateResourceCommand.java b/agent/src/main/java/li/strolch/persistence/api/UpdateResourceCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateResourceCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/UpdateResourceCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateResourcesCommand.java b/agent/src/main/java/li/strolch/persistence/api/UpdateResourcesCommand.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/api/UpdateResourcesCommand.java
rename to agent/src/main/java/li/strolch/persistence/api/UpdateResourcesCommand.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryActivityDao.java b/agent/src/main/java/li/strolch/persistence/impl/InMemoryActivityDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryActivityDao.java
rename to agent/src/main/java/li/strolch/persistence/impl/InMemoryActivityDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryDataArchiveHandler.java b/agent/src/main/java/li/strolch/persistence/impl/InMemoryDataArchiveHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryDataArchiveHandler.java
rename to agent/src/main/java/li/strolch/persistence/impl/InMemoryDataArchiveHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryOrderDao.java b/agent/src/main/java/li/strolch/persistence/impl/InMemoryOrderDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryOrderDao.java
rename to agent/src/main/java/li/strolch/persistence/impl/InMemoryOrderDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryResourceDao.java b/agent/src/main/java/li/strolch/persistence/impl/InMemoryResourceDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryResourceDao.java
rename to agent/src/main/java/li/strolch/persistence/impl/InMemoryResourceDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryStrolchDao.java b/agent/src/main/java/li/strolch/persistence/impl/InMemoryStrolchDao.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/persistence/impl/InMemoryStrolchDao.java
rename to agent/src/main/java/li/strolch/persistence/impl/InMemoryStrolchDao.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java b/agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
rename to agent/src/main/java/li/strolch/policy/DefaultPolicyHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/policy/PolicyHandler.java b/agent/src/main/java/li/strolch/policy/PolicyHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/policy/PolicyHandler.java
rename to agent/src/main/java/li/strolch/policy/PolicyHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/policy/ReloadPoliciesJob.java b/agent/src/main/java/li/strolch/policy/ReloadPoliciesJob.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/policy/ReloadPoliciesJob.java
rename to agent/src/main/java/li/strolch/policy/ReloadPoliciesJob.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/policy/ReloadPrivilegeHandlerJob.java b/agent/src/main/java/li/strolch/policy/ReloadPrivilegeHandlerJob.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/policy/ReloadPrivilegeHandlerJob.java
rename to agent/src/main/java/li/strolch/policy/ReloadPrivilegeHandlerJob.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/policy/StrolchPolicy.java b/agent/src/main/java/li/strolch/policy/StrolchPolicy.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/policy/StrolchPolicy.java
rename to agent/src/main/java/li/strolch/policy/StrolchPolicy.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/policy/StrolchPolicyFileParser.java b/agent/src/main/java/li/strolch/policy/StrolchPolicyFileParser.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/policy/StrolchPolicyFileParser.java
rename to agent/src/main/java/li/strolch/policy/StrolchPolicyFileParser.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java b/agent/src/main/java/li/strolch/runtime/StrolchConstants.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/StrolchConstants.java
rename to agent/src/main/java/li/strolch/runtime/StrolchConstants.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/AbstractionConfiguration.java b/agent/src/main/java/li/strolch/runtime/configuration/AbstractionConfiguration.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/AbstractionConfiguration.java
rename to agent/src/main/java/li/strolch/runtime/configuration/AbstractionConfiguration.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ComponentConfiguration.java b/agent/src/main/java/li/strolch/runtime/configuration/ComponentConfiguration.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ComponentConfiguration.java
rename to agent/src/main/java/li/strolch/runtime/configuration/ComponentConfiguration.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ConfigurationParser.java b/agent/src/main/java/li/strolch/runtime/configuration/ConfigurationParser.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ConfigurationParser.java
rename to agent/src/main/java/li/strolch/runtime/configuration/ConfigurationParser.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ConfigurationSaxParser.java b/agent/src/main/java/li/strolch/runtime/configuration/ConfigurationSaxParser.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ConfigurationSaxParser.java
rename to agent/src/main/java/li/strolch/runtime/configuration/ConfigurationSaxParser.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ConfigurationTags.java b/agent/src/main/java/li/strolch/runtime/configuration/ConfigurationTags.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/ConfigurationTags.java
rename to agent/src/main/java/li/strolch/runtime/configuration/ConfigurationTags.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/DbConnectionBuilder.java b/agent/src/main/java/li/strolch/runtime/configuration/DbConnectionBuilder.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/DbConnectionBuilder.java
rename to agent/src/main/java/li/strolch/runtime/configuration/DbConnectionBuilder.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/RuntimeConfiguration.java b/agent/src/main/java/li/strolch/runtime/configuration/RuntimeConfiguration.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/RuntimeConfiguration.java
rename to agent/src/main/java/li/strolch/runtime/configuration/RuntimeConfiguration.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/StrolchConfiguration.java b/agent/src/main/java/li/strolch/runtime/configuration/StrolchConfiguration.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/StrolchConfiguration.java
rename to agent/src/main/java/li/strolch/runtime/configuration/StrolchConfiguration.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/StrolchConfigurationException.java b/agent/src/main/java/li/strolch/runtime/configuration/StrolchConfigurationException.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/StrolchConfigurationException.java
rename to agent/src/main/java/li/strolch/runtime/configuration/StrolchConfigurationException.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/configuration/StrolchEnvironment.java b/agent/src/main/java/li/strolch/runtime/configuration/StrolchEnvironment.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/configuration/StrolchEnvironment.java
rename to agent/src/main/java/li/strolch/runtime/configuration/StrolchEnvironment.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java b/agent/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java
rename to agent/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/privilege/ModelPrivilege.java b/agent/src/main/java/li/strolch/runtime/privilege/ModelPrivilege.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/privilege/ModelPrivilege.java
rename to agent/src/main/java/li/strolch/runtime/privilege/ModelPrivilege.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/privilege/PrivilegeHandler.java b/agent/src/main/java/li/strolch/runtime/privilege/PrivilegeHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/privilege/PrivilegeHandler.java
rename to agent/src/main/java/li/strolch/runtime/privilege/PrivilegeHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/privilege/PrivilegedRunnable.java b/agent/src/main/java/li/strolch/runtime/privilege/PrivilegedRunnable.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/privilege/PrivilegedRunnable.java
rename to agent/src/main/java/li/strolch/runtime/privilege/PrivilegedRunnable.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/privilege/PrivilegedRunnableWithResult.java b/agent/src/main/java/li/strolch/runtime/privilege/PrivilegedRunnableWithResult.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/privilege/PrivilegedRunnableWithResult.java
rename to agent/src/main/java/li/strolch/runtime/privilege/PrivilegedRunnableWithResult.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/privilege/StrolchSystemAction.java b/agent/src/main/java/li/strolch/runtime/privilege/StrolchSystemAction.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/privilege/StrolchSystemAction.java
rename to agent/src/main/java/li/strolch/runtime/privilege/StrolchSystemAction.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/privilege/StrolchSystemActionWithResult.java b/agent/src/main/java/li/strolch/runtime/privilege/StrolchSystemActionWithResult.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/privilege/StrolchSystemActionWithResult.java
rename to agent/src/main/java/li/strolch/runtime/privilege/StrolchSystemActionWithResult.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/privilege/TransactedRestrictable.java b/agent/src/main/java/li/strolch/runtime/privilege/TransactedRestrictable.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/privilege/TransactedRestrictable.java
rename to agent/src/main/java/li/strolch/runtime/privilege/TransactedRestrictable.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java b/agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java
rename to agent/src/main/java/li/strolch/runtime/query/enums/DefaultEnumHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/EnumHandler.java b/agent/src/main/java/li/strolch/runtime/query/enums/EnumHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/EnumHandler.java
rename to agent/src/main/java/li/strolch/runtime/query/enums/EnumHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/EnumValue.java b/agent/src/main/java/li/strolch/runtime/query/enums/EnumValue.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/EnumValue.java
rename to agent/src/main/java/li/strolch/runtime/query/enums/EnumValue.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/StrolchEnum.java b/agent/src/main/java/li/strolch/runtime/query/enums/StrolchEnum.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/runtime/query/enums/StrolchEnum.java
rename to agent/src/main/java/li/strolch/runtime/query/enums/StrolchEnum.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/ActivitySearch.java b/agent/src/main/java/li/strolch/search/ActivitySearch.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/ActivitySearch.java
rename to agent/src/main/java/li/strolch/search/ActivitySearch.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/ExpressionBuilder.java b/agent/src/main/java/li/strolch/search/ExpressionBuilder.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/ExpressionBuilder.java
rename to agent/src/main/java/li/strolch/search/ExpressionBuilder.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/ExpressionsSupport.java b/agent/src/main/java/li/strolch/search/ExpressionsSupport.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/ExpressionsSupport.java
rename to agent/src/main/java/li/strolch/search/ExpressionsSupport.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/OrderSearch.java b/agent/src/main/java/li/strolch/search/OrderSearch.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/OrderSearch.java
rename to agent/src/main/java/li/strolch/search/OrderSearch.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/PredicatesSupport.java b/agent/src/main/java/li/strolch/search/PredicatesSupport.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/PredicatesSupport.java
rename to agent/src/main/java/li/strolch/search/PredicatesSupport.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/ResourceSearch.java b/agent/src/main/java/li/strolch/search/ResourceSearch.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/ResourceSearch.java
rename to agent/src/main/java/li/strolch/search/ResourceSearch.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/RootElementSearch.java b/agent/src/main/java/li/strolch/search/RootElementSearch.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/RootElementSearch.java
rename to agent/src/main/java/li/strolch/search/RootElementSearch.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/RootElementSearchResult.java b/agent/src/main/java/li/strolch/search/RootElementSearchResult.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/RootElementSearchResult.java
rename to agent/src/main/java/li/strolch/search/RootElementSearchResult.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/SearchBuilder.java b/agent/src/main/java/li/strolch/search/SearchBuilder.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/SearchBuilder.java
rename to agent/src/main/java/li/strolch/search/SearchBuilder.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/SearchExpression.java b/agent/src/main/java/li/strolch/search/SearchExpression.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/SearchExpression.java
rename to agent/src/main/java/li/strolch/search/SearchExpression.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/SearchExpressions.java b/agent/src/main/java/li/strolch/search/SearchExpressions.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/SearchExpressions.java
rename to agent/src/main/java/li/strolch/search/SearchExpressions.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/SearchNavigator.java b/agent/src/main/java/li/strolch/search/SearchNavigator.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/SearchNavigator.java
rename to agent/src/main/java/li/strolch/search/SearchNavigator.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/SearchPredicate.java b/agent/src/main/java/li/strolch/search/SearchPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/SearchPredicate.java
rename to agent/src/main/java/li/strolch/search/SearchPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/SearchPredicates.java b/agent/src/main/java/li/strolch/search/SearchPredicates.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/SearchPredicates.java
rename to agent/src/main/java/li/strolch/search/SearchPredicates.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/SearchResult.java b/agent/src/main/java/li/strolch/search/SearchResult.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/SearchResult.java
rename to agent/src/main/java/li/strolch/search/SearchResult.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/StrolchSearch.java b/agent/src/main/java/li/strolch/search/StrolchSearch.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/StrolchSearch.java
rename to agent/src/main/java/li/strolch/search/StrolchSearch.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/StrolchValueSearch.java b/agent/src/main/java/li/strolch/search/StrolchValueSearch.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/StrolchValueSearch.java
rename to agent/src/main/java/li/strolch/search/StrolchValueSearch.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/ValueCoercer.java b/agent/src/main/java/li/strolch/search/ValueCoercer.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/ValueCoercer.java
rename to agent/src/main/java/li/strolch/search/ValueCoercer.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/ValueSearch.java b/agent/src/main/java/li/strolch/search/ValueSearch.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/ValueSearch.java
rename to agent/src/main/java/li/strolch/search/ValueSearch.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/ValueSearchExpression.java b/agent/src/main/java/li/strolch/search/ValueSearchExpression.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/ValueSearchExpression.java
rename to agent/src/main/java/li/strolch/search/ValueSearchExpression.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/ValueSearchExpressionBuilder.java b/agent/src/main/java/li/strolch/search/ValueSearchExpressionBuilder.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/ValueSearchExpressionBuilder.java
rename to agent/src/main/java/li/strolch/search/ValueSearchExpressionBuilder.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/AbstractSearchPredicate.java b/agent/src/main/java/li/strolch/search/predicates/AbstractSearchPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/AbstractSearchPredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/AbstractSearchPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/CollectionContainsPredicate.java b/agent/src/main/java/li/strolch/search/predicates/CollectionContainsPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/CollectionContainsPredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/CollectionContainsPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/ContainsPredicate.java b/agent/src/main/java/li/strolch/search/predicates/ContainsPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/ContainsPredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/ContainsPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/EndsWithPredicate.java b/agent/src/main/java/li/strolch/search/predicates/EndsWithPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/EndsWithPredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/EndsWithPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/InRangePredicate.java b/agent/src/main/java/li/strolch/search/predicates/InRangePredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/InRangePredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/InRangePredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/IsEmptyPredicate.java b/agent/src/main/java/li/strolch/search/predicates/IsEmptyPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/IsEmptyPredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/IsEmptyPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/IsEqualToPredicate.java b/agent/src/main/java/li/strolch/search/predicates/IsEqualToPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/IsEqualToPredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/IsEqualToPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/IsInPredicate.java b/agent/src/main/java/li/strolch/search/predicates/IsInPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/IsInPredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/IsInPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/NotPredicate.java b/agent/src/main/java/li/strolch/search/predicates/NotPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/NotPredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/NotPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/search/predicates/StartsWithPredicate.java b/agent/src/main/java/li/strolch/search/predicates/StartsWithPredicate.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/search/predicates/StartsWithPredicate.java
rename to agent/src/main/java/li/strolch/search/predicates/StartsWithPredicate.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java b/agent/src/main/java/li/strolch/service/api/AbstractService.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java
rename to agent/src/main/java/li/strolch/service/api/AbstractService.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/Command.java b/agent/src/main/java/li/strolch/service/api/Command.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/service/api/Command.java
rename to agent/src/main/java/li/strolch/service/api/Command.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java b/agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java
rename to agent/src/main/java/li/strolch/service/api/DefaultServiceHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/Service.java b/agent/src/main/java/li/strolch/service/api/Service.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/service/api/Service.java
rename to agent/src/main/java/li/strolch/service/api/Service.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/ServiceArgument.java b/agent/src/main/java/li/strolch/service/api/ServiceArgument.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/service/api/ServiceArgument.java
rename to agent/src/main/java/li/strolch/service/api/ServiceArgument.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/ServiceHandler.java b/agent/src/main/java/li/strolch/service/api/ServiceHandler.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/service/api/ServiceHandler.java
rename to agent/src/main/java/li/strolch/service/api/ServiceHandler.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/ServiceResult.java b/agent/src/main/java/li/strolch/service/api/ServiceResult.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/service/api/ServiceResult.java
rename to agent/src/main/java/li/strolch/service/api/ServiceResult.java
diff --git a/li.strolch.agent/src/main/java/li/strolch/service/api/ServiceResultState.java b/agent/src/main/java/li/strolch/service/api/ServiceResultState.java
similarity index 100%
rename from li.strolch.agent/src/main/java/li/strolch/service/api/ServiceResultState.java
rename to agent/src/main/java/li/strolch/service/api/ServiceResultState.java
diff --git a/li.strolch.agent/src/main/resources/agentVersion.properties b/agent/src/main/resources/agentVersion.properties
similarity index 100%
rename from li.strolch.agent/src/main/resources/agentVersion.properties
rename to agent/src/main/resources/agentVersion.properties
diff --git a/li.strolch.agent/src/main/resources/strolch-agent.properties b/agent/src/main/resources/strolch-agent.properties
similarity index 100%
rename from li.strolch.agent/src/main/resources/strolch-agent.properties
rename to agent/src/main/resources/strolch-agent.properties
diff --git a/li.strolch.agent/src/test/java/li/strolch/RuntimeMock.java b/agent/src/test/java/li/strolch/RuntimeMock.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/RuntimeMock.java
rename to agent/src/test/java/li/strolch/RuntimeMock.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/agent/ComponentContainerTest.java b/agent/src/test/java/li/strolch/agent/ComponentContainerTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/agent/ComponentContainerTest.java
rename to agent/src/test/java/li/strolch/agent/ComponentContainerTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/agent/ObserverHandlerTests.java b/agent/src/test/java/li/strolch/agent/ObserverHandlerTests.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/agent/ObserverHandlerTests.java
rename to agent/src/test/java/li/strolch/agent/ObserverHandlerTests.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/agent/ParallelTests.java b/agent/src/test/java/li/strolch/agent/ParallelTests.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/agent/ParallelTests.java
rename to agent/src/test/java/li/strolch/agent/ParallelTests.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/agent/RealmTest.java b/agent/src/test/java/li/strolch/agent/RealmTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/agent/RealmTest.java
rename to agent/src/test/java/li/strolch/agent/RealmTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/PolicyHandlerTest.java b/agent/src/test/java/li/strolch/policytest/PolicyHandlerTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/policytest/PolicyHandlerTest.java
rename to agent/src/test/java/li/strolch/policytest/PolicyHandlerTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/TestConfirmationPolicy.java b/agent/src/test/java/li/strolch/policytest/TestConfirmationPolicy.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/policytest/TestConfirmationPolicy.java
rename to agent/src/test/java/li/strolch/policytest/TestConfirmationPolicy.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/TestExecutionPolicy.java b/agent/src/test/java/li/strolch/policytest/TestExecutionPolicy.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/policytest/TestExecutionPolicy.java
rename to agent/src/test/java/li/strolch/policytest/TestExecutionPolicy.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/TestNoConfirmationPolicy.java b/agent/src/test/java/li/strolch/policytest/TestNoConfirmationPolicy.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/policytest/TestNoConfirmationPolicy.java
rename to agent/src/test/java/li/strolch/policytest/TestNoConfirmationPolicy.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/TestPlanningPolicy.java b/agent/src/test/java/li/strolch/policytest/TestPlanningPolicy.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/policytest/TestPlanningPolicy.java
rename to agent/src/test/java/li/strolch/policytest/TestPlanningPolicy.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/TestSimplePlanningPolicy.java b/agent/src/test/java/li/strolch/policytest/TestSimplePlanningPolicy.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/policytest/TestSimplePlanningPolicy.java
rename to agent/src/test/java/li/strolch/policytest/TestSimplePlanningPolicy.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/policytest/TestSimulatedExecutionPolicy.java b/agent/src/test/java/li/strolch/policytest/TestSimulatedExecutionPolicy.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/policytest/TestSimulatedExecutionPolicy.java
rename to agent/src/test/java/li/strolch/policytest/TestSimulatedExecutionPolicy.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/BootstrapperTest.java b/agent/src/test/java/li/strolch/runtime/configuration/BootstrapperTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/BootstrapperTest.java
rename to agent/src/test/java/li/strolch/runtime/configuration/BootstrapperTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/ConfigurationParserTest.java b/agent/src/test/java/li/strolch/runtime/configuration/ConfigurationParserTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/ConfigurationParserTest.java
rename to agent/src/test/java/li/strolch/runtime/configuration/ConfigurationParserTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/ControllerDependencyTest.java b/agent/src/test/java/li/strolch/runtime/configuration/ControllerDependencyTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/ControllerDependencyTest.java
rename to agent/src/test/java/li/strolch/runtime/configuration/ControllerDependencyTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/PersistenceHandler.java b/agent/src/test/java/li/strolch/runtime/configuration/model/PersistenceHandler.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/PersistenceHandler.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/PersistenceHandler.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/PersistenceHandlerImpl.java b/agent/src/test/java/li/strolch/runtime/configuration/model/PersistenceHandlerImpl.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/PersistenceHandlerImpl.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/PersistenceHandlerImpl.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/PostInitializerTest.java b/agent/src/test/java/li/strolch/runtime/configuration/model/PostInitializerTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/PostInitializerTest.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/PostInitializerTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/PostInitializerTestImpl.java b/agent/src/test/java/li/strolch/runtime/configuration/model/PostInitializerTestImpl.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/PostInitializerTestImpl.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/PostInitializerTestImpl.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ResourceGeneratorHandlerTest.java b/agent/src/test/java/li/strolch/runtime/configuration/model/ResourceGeneratorHandlerTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ResourceGeneratorHandlerTest.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/ResourceGeneratorHandlerTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ResourceGeneratorHandlerTestImpl.java b/agent/src/test/java/li/strolch/runtime/configuration/model/ResourceGeneratorHandlerTestImpl.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ResourceGeneratorHandlerTestImpl.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/ResourceGeneratorHandlerTestImpl.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTest.java b/agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTest.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTestImpl.java b/agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTestImpl.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTestImpl.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTestImpl.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTestImpl2.java b/agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTestImpl2.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTestImpl2.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/ServiceHandlerTestImpl2.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ServiceResultTest.java b/agent/src/test/java/li/strolch/runtime/configuration/model/ServiceResultTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/configuration/model/ServiceResultTest.java
rename to agent/src/test/java/li/strolch/runtime/configuration/model/ServiceResultTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java b/agent/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java
rename to agent/src/test/java/li/strolch/runtime/query/enums/EnumHandlerTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java b/agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java
rename to agent/src/test/java/li/strolch/runtime/query/inmemory/FindByLocatorTest.java
diff --git a/li.strolch.agent/src/test/java/li/strolch/search/StrolchSearchTest.java b/agent/src/test/java/li/strolch/search/StrolchSearchTest.java
similarity index 100%
rename from li.strolch.agent/src/test/java/li/strolch/search/StrolchSearchTest.java
rename to agent/src/test/java/li/strolch/search/StrolchSearchTest.java
diff --git a/li.strolch.agent/src/test/resources/bootstraptest/StrolchBootstrap.xml b/agent/src/test/resources/bootstraptest/StrolchBootstrap.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/bootstraptest/StrolchBootstrap.xml
rename to agent/src/test/resources/bootstraptest/StrolchBootstrap.xml
diff --git a/li.strolch.agent/src/test/resources/configtest/config/StrolchConfiguration.xml b/agent/src/test/resources/configtest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/configtest/config/StrolchConfiguration.xml
rename to agent/src/test/resources/configtest/config/StrolchConfiguration.xml
diff --git a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeConfig.xml b/agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
rename to agent/src/test/resources/emptytest/config/PrivilegeConfig.xml
diff --git a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeRoles.xml b/agent/src/test/resources/emptytest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/emptytest/config/PrivilegeRoles.xml
rename to agent/src/test/resources/emptytest/config/PrivilegeRoles.xml
diff --git a/li.strolch.agent/src/test/resources/emptytest/config/PrivilegeUsers.xml b/agent/src/test/resources/emptytest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/emptytest/config/PrivilegeUsers.xml
rename to agent/src/test/resources/emptytest/config/PrivilegeUsers.xml
diff --git a/li.strolch.agent/src/test/resources/emptytest/config/StrolchConfiguration.xml b/agent/src/test/resources/emptytest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/emptytest/config/StrolchConfiguration.xml
rename to agent/src/test/resources/emptytest/config/StrolchConfiguration.xml
diff --git a/li.strolch.agent/src/test/resources/logback.xml b/agent/src/test/resources/logback.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/logback.xml
rename to agent/src/test/resources/logback.xml
diff --git a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml b/agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
rename to agent/src/test/resources/minimaltest/config/PrivilegeConfig.xml
diff --git a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeRoles.xml b/agent/src/test/resources/minimaltest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeRoles.xml
rename to agent/src/test/resources/minimaltest/config/PrivilegeRoles.xml
diff --git a/li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeUsers.xml b/agent/src/test/resources/minimaltest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/minimaltest/config/PrivilegeUsers.xml
rename to agent/src/test/resources/minimaltest/config/PrivilegeUsers.xml
diff --git a/li.strolch.agent/src/test/resources/minimaltest/config/StrolchConfiguration.xml b/agent/src/test/resources/minimaltest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/minimaltest/config/StrolchConfiguration.xml
rename to agent/src/test/resources/minimaltest/config/StrolchConfiguration.xml
diff --git a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeConfig.xml b/agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
rename to agent/src/test/resources/realmtest/config/PrivilegeConfig.xml
diff --git a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeRoles.xml b/agent/src/test/resources/realmtest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/realmtest/config/PrivilegeRoles.xml
rename to agent/src/test/resources/realmtest/config/PrivilegeRoles.xml
diff --git a/li.strolch.agent/src/test/resources/realmtest/config/PrivilegeUsers.xml b/agent/src/test/resources/realmtest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/realmtest/config/PrivilegeUsers.xml
rename to agent/src/test/resources/realmtest/config/PrivilegeUsers.xml
diff --git a/li.strolch.agent/src/test/resources/realmtest/config/StrolchConfiguration.xml b/agent/src/test/resources/realmtest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/realmtest/config/StrolchConfiguration.xml
rename to agent/src/test/resources/realmtest/config/StrolchConfiguration.xml
diff --git a/li.strolch.agent/src/test/resources/realmtest/data/DefaultRealm.xml b/agent/src/test/resources/realmtest/data/DefaultRealm.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/realmtest/data/DefaultRealm.xml
rename to agent/src/test/resources/realmtest/data/DefaultRealm.xml
diff --git a/li.strolch.agent/src/test/resources/realmtest/data/MyRealm.xml b/agent/src/test/resources/realmtest/data/MyRealm.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/realmtest/data/MyRealm.xml
rename to agent/src/test/resources/realmtest/data/MyRealm.xml
diff --git a/li.strolch.agent/src/test/resources/realmtest/data/Orders.xml b/agent/src/test/resources/realmtest/data/Orders.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/realmtest/data/Orders.xml
rename to agent/src/test/resources/realmtest/data/Orders.xml
diff --git a/li.strolch.agent/src/test/resources/realmtest/data/OtherRealm.xml b/agent/src/test/resources/realmtest/data/OtherRealm.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/realmtest/data/OtherRealm.xml
rename to agent/src/test/resources/realmtest/data/OtherRealm.xml
diff --git a/li.strolch.agent/src/test/resources/realmtest/data/Resources.xml b/agent/src/test/resources/realmtest/data/Resources.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/realmtest/data/Resources.xml
rename to agent/src/test/resources/realmtest/data/Resources.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeConfig.xml b/agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
rename to agent/src/test/resources/transienttest/config/PrivilegeConfig.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeRoles.xml b/agent/src/test/resources/transienttest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/config/PrivilegeRoles.xml
rename to agent/src/test/resources/transienttest/config/PrivilegeRoles.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/config/PrivilegeUsers.xml b/agent/src/test/resources/transienttest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/config/PrivilegeUsers.xml
rename to agent/src/test/resources/transienttest/config/PrivilegeUsers.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/config/StrolchConfiguration.xml b/agent/src/test/resources/transienttest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/config/StrolchConfiguration.xml
rename to agent/src/test/resources/transienttest/config/StrolchConfiguration.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/config/StrolchPolicies.xml b/agent/src/test/resources/transienttest/config/StrolchPolicies.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/config/StrolchPolicies.xml
rename to agent/src/test/resources/transienttest/config/StrolchPolicies.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Activities.xml b/agent/src/test/resources/transienttest/data/Activities.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/data/Activities.xml
rename to agent/src/test/resources/transienttest/data/Activities.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Enums.xml b/agent/src/test/resources/transienttest/data/Enums.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/data/Enums.xml
rename to agent/src/test/resources/transienttest/data/Enums.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Orders.xml b/agent/src/test/resources/transienttest/data/Orders.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/data/Orders.xml
rename to agent/src/test/resources/transienttest/data/Orders.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml b/agent/src/test/resources/transienttest/data/Resources.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/data/Resources.xml
rename to agent/src/test/resources/transienttest/data/Resources.xml
diff --git a/li.strolch.agent/src/test/resources/transienttest/data/StrolchModel.xml b/agent/src/test/resources/transienttest/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/transienttest/data/StrolchModel.xml
rename to agent/src/test/resources/transienttest/data/StrolchModel.xml
diff --git a/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml b/agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml
rename to agent/src/test/resources/versioningtest/config/PrivilegeConfig.xml
diff --git a/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeRoles.xml b/agent/src/test/resources/versioningtest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeRoles.xml
rename to agent/src/test/resources/versioningtest/config/PrivilegeRoles.xml
diff --git a/li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeUsers.xml b/agent/src/test/resources/versioningtest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/versioningtest/config/PrivilegeUsers.xml
rename to agent/src/test/resources/versioningtest/config/PrivilegeUsers.xml
diff --git a/li.strolch.agent/src/test/resources/versioningtest/config/StrolchConfiguration.xml b/agent/src/test/resources/versioningtest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/versioningtest/config/StrolchConfiguration.xml
rename to agent/src/test/resources/versioningtest/config/StrolchConfiguration.xml
diff --git a/li.strolch.agent/src/test/resources/versioningtest/data/Activities.xml b/agent/src/test/resources/versioningtest/data/Activities.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/versioningtest/data/Activities.xml
rename to agent/src/test/resources/versioningtest/data/Activities.xml
diff --git a/li.strolch.agent/src/test/resources/versioningtest/data/Orders.xml b/agent/src/test/resources/versioningtest/data/Orders.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/versioningtest/data/Orders.xml
rename to agent/src/test/resources/versioningtest/data/Orders.xml
diff --git a/li.strolch.agent/src/test/resources/versioningtest/data/Resources.xml b/agent/src/test/resources/versioningtest/data/Resources.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/versioningtest/data/Resources.xml
rename to agent/src/test/resources/versioningtest/data/Resources.xml
diff --git a/li.strolch.agent/src/test/resources/versioningtest/data/StrolchModel.xml b/agent/src/test/resources/versioningtest/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.agent/src/test/resources/versioningtest/data/StrolchModel.xml
rename to agent/src/test/resources/versioningtest/data/StrolchModel.xml
diff --git a/li.strolch.bom/.gitignore b/bom/.gitignore
similarity index 100%
rename from li.strolch.bom/.gitignore
rename to bom/.gitignore
diff --git a/li.strolch.bom/LICENSE b/bom/LICENSE
similarity index 100%
rename from li.strolch.bom/LICENSE
rename to bom/LICENSE
diff --git a/li.strolch.bom/README.md b/bom/README.md
similarity index 100%
rename from li.strolch.bom/README.md
rename to bom/README.md
diff --git a/li.strolch.bom/pom.xml b/bom/pom.xml
similarity index 75%
rename from li.strolch.bom/pom.xml
rename to bom/pom.xml
index 4c0cdd0e3..7b8fe5a90 100644
--- a/li.strolch.bom/pom.xml
+++ b/bom/pom.xml
@@ -5,14 +5,14 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.bom</artifactId>
+    <artifactId>bom</artifactId>
     <packaging>pom</packaging>
-    <name>li.strolch.bom</name>
+    <name>bom</name>
     <description>All of Strolch's dependencies for easy dependency management in Strolch projects</description>
 
     <distributionManagement>
@@ -26,59 +26,59 @@
         <dependencies>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.agent</artifactId>
+                <artifactId>agent</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.model</artifactId>
+                <artifactId>model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.service</artifactId>
+                <artifactId>service</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.persistence.postgresql</artifactId>
+                <artifactId>persistence-postgresql</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.persistence.xml</artifactId>
+                <artifactId>persistence-xml</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.privilege</artifactId>
+                <artifactId>privilege</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.rest</artifactId>
+                <artifactId>web-rest</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.soql</artifactId>
+                <artifactId>soql</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.utils</artifactId>
+                <artifactId>utils</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.websocket</artifactId>
+                <artifactId>websocket</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- test -->
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.testbase</artifactId>
+                <artifactId>test-base</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
diff --git a/li.strolch.model/.gitignore b/model/.gitignore
similarity index 100%
rename from li.strolch.model/.gitignore
rename to model/.gitignore
diff --git a/li.strolch.model/LICENSE b/model/LICENSE
similarity index 100%
rename from li.strolch.model/LICENSE
rename to model/LICENSE
diff --git a/li.strolch.model/README.md b/model/README.md
similarity index 100%
rename from li.strolch.model/README.md
rename to model/README.md
diff --git a/li.strolch.model/pom.xml b/model/pom.xml
similarity index 90%
rename from li.strolch.model/pom.xml
rename to model/pom.xml
index 94bca5984..c04d7da67 100644
--- a/li.strolch.model/pom.xml
+++ b/model/pom.xml
@@ -5,14 +5,14 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.model</artifactId>
+    <artifactId>model</artifactId>
     <packaging>jar</packaging>
-    <name>li.strolch.model</name>
+    <name>model</name>
     <inceptionYear>2012</inceptionYear>
 
     <distributionManagement>
@@ -41,11 +41,11 @@
 
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.utils</artifactId>
+            <artifactId>utils</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.privilege</artifactId>
+            <artifactId>privilege</artifactId>
         </dependency>
 
         <!-- Test -->
diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchAccessDeniedException.java b/model/src/main/java/li/strolch/exception/StrolchAccessDeniedException.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/exception/StrolchAccessDeniedException.java
rename to model/src/main/java/li/strolch/exception/StrolchAccessDeniedException.java
diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchElementNotFoundException.java b/model/src/main/java/li/strolch/exception/StrolchElementNotFoundException.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/exception/StrolchElementNotFoundException.java
rename to model/src/main/java/li/strolch/exception/StrolchElementNotFoundException.java
diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchException.java b/model/src/main/java/li/strolch/exception/StrolchException.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/exception/StrolchException.java
rename to model/src/main/java/li/strolch/exception/StrolchException.java
diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchModelException.java b/model/src/main/java/li/strolch/exception/StrolchModelException.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/exception/StrolchModelException.java
rename to model/src/main/java/li/strolch/exception/StrolchModelException.java
diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchNotAuthenticatedException.java b/model/src/main/java/li/strolch/exception/StrolchNotAuthenticatedException.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/exception/StrolchNotAuthenticatedException.java
rename to model/src/main/java/li/strolch/exception/StrolchNotAuthenticatedException.java
diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchPolicyException.java b/model/src/main/java/li/strolch/exception/StrolchPolicyException.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/exception/StrolchPolicyException.java
rename to model/src/main/java/li/strolch/exception/StrolchPolicyException.java
diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchUserMessageException.java b/model/src/main/java/li/strolch/exception/StrolchUserMessageException.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/exception/StrolchUserMessageException.java
rename to model/src/main/java/li/strolch/exception/StrolchUserMessageException.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/AbstractStrolchElement.java b/model/src/main/java/li/strolch/model/AbstractStrolchElement.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/AbstractStrolchElement.java
rename to model/src/main/java/li/strolch/model/AbstractStrolchElement.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/AbstractStrolchRootElement.java b/model/src/main/java/li/strolch/model/AbstractStrolchRootElement.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/AbstractStrolchRootElement.java
rename to model/src/main/java/li/strolch/model/AbstractStrolchRootElement.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java b/model/src/main/java/li/strolch/model/GroupedParameterizedElement.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/GroupedParameterizedElement.java
rename to model/src/main/java/li/strolch/model/GroupedParameterizedElement.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/Locator.java b/model/src/main/java/li/strolch/model/Locator.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/Locator.java
rename to model/src/main/java/li/strolch/model/Locator.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/ModelGenerator.java b/model/src/main/java/li/strolch/model/ModelGenerator.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/ModelGenerator.java
rename to model/src/main/java/li/strolch/model/ModelGenerator.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/ModelHelper.java b/model/src/main/java/li/strolch/model/ModelHelper.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/ModelHelper.java
rename to model/src/main/java/li/strolch/model/ModelHelper.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/ModelStatistics.java b/model/src/main/java/li/strolch/model/ModelStatistics.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/ModelStatistics.java
rename to model/src/main/java/li/strolch/model/ModelStatistics.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/Order.java b/model/src/main/java/li/strolch/model/Order.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/Order.java
rename to model/src/main/java/li/strolch/model/Order.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/ParameterBag.java b/model/src/main/java/li/strolch/model/ParameterBag.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/ParameterBag.java
rename to model/src/main/java/li/strolch/model/ParameterBag.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/ParameterBagContainer.java b/model/src/main/java/li/strolch/model/ParameterBagContainer.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/ParameterBagContainer.java
rename to model/src/main/java/li/strolch/model/ParameterBagContainer.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/ParameterizedElement.java b/model/src/main/java/li/strolch/model/ParameterizedElement.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/ParameterizedElement.java
rename to model/src/main/java/li/strolch/model/ParameterizedElement.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/PolicyContainer.java b/model/src/main/java/li/strolch/model/PolicyContainer.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/PolicyContainer.java
rename to model/src/main/java/li/strolch/model/PolicyContainer.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/Resource.java b/model/src/main/java/li/strolch/model/Resource.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/Resource.java
rename to model/src/main/java/li/strolch/model/Resource.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/State.java b/model/src/main/java/li/strolch/model/State.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/State.java
rename to model/src/main/java/li/strolch/model/State.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/StrolchElement.java b/model/src/main/java/li/strolch/model/StrolchElement.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/StrolchElement.java
rename to model/src/main/java/li/strolch/model/StrolchElement.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/StrolchModelConstants.java b/model/src/main/java/li/strolch/model/StrolchModelConstants.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/StrolchModelConstants.java
rename to model/src/main/java/li/strolch/model/StrolchModelConstants.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/StrolchRootElement.java b/model/src/main/java/li/strolch/model/StrolchRootElement.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/StrolchRootElement.java
rename to model/src/main/java/li/strolch/model/StrolchRootElement.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/StrolchValueType.java b/model/src/main/java/li/strolch/model/StrolchValueType.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/StrolchValueType.java
rename to model/src/main/java/li/strolch/model/StrolchValueType.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/Tags.java b/model/src/main/java/li/strolch/model/Tags.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/Tags.java
rename to model/src/main/java/li/strolch/model/Tags.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/Version.java b/model/src/main/java/li/strolch/model/Version.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/Version.java
rename to model/src/main/java/li/strolch/model/Version.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/activity/Action.java b/model/src/main/java/li/strolch/model/activity/Action.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/activity/Action.java
rename to model/src/main/java/li/strolch/model/activity/Action.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/activity/Activity.java b/model/src/main/java/li/strolch/model/activity/Activity.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/activity/Activity.java
rename to model/src/main/java/li/strolch/model/activity/Activity.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/activity/IActivityElement.java b/model/src/main/java/li/strolch/model/activity/IActivityElement.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/activity/IActivityElement.java
rename to model/src/main/java/li/strolch/model/activity/IActivityElement.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/activity/TimeOrdering.java b/model/src/main/java/li/strolch/model/activity/TimeOrdering.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/activity/TimeOrdering.java
rename to model/src/main/java/li/strolch/model/activity/TimeOrdering.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/activity/TimeOrderingVisitor.java b/model/src/main/java/li/strolch/model/activity/TimeOrderingVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/activity/TimeOrderingVisitor.java
rename to model/src/main/java/li/strolch/model/activity/TimeOrderingVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/AccessType.java b/model/src/main/java/li/strolch/model/audit/AccessType.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/AccessType.java
rename to model/src/main/java/li/strolch/model/audit/AccessType.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/Audit.java b/model/src/main/java/li/strolch/model/audit/Audit.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/Audit.java
rename to model/src/main/java/li/strolch/model/audit/Audit.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/AuditFromDomReader.java b/model/src/main/java/li/strolch/model/audit/AuditFromDomReader.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/AuditFromDomReader.java
rename to model/src/main/java/li/strolch/model/audit/AuditFromDomReader.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/AuditSaxReader.java b/model/src/main/java/li/strolch/model/audit/AuditSaxReader.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/AuditSaxReader.java
rename to model/src/main/java/li/strolch/model/audit/AuditSaxReader.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/AuditToDomVisitor.java b/model/src/main/java/li/strolch/model/audit/AuditToDomVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/AuditToDomVisitor.java
rename to model/src/main/java/li/strolch/model/audit/AuditToDomVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/AuditToSaxWriterVisitor.java b/model/src/main/java/li/strolch/model/audit/AuditToSaxWriterVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/AuditToSaxWriterVisitor.java
rename to model/src/main/java/li/strolch/model/audit/AuditToSaxWriterVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/AuditVisitor.java b/model/src/main/java/li/strolch/model/audit/AuditVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/AuditVisitor.java
rename to model/src/main/java/li/strolch/model/audit/AuditVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/NoStrategyAuditVisitor.java b/model/src/main/java/li/strolch/model/audit/NoStrategyAuditVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/NoStrategyAuditVisitor.java
rename to model/src/main/java/li/strolch/model/audit/NoStrategyAuditVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/ActionBuilder.java b/model/src/main/java/li/strolch/model/builder/ActionBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/ActionBuilder.java
rename to model/src/main/java/li/strolch/model/builder/ActionBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/ActivityBuilder.java b/model/src/main/java/li/strolch/model/builder/ActivityBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/ActivityBuilder.java
rename to model/src/main/java/li/strolch/model/builder/ActivityBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/ActivityElementBuilder.java b/model/src/main/java/li/strolch/model/builder/ActivityElementBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/ActivityElementBuilder.java
rename to model/src/main/java/li/strolch/model/builder/ActivityElementBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/BagBuilder.java b/model/src/main/java/li/strolch/model/builder/BagBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/BagBuilder.java
rename to model/src/main/java/li/strolch/model/builder/BagBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/BuilderHelper.java b/model/src/main/java/li/strolch/model/builder/BuilderHelper.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/BuilderHelper.java
rename to model/src/main/java/li/strolch/model/builder/BuilderHelper.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/OrderBuilder.java b/model/src/main/java/li/strolch/model/builder/OrderBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/OrderBuilder.java
rename to model/src/main/java/li/strolch/model/builder/OrderBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/ParameterBagContainerBuilder.java b/model/src/main/java/li/strolch/model/builder/ParameterBagContainerBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/ParameterBagContainerBuilder.java
rename to model/src/main/java/li/strolch/model/builder/ParameterBagContainerBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/PoliciesBuilder.java b/model/src/main/java/li/strolch/model/builder/PoliciesBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/PoliciesBuilder.java
rename to model/src/main/java/li/strolch/model/builder/PoliciesBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/PolicyContainerBuilder.java b/model/src/main/java/li/strolch/model/builder/PolicyContainerBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/PolicyContainerBuilder.java
rename to model/src/main/java/li/strolch/model/builder/PolicyContainerBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/ResourceBuilder.java b/model/src/main/java/li/strolch/model/builder/ResourceBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/ResourceBuilder.java
rename to model/src/main/java/li/strolch/model/builder/ResourceBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/RootElementBuilder.java b/model/src/main/java/li/strolch/model/builder/RootElementBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/RootElementBuilder.java
rename to model/src/main/java/li/strolch/model/builder/RootElementBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/StrolchElementBuilder.java b/model/src/main/java/li/strolch/model/builder/StrolchElementBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/StrolchElementBuilder.java
rename to model/src/main/java/li/strolch/model/builder/StrolchElementBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/BooleanParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/BooleanParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/BooleanParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/BooleanParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/DateParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/DateParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/DateParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/DateParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/DurationParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/DurationParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/DurationParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/DurationParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/FloatListParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/FloatListParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/FloatListParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/FloatListParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/FloatParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/FloatParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/FloatParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/FloatParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/IntegerListParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/IntegerListParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/IntegerListParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/IntegerListParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/IntegerParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/IntegerParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/IntegerParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/IntegerParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/LongListParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/LongListParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/LongListParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/LongListParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/LongParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/LongParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/LongParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/LongParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/ParameterBuilder.java b/model/src/main/java/li/strolch/model/builder/params/ParameterBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/ParameterBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/ParameterBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/StringListParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/StringListParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/StringListParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/StringListParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/StringParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/StringParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/StringParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/StringParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/params/TextParamBuilder.java b/model/src/main/java/li/strolch/model/builder/params/TextParamBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/params/TextParamBuilder.java
rename to model/src/main/java/li/strolch/model/builder/params/TextParamBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/states/BooleanStateBuilder.java b/model/src/main/java/li/strolch/model/builder/states/BooleanStateBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/states/BooleanStateBuilder.java
rename to model/src/main/java/li/strolch/model/builder/states/BooleanStateBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/states/FloatListStateBuilder.java b/model/src/main/java/li/strolch/model/builder/states/FloatListStateBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/states/FloatListStateBuilder.java
rename to model/src/main/java/li/strolch/model/builder/states/FloatListStateBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/states/FloatStateBuilder.java b/model/src/main/java/li/strolch/model/builder/states/FloatStateBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/states/FloatStateBuilder.java
rename to model/src/main/java/li/strolch/model/builder/states/FloatStateBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/states/IntegerListStateBuilder.java b/model/src/main/java/li/strolch/model/builder/states/IntegerListStateBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/states/IntegerListStateBuilder.java
rename to model/src/main/java/li/strolch/model/builder/states/IntegerListStateBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/states/IntegerStateBuilder.java b/model/src/main/java/li/strolch/model/builder/states/IntegerStateBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/states/IntegerStateBuilder.java
rename to model/src/main/java/li/strolch/model/builder/states/IntegerStateBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/states/LongStateBuilder.java b/model/src/main/java/li/strolch/model/builder/states/LongStateBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/states/LongStateBuilder.java
rename to model/src/main/java/li/strolch/model/builder/states/LongStateBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/states/StringSetStateBuilder.java b/model/src/main/java/li/strolch/model/builder/states/StringSetStateBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/states/StringSetStateBuilder.java
rename to model/src/main/java/li/strolch/model/builder/states/StringSetStateBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/builder/states/TimedStateBuilder.java b/model/src/main/java/li/strolch/model/builder/states/TimedStateBuilder.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/builder/states/TimedStateBuilder.java
rename to model/src/main/java/li/strolch/model/builder/states/TimedStateBuilder.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/i18n/I18nMessageJsonParser.java b/model/src/main/java/li/strolch/model/i18n/I18nMessageJsonParser.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/i18n/I18nMessageJsonParser.java
rename to model/src/main/java/li/strolch/model/i18n/I18nMessageJsonParser.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/i18n/I18nMessageToJsonVisitor.java b/model/src/main/java/li/strolch/model/i18n/I18nMessageToJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/i18n/I18nMessageToJsonVisitor.java
rename to model/src/main/java/li/strolch/model/i18n/I18nMessageToJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/ActivityFromJsonVisitor.java b/model/src/main/java/li/strolch/model/json/ActivityFromJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/ActivityFromJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/ActivityFromJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/AuditToJsonVisitor.java b/model/src/main/java/li/strolch/model/json/AuditToJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/AuditToJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/AuditToJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java b/model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/OrderFromJsonVisitor.java b/model/src/main/java/li/strolch/model/json/OrderFromJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/OrderFromJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/OrderFromJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementFromJsonVisitor.java b/model/src/main/java/li/strolch/model/json/PrivilegeElementFromJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementFromJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/PrivilegeElementFromJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementToJsonVisitor.java b/model/src/main/java/li/strolch/model/json/PrivilegeElementToJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementToJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/PrivilegeElementToJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/ResourceFromJsonVisitor.java b/model/src/main/java/li/strolch/model/json/ResourceFromJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/ResourceFromJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/ResourceFromJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/ResourceSystemStateFromJson.java b/model/src/main/java/li/strolch/model/json/ResourceSystemStateFromJson.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/ResourceSystemStateFromJson.java
rename to model/src/main/java/li/strolch/model/json/ResourceSystemStateFromJson.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/SetParameterValueFromJsonVisitor.java b/model/src/main/java/li/strolch/model/json/SetParameterValueFromJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/SetParameterValueFromJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/SetParameterValueFromJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementFromJsonVisitor.java b/model/src/main/java/li/strolch/model/json/StrolchElementFromJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementFromJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/StrolchElementFromJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java b/model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java b/model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
rename to model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/log/LogMessage.java b/model/src/main/java/li/strolch/model/log/LogMessage.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/log/LogMessage.java
rename to model/src/main/java/li/strolch/model/log/LogMessage.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/log/LogMessageState.java b/model/src/main/java/li/strolch/model/log/LogMessageState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/log/LogMessageState.java
rename to model/src/main/java/li/strolch/model/log/LogMessageState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/log/LogSeverity.java b/model/src/main/java/li/strolch/model/log/LogSeverity.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/log/LogSeverity.java
rename to model/src/main/java/li/strolch/model/log/LogSeverity.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractListParameter.java b/model/src/main/java/li/strolch/model/parameter/AbstractListParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractListParameter.java
rename to model/src/main/java/li/strolch/model/parameter/AbstractListParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java b/model/src/main/java/li/strolch/model/parameter/AbstractParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractParameter.java
rename to model/src/main/java/li/strolch/model/parameter/AbstractParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/BooleanParameter.java b/model/src/main/java/li/strolch/model/parameter/BooleanParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/BooleanParameter.java
rename to model/src/main/java/li/strolch/model/parameter/BooleanParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/DateParameter.java b/model/src/main/java/li/strolch/model/parameter/DateParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/DateParameter.java
rename to model/src/main/java/li/strolch/model/parameter/DateParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/DurationParameter.java b/model/src/main/java/li/strolch/model/parameter/DurationParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/DurationParameter.java
rename to model/src/main/java/li/strolch/model/parameter/DurationParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatListParameter.java b/model/src/main/java/li/strolch/model/parameter/FloatListParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/FloatListParameter.java
rename to model/src/main/java/li/strolch/model/parameter/FloatListParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatParameter.java b/model/src/main/java/li/strolch/model/parameter/FloatParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/FloatParameter.java
rename to model/src/main/java/li/strolch/model/parameter/FloatParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerListParameter.java b/model/src/main/java/li/strolch/model/parameter/IntegerListParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerListParameter.java
rename to model/src/main/java/li/strolch/model/parameter/IntegerListParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerParameter.java b/model/src/main/java/li/strolch/model/parameter/IntegerParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerParameter.java
rename to model/src/main/java/li/strolch/model/parameter/IntegerParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/ListParameter.java b/model/src/main/java/li/strolch/model/parameter/ListParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/ListParameter.java
rename to model/src/main/java/li/strolch/model/parameter/ListParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/LongListParameter.java b/model/src/main/java/li/strolch/model/parameter/LongListParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/LongListParameter.java
rename to model/src/main/java/li/strolch/model/parameter/LongListParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/LongParameter.java b/model/src/main/java/li/strolch/model/parameter/LongParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/LongParameter.java
rename to model/src/main/java/li/strolch/model/parameter/LongParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/Parameter.java b/model/src/main/java/li/strolch/model/parameter/Parameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/Parameter.java
rename to model/src/main/java/li/strolch/model/parameter/Parameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/StringListParameter.java b/model/src/main/java/li/strolch/model/parameter/StringListParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/StringListParameter.java
rename to model/src/main/java/li/strolch/model/parameter/StringListParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/StringParameter.java b/model/src/main/java/li/strolch/model/parameter/StringParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/StringParameter.java
rename to model/src/main/java/li/strolch/model/parameter/StringParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/TextParameter.java b/model/src/main/java/li/strolch/model/parameter/TextParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/parameter/TextParameter.java
rename to model/src/main/java/li/strolch/model/parameter/TextParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/policy/JavaPolicyDef.java b/model/src/main/java/li/strolch/model/policy/JavaPolicyDef.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/policy/JavaPolicyDef.java
rename to model/src/main/java/li/strolch/model/policy/JavaPolicyDef.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/policy/KeyPolicyDef.java b/model/src/main/java/li/strolch/model/policy/KeyPolicyDef.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/policy/KeyPolicyDef.java
rename to model/src/main/java/li/strolch/model/policy/KeyPolicyDef.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java b/model/src/main/java/li/strolch/model/policy/PolicyDef.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDef.java
rename to model/src/main/java/li/strolch/model/policy/PolicyDef.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDefVisitor.java b/model/src/main/java/li/strolch/model/policy/PolicyDefVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDefVisitor.java
rename to model/src/main/java/li/strolch/model/policy/PolicyDefVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDefs.java b/model/src/main/java/li/strolch/model/policy/PolicyDefs.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/policy/PolicyDefs.java
rename to model/src/main/java/li/strolch/model/policy/PolicyDefs.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java b/model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/AbstractStrolchTimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/BooleanTimedState.java b/model/src/main/java/li/strolch/model/timedstate/BooleanTimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/BooleanTimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/BooleanTimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/FloatListTimedState.java b/model/src/main/java/li/strolch/model/timedstate/FloatListTimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/FloatListTimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/FloatListTimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/FloatTimedState.java b/model/src/main/java/li/strolch/model/timedstate/FloatTimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/FloatTimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/FloatTimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/ITimedState.java b/model/src/main/java/li/strolch/model/timedstate/ITimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/ITimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/ITimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/IntegerListTimedState.java b/model/src/main/java/li/strolch/model/timedstate/IntegerListTimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/IntegerListTimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/IntegerListTimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/IntegerTimedState.java b/model/src/main/java/li/strolch/model/timedstate/IntegerTimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/IntegerTimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/IntegerTimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/LongTimedState.java b/model/src/main/java/li/strolch/model/timedstate/LongTimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/LongTimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/LongTimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/StringSetTimedState.java b/model/src/main/java/li/strolch/model/timedstate/StringSetTimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/StringSetTimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/StringSetTimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/StrolchTimedState.java b/model/src/main/java/li/strolch/model/timedstate/StrolchTimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/StrolchTimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/StrolchTimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timedstate/TimedState.java b/model/src/main/java/li/strolch/model/timedstate/TimedState.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timedstate/TimedState.java
rename to model/src/main/java/li/strolch/model/timedstate/TimedState.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/ITimeValue.java b/model/src/main/java/li/strolch/model/timevalue/ITimeValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/ITimeValue.java
rename to model/src/main/java/li/strolch/model/timevalue/ITimeValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/ITimeVariable.java b/model/src/main/java/li/strolch/model/timevalue/ITimeVariable.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/ITimeVariable.java
rename to model/src/main/java/li/strolch/model/timevalue/ITimeVariable.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/IValue.java b/model/src/main/java/li/strolch/model/timevalue/IValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/IValue.java
rename to model/src/main/java/li/strolch/model/timevalue/IValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/IValueChange.java b/model/src/main/java/li/strolch/model/timevalue/IValueChange.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/IValueChange.java
rename to model/src/main/java/li/strolch/model/timevalue/IValueChange.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/AString.java b/model/src/main/java/li/strolch/model/timevalue/impl/AString.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/AString.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/AString.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/BooleanValue.java b/model/src/main/java/li/strolch/model/timevalue/impl/BooleanValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/BooleanValue.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/BooleanValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/FloatListValue.java b/model/src/main/java/li/strolch/model/timevalue/impl/FloatListValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/FloatListValue.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/FloatListValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/FloatValue.java b/model/src/main/java/li/strolch/model/timevalue/impl/FloatValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/FloatValue.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/FloatValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/IntegerListValue.java b/model/src/main/java/li/strolch/model/timevalue/impl/IntegerListValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/IntegerListValue.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/IntegerListValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/IntegerValue.java b/model/src/main/java/li/strolch/model/timevalue/impl/IntegerValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/IntegerValue.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/IntegerValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/LongValue.java b/model/src/main/java/li/strolch/model/timevalue/impl/LongValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/LongValue.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/LongValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/StringSetValue.java b/model/src/main/java/li/strolch/model/timevalue/impl/StringSetValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/StringSetValue.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/StringSetValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/TimeValue.java b/model/src/main/java/li/strolch/model/timevalue/impl/TimeValue.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/TimeValue.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/TimeValue.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/TimeVariable.java b/model/src/main/java/li/strolch/model/timevalue/impl/TimeVariable.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/TimeVariable.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/TimeVariable.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/ValueChange.java b/model/src/main/java/li/strolch/model/timevalue/impl/ValueChange.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/timevalue/impl/ValueChange.java
rename to model/src/main/java/li/strolch/model/timevalue/impl/ValueChange.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/ActivityVisitor.java b/model/src/main/java/li/strolch/model/visitor/ActivityVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/ActivityVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/ActivityVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/ElementDateVisitor.java b/model/src/main/java/li/strolch/model/visitor/ElementDateVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/ElementDateVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/ElementDateVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/ElementLdtDateVisitor.java b/model/src/main/java/li/strolch/model/visitor/ElementLdtDateVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/ElementLdtDateVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/ElementLdtDateVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/ElementStateVisitor.java b/model/src/main/java/li/strolch/model/visitor/ElementStateVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/ElementStateVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/ElementStateVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/ElementTypeVisitor.java b/model/src/main/java/li/strolch/model/visitor/ElementTypeVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/ElementTypeVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/ElementTypeVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/ElementZdtDateVisitor.java b/model/src/main/java/li/strolch/model/visitor/ElementZdtDateVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/ElementZdtDateVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/ElementZdtDateVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/IActivityElementVisitor.java b/model/src/main/java/li/strolch/model/visitor/IActivityElementVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/IActivityElementVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/IActivityElementVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/OrderVisitor.java b/model/src/main/java/li/strolch/model/visitor/OrderVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/OrderVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/OrderVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/ParameterVisitor.java b/model/src/main/java/li/strolch/model/visitor/ParameterVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/ParameterVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/ParameterVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/ResourceVisitor.java b/model/src/main/java/li/strolch/model/visitor/ResourceVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/ResourceVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/ResourceVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/SetParameterValueFromStringVisitor.java b/model/src/main/java/li/strolch/model/visitor/SetParameterValueFromStringVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/SetParameterValueFromStringVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/SetParameterValueFromStringVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/SetParameterValueVisitor.java b/model/src/main/java/li/strolch/model/visitor/SetParameterValueVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/SetParameterValueVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/SetParameterValueVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/SetStateValueVisitor.java b/model/src/main/java/li/strolch/model/visitor/SetStateValueVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/SetStateValueVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/SetStateValueVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/StrolchElementDeepEqualsVisitor.java b/model/src/main/java/li/strolch/model/visitor/StrolchElementDeepEqualsVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/StrolchElementDeepEqualsVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/StrolchElementDeepEqualsVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/StrolchElementVisitor.java b/model/src/main/java/li/strolch/model/visitor/StrolchElementVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/StrolchElementVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/StrolchElementVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/StrolchRootElementVisitor.java b/model/src/main/java/li/strolch/model/visitor/StrolchRootElementVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/StrolchRootElementVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/StrolchRootElementVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/StrolchVisitor.java b/model/src/main/java/li/strolch/model/visitor/StrolchVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/StrolchVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/StrolchVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/visitor/TimedStateVisitor.java b/model/src/main/java/li/strolch/model/visitor/TimedStateVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/visitor/TimedStateVisitor.java
rename to model/src/main/java/li/strolch/model/visitor/TimedStateVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/ActivityFromDomVisitor.java b/model/src/main/java/li/strolch/model/xml/ActivityFromDomVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/ActivityFromDomVisitor.java
rename to model/src/main/java/li/strolch/model/xml/ActivityFromDomVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/OrderFromDomVisitor.java b/model/src/main/java/li/strolch/model/xml/OrderFromDomVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/OrderFromDomVisitor.java
rename to model/src/main/java/li/strolch/model/xml/OrderFromDomVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/ResourceFromDomVisitor.java b/model/src/main/java/li/strolch/model/xml/ResourceFromDomVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/ResourceFromDomVisitor.java
rename to model/src/main/java/li/strolch/model/xml/ResourceFromDomVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/SimpleStrolchElementListener.java b/model/src/main/java/li/strolch/model/xml/SimpleStrolchElementListener.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/SimpleStrolchElementListener.java
rename to model/src/main/java/li/strolch/model/xml/SimpleStrolchElementListener.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementFromDomVisitor.java b/model/src/main/java/li/strolch/model/xml/StrolchElementFromDomVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementFromDomVisitor.java
rename to model/src/main/java/li/strolch/model/xml/StrolchElementFromDomVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementListener.java b/model/src/main/java/li/strolch/model/xml/StrolchElementListener.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementListener.java
rename to model/src/main/java/li/strolch/model/xml/StrolchElementListener.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToDomVisitor.java b/model/src/main/java/li/strolch/model/xml/StrolchElementToDomVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToDomVisitor.java
rename to model/src/main/java/li/strolch/model/xml/StrolchElementToDomVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToMapListener.java b/model/src/main/java/li/strolch/model/xml/StrolchElementToMapListener.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToMapListener.java
rename to model/src/main/java/li/strolch/model/xml/StrolchElementToMapListener.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToSaxVisitor.java b/model/src/main/java/li/strolch/model/xml/StrolchElementToSaxVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToSaxVisitor.java
rename to model/src/main/java/li/strolch/model/xml/StrolchElementToSaxVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToSaxWriterVisitor.java b/model/src/main/java/li/strolch/model/xml/StrolchElementToSaxWriterVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToSaxWriterVisitor.java
rename to model/src/main/java/li/strolch/model/xml/StrolchElementToSaxWriterVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToXmlStringVisitor.java b/model/src/main/java/li/strolch/model/xml/StrolchElementToXmlStringVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToXmlStringVisitor.java
rename to model/src/main/java/li/strolch/model/xml/StrolchElementToXmlStringVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/StrolchXmlHelper.java b/model/src/main/java/li/strolch/model/xml/StrolchXmlHelper.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/StrolchXmlHelper.java
rename to model/src/main/java/li/strolch/model/xml/StrolchXmlHelper.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/XmlModelSaxFileReader.java b/model/src/main/java/li/strolch/model/xml/XmlModelSaxFileReader.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/XmlModelSaxFileReader.java
rename to model/src/main/java/li/strolch/model/xml/XmlModelSaxFileReader.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/XmlModelSaxReader.java b/model/src/main/java/li/strolch/model/xml/XmlModelSaxReader.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/XmlModelSaxReader.java
rename to model/src/main/java/li/strolch/model/xml/XmlModelSaxReader.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/xml/XmlModelSaxStreamReader.java b/model/src/main/java/li/strolch/model/xml/XmlModelSaxStreamReader.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/xml/XmlModelSaxStreamReader.java
rename to model/src/main/java/li/strolch/model/xml/XmlModelSaxStreamReader.java
diff --git a/li.strolch.model/src/main/resources/StrolchModel-1.6.xsd b/model/src/main/resources/StrolchModel-1.6.xsd
similarity index 100%
rename from li.strolch.model/src/main/resources/StrolchModel-1.6.xsd
rename to model/src/main/resources/StrolchModel-1.6.xsd
diff --git a/li.strolch.model/src/main/resources/componentVersion.properties b/model/src/main/resources/componentVersion.properties
similarity index 100%
rename from li.strolch.model/src/main/resources/componentVersion.properties
rename to model/src/main/resources/componentVersion.properties
diff --git a/li.strolch.model/src/test/java/li/strolch/model/LocatorTest.java b/model/src/test/java/li/strolch/model/LocatorTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/LocatorTest.java
rename to model/src/test/java/li/strolch/model/LocatorTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/ModelCompareTest.java b/model/src/test/java/li/strolch/model/ModelCompareTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/ModelCompareTest.java
rename to model/src/test/java/li/strolch/model/ModelCompareTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/ModelMarshallingTest.java b/model/src/test/java/li/strolch/model/ModelMarshallingTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/ModelMarshallingTest.java
rename to model/src/test/java/li/strolch/model/ModelMarshallingTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/ModelTest.java b/model/src/test/java/li/strolch/model/ModelTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/ModelTest.java
rename to model/src/test/java/li/strolch/model/ModelTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/ModelToDomTest.java b/model/src/test/java/li/strolch/model/ModelToDomTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/ModelToDomTest.java
rename to model/src/test/java/li/strolch/model/ModelToDomTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/ModelToJsonTest.java b/model/src/test/java/li/strolch/model/ModelToJsonTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/ModelToJsonTest.java
rename to model/src/test/java/li/strolch/model/ModelToJsonTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/ModelToSaxTest.java b/model/src/test/java/li/strolch/model/ModelToSaxTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/ModelToSaxTest.java
rename to model/src/test/java/li/strolch/model/ModelToSaxTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/ModelToSaxWriterTest.java b/model/src/test/java/li/strolch/model/ModelToSaxWriterTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/ModelToSaxWriterTest.java
rename to model/src/test/java/li/strolch/model/ModelToSaxWriterTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/ReadonlyModelTest.java b/model/src/test/java/li/strolch/model/ReadonlyModelTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/ReadonlyModelTest.java
rename to model/src/test/java/li/strolch/model/ReadonlyModelTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/StrolchElementBuilderTest.java b/model/src/test/java/li/strolch/model/StrolchElementBuilderTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/StrolchElementBuilderTest.java
rename to model/src/test/java/li/strolch/model/StrolchElementBuilderTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/StrolchXmlHelperTest.java b/model/src/test/java/li/strolch/model/StrolchXmlHelperTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/StrolchXmlHelperTest.java
rename to model/src/test/java/li/strolch/model/StrolchXmlHelperTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/XmlModelSaxFileReaderTest.java b/model/src/test/java/li/strolch/model/XmlModelSaxFileReaderTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/XmlModelSaxFileReaderTest.java
rename to model/src/test/java/li/strolch/model/XmlModelSaxFileReaderTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/activity/ActionTest.java b/model/src/test/java/li/strolch/model/activity/ActionTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/activity/ActionTest.java
rename to model/src/test/java/li/strolch/model/activity/ActionTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/activity/ActivityTest.java b/model/src/test/java/li/strolch/model/activity/ActivityTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/activity/ActivityTest.java
rename to model/src/test/java/li/strolch/model/activity/ActivityTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/activity/StateTest.java b/model/src/test/java/li/strolch/model/activity/StateTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/activity/StateTest.java
rename to model/src/test/java/li/strolch/model/activity/StateTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/parameter/ParameterTest.java b/model/src/test/java/li/strolch/model/parameter/ParameterTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/parameter/ParameterTest.java
rename to model/src/test/java/li/strolch/model/parameter/ParameterTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/policy/PolicyDefTest.java b/model/src/test/java/li/strolch/model/policy/PolicyDefTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/policy/PolicyDefTest.java
rename to model/src/test/java/li/strolch/model/policy/PolicyDefTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/timedstate/StrolchTimedStateTest.java b/model/src/test/java/li/strolch/model/timedstate/StrolchTimedStateTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/timedstate/StrolchTimedStateTest.java
rename to model/src/test/java/li/strolch/model/timedstate/StrolchTimedStateTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/timedstate/TimeStateTest.java b/model/src/test/java/li/strolch/model/timedstate/TimeStateTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/timedstate/TimeStateTest.java
rename to model/src/test/java/li/strolch/model/timedstate/TimeStateTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/timevalue/FloatTimeVariableTest.java b/model/src/test/java/li/strolch/model/timevalue/FloatTimeVariableTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/timevalue/FloatTimeVariableTest.java
rename to model/src/test/java/li/strolch/model/timevalue/FloatTimeVariableTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/timevalue/IntegerTimeVariableTest.java b/model/src/test/java/li/strolch/model/timevalue/IntegerTimeVariableTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/timevalue/IntegerTimeVariableTest.java
rename to model/src/test/java/li/strolch/model/timevalue/IntegerTimeVariableTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/timevalue/StringTimeVariableTest.java b/model/src/test/java/li/strolch/model/timevalue/StringTimeVariableTest.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/timevalue/StringTimeVariableTest.java
rename to model/src/test/java/li/strolch/model/timevalue/StringTimeVariableTest.java
diff --git a/li.strolch.model/src/test/java/li/strolch/model/timevalue/ValueTests.java b/model/src/test/java/li/strolch/model/timevalue/ValueTests.java
similarity index 100%
rename from li.strolch.model/src/test/java/li/strolch/model/timevalue/ValueTests.java
rename to model/src/test/java/li/strolch/model/timevalue/ValueTests.java
diff --git a/li.strolch.model/src/test/resources/data/StrolchModel.xml b/model/src/test/resources/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/data/StrolchModel.xml
rename to model/src/test/resources/data/StrolchModel.xml
diff --git a/li.strolch.model/src/test/resources/data/StrolchModelAll.xml b/model/src/test/resources/data/StrolchModelAll.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/data/StrolchModelAll.xml
rename to model/src/test/resources/data/StrolchModelAll.xml
diff --git a/li.strolch.model/src/test/resources/data/activities/Activities.xml b/model/src/test/resources/data/activities/Activities.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/data/activities/Activities.xml
rename to model/src/test/resources/data/activities/Activities.xml
diff --git a/li.strolch.model/src/test/resources/data/activities/action.xml b/model/src/test/resources/data/activities/action.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/data/activities/action.xml
rename to model/src/test/resources/data/activities/action.xml
diff --git a/li.strolch.model/src/test/resources/data/activities/activity.xml b/model/src/test/resources/data/activities/activity.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/data/activities/activity.xml
rename to model/src/test/resources/data/activities/activity.xml
diff --git a/li.strolch.model/src/test/resources/data/orders/Orders.xml b/model/src/test/resources/data/orders/Orders.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/data/orders/Orders.xml
rename to model/src/test/resources/data/orders/Orders.xml
diff --git a/li.strolch.model/src/test/resources/data/orders/Templates.xml b/model/src/test/resources/data/orders/Templates.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/data/orders/Templates.xml
rename to model/src/test/resources/data/orders/Templates.xml
diff --git a/li.strolch.model/src/test/resources/data/resources/Resources.xml b/model/src/test/resources/data/resources/Resources.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/data/resources/Resources.xml
rename to model/src/test/resources/data/resources/Resources.xml
diff --git a/li.strolch.model/src/test/resources/data/resources/Templates.xml b/model/src/test/resources/data/resources/Templates.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/data/resources/Templates.xml
rename to model/src/test/resources/data/resources/Templates.xml
diff --git a/li.strolch.model/src/test/resources/logback.xml b/model/src/test/resources/logback.xml
similarity index 100%
rename from li.strolch.model/src/test/resources/logback.xml
rename to model/src/test/resources/logback.xml
diff --git a/li.strolch.persistence.postgresql/.gitignore b/persistence-postgresql/.gitignore
similarity index 100%
rename from li.strolch.persistence.postgresql/.gitignore
rename to persistence-postgresql/.gitignore
diff --git a/li.strolch.performancetest/LICENSE b/persistence-postgresql/LICENSE
similarity index 100%
rename from li.strolch.performancetest/LICENSE
rename to persistence-postgresql/LICENSE
diff --git a/li.strolch.persistence.postgresql/README.md b/persistence-postgresql/README.md
similarity index 100%
rename from li.strolch.persistence.postgresql/README.md
rename to persistence-postgresql/README.md
diff --git a/li.strolch.persistence.postgresql/pom.xml b/persistence-postgresql/pom.xml
similarity index 89%
rename from li.strolch.persistence.postgresql/pom.xml
rename to persistence-postgresql/pom.xml
index 2a4cb95c5..2c74fad15 100644
--- a/li.strolch.persistence.postgresql/pom.xml
+++ b/persistence-postgresql/pom.xml
@@ -4,14 +4,14 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>li.strolch.persistence.postgresql</artifactId>
-    <name>li.strolch.persistence.postgresql</name>
+    <artifactId>persistence-postgresql</artifactId>
+    <name>persistence-postgresql</name>
     <description>PostgreSQL Persistence Implementation for Strolch</description>
     <inceptionYear>2011</inceptionYear>
 
@@ -37,11 +37,11 @@
         <!-- main -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
 
         <dependency>
@@ -56,7 +56,7 @@
         <!-- test -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlActivityDao.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlActivityDao.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlActivityDao.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlActivityDao.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlOrderDao.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlOrderDao.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlOrderDao.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlOrderDao.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlResourceDao.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlResourceDao.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlResourceDao.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/ArchivePostgreSqlResourceDao.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/DaoCommand.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/DaoCommand.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/DaoCommand.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/DaoCommand.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/DataType.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/DataType.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/DataType.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/DataType.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlActivityDao.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlActivityDao.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlActivityDao.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlActivityDao.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlAuditDao.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlAuditDao.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlAuditDao.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlAuditDao.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDataArchiveHandler.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDataArchiveHandler.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDataArchiveHandler.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDataArchiveHandler.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDbConnectionBuilder.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDbConnectionBuilder.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDbConnectionBuilder.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDbConnectionBuilder.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlHelper.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlHelper.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlHelper.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlHelper.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlInitializer.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlInitializer.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlInitializer.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlInitializer.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlLogMessageDao.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlLogMessageDao.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlLogMessageDao.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlLogMessageDao.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlOrderDao.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlOrderDao.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlOrderDao.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlOrderDao.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlResourceDao.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlResourceDao.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlResourceDao.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlResourceDao.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlSchemaInitializer.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlSchemaInitializer.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlSchemaInitializer.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlSchemaInitializer.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlStrolchTransaction.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlStrolchTransaction.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlStrolchTransaction.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlStrolchTransaction.java
diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgresqlDao.java b/persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgresqlDao.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgresqlDao.java
rename to persistence-postgresql/src/main/java/li/strolch/persistence/postgresql/PostgresqlDao.java
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.1.0_drop.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.1.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.1.0_drop.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.1.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.1.0_initial.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.1.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.1.0_initial.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.1.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.2.0_drop.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.2.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.2.0_drop.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.2.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.2.0_initial.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.2.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.2.0_initial.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.2.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.2.0_migration.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.2.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.2.0_migration.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.2.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.0_drop.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.3.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.0_drop.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.3.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.0_initial.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.3.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.0_initial.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.3.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.0_migration.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.3.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.0_migration.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.3.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.1_drop.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.3.1_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.1_drop.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.3.1_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.1_initial.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.3.1_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.1_initial.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.3.1_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.1_migration.sql b/persistence-postgresql/src/main/resources/archive_db_schema_0.3.1_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_schema_0.3.1_migration.sql
rename to persistence-postgresql/src/main/resources/archive_db_schema_0.3.1_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/archive_db_version.properties b/persistence-postgresql/src/main/resources/archive_db_version.properties
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/archive_db_version.properties
rename to persistence-postgresql/src/main/resources/archive_db_version.properties
diff --git a/li.strolch.persistence.postgresql/src/main/resources/componentVersion.properties b/persistence-postgresql/src/main/resources/componentVersion.properties
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/componentVersion.properties
rename to persistence-postgresql/src/main/resources/componentVersion.properties
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.1.0_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.1.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.1.0_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.1.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.1.0_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.1.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.1.0_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.1.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.0_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.2.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.0_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.2.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.0_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.2.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.0_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.2.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.0_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.2.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.0_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.2.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.1_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.2.1_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.1_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.2.1_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.1_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.2.1_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.1_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.2.1_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.1_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.2.1_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.2.1_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.2.1_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.3.0_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.3.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.3.0_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.3.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.3.0_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.3.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.3.0_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.3.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.3.0_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.3.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.3.0_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.3.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.4.0_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.4.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.4.0_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.4.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.4.0_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.4.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.4.0_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.4.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.4.0_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.4.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.4.0_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.4.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.0_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.5.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.0_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.5.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.0_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.5.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.0_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.5.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.0_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.5.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.0_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.5.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.1_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.5.1_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.1_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.5.1_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.1_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.5.1_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.1_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.5.1_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.1_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.5.1_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.5.1_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.5.1_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.6.0_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.6.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.6.0_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.6.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.6.0_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.6.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.6.0_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.6.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.6.0_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.6.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.6.0_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.6.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.7.0_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.7.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.7.0_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.7.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.7.0_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.7.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.7.0_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.7.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.7.0_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.7.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.7.0_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.7.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.8.0_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.8.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.8.0_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.8.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.8.0_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.8.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.8.0_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.8.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.8.0_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.8.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.8.0_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.8.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.0_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.9.0_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.0_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.9.0_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.0_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.9.0_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.0_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.9.0_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.0_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.9.0_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.0_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.9.0_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.1_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.9.1_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.1_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.9.1_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.1_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.9.1_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.1_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.9.1_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.1_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.9.1_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.1_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.9.1_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.2_drop.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.9.2_drop.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.2_drop.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.9.2_drop.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.2_initial.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.9.2_initial.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.2_initial.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.9.2_initial.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.2_migration.sql b/persistence-postgresql/src/main/resources/strolch_db_schema_0.9.2_migration.sql
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_schema_0.9.2_migration.sql
rename to persistence-postgresql/src/main/resources/strolch_db_schema_0.9.2_migration.sql
diff --git a/li.strolch.persistence.postgresql/src/main/resources/strolch_db_version.properties b/persistence-postgresql/src/main/resources/strolch_db_version.properties
similarity index 100%
rename from li.strolch.persistence.postgresql/src/main/resources/strolch_db_version.properties
rename to persistence-postgresql/src/main/resources/strolch_db_version.properties
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedDaoTest.java b/persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedDaoTest.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedDaoTest.java
rename to persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedDaoTest.java
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonDaoTest.java b/persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonDaoTest.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonDaoTest.java
rename to persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonDaoTest.java
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonVersioningDaoTest.java b/persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonVersioningDaoTest.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonVersioningDaoTest.java
rename to persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonVersioningDaoTest.java
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedVersioningDaoTest.java b/persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedVersioningDaoTest.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedVersioningDaoTest.java
rename to persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedVersioningDaoTest.java
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbSchemaCreationTest.java b/persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbSchemaCreationTest.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbSchemaCreationTest.java
rename to persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbSchemaCreationTest.java
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbSchemaMigrationTest.java b/persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbSchemaMigrationTest.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbSchemaMigrationTest.java
rename to persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbSchemaMigrationTest.java
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java b/persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java
rename to persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/ObserverUpdateTest.java
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/RealmTest.java b/persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/RealmTest.java
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/RealmTest.java
rename to persistence-postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/RealmTest.java
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeConfig.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeRoles.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeRoles.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeRoles.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeUsers.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeUsers.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeUsers.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/StrolchConfiguration.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntime/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/StrolchConfiguration.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntime/config/StrolchConfiguration.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/data/StrolchModel.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntime/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/data/StrolchModel.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntime/data/StrolchModel.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeConfig.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeRoles.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntime/config/PrivilegeRoles.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeRoles.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeUsers.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeUsers.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeUsers.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/StrolchConfiguration.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/StrolchConfiguration.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/StrolchConfiguration.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/data/StrolchModel.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/data/StrolchModel.xml
rename to persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/data/StrolchModel.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
rename to persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeRoles.xml b/persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedJsonRuntimeVersioning/config/PrivilegeRoles.xml
rename to persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeRoles.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml b/persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml
rename to persistence-postgresql/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/StrolchConfiguration.xml b/persistence-postgresql/src/test/resources/cachedRuntime/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/StrolchConfiguration.xml
rename to persistence-postgresql/src/test/resources/cachedRuntime/config/StrolchConfiguration.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/data/StrolchModel.xml b/persistence-postgresql/src/test/resources/cachedRuntime/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/data/StrolchModel.xml
rename to persistence-postgresql/src/test/resources/cachedRuntime/data/StrolchModel.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml
rename to persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeConfig.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeRoles.xml b/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntime/config/PrivilegeRoles.xml
rename to persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeRoles.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeUsers.xml b/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeUsers.xml
rename to persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeUsers.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/StrolchConfiguration.xml b/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/StrolchConfiguration.xml
rename to persistence-postgresql/src/test/resources/cachedRuntimeVersioning/config/StrolchConfiguration.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/data/StrolchModel.xml b/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/data/StrolchModel.xml
rename to persistence-postgresql/src/test/resources/cachedRuntimeVersioning/data/StrolchModel.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/logback.xml b/persistence-postgresql/src/test/resources/logback.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/logback.xml
rename to persistence-postgresql/src/test/resources/logback.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml b/persistence-postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml
rename to persistence-postgresql/src/test/resources/realmtest/config/PrivilegeConfig.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeRoles.xml b/persistence-postgresql/src/test/resources/realmtest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/cachedRuntimeVersioning/config/PrivilegeRoles.xml
rename to persistence-postgresql/src/test/resources/realmtest/config/PrivilegeRoles.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeUsers.xml b/persistence-postgresql/src/test/resources/realmtest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeUsers.xml
rename to persistence-postgresql/src/test/resources/realmtest/config/PrivilegeUsers.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/StrolchConfiguration.xml b/persistence-postgresql/src/test/resources/realmtest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/realmtest/config/StrolchConfiguration.xml
rename to persistence-postgresql/src/test/resources/realmtest/config/StrolchConfiguration.xml
diff --git a/li.strolch.persistence.xml/.gitignore b/persistence-xml/.gitignore
similarity index 100%
rename from li.strolch.persistence.xml/.gitignore
rename to persistence-xml/.gitignore
diff --git a/li.strolch.persistence.postgresql/LICENSE b/persistence-xml/LICENSE
similarity index 100%
rename from li.strolch.persistence.postgresql/LICENSE
rename to persistence-xml/LICENSE
diff --git a/li.strolch.persistence.xml/README.md b/persistence-xml/README.md
similarity index 100%
rename from li.strolch.persistence.xml/README.md
rename to persistence-xml/README.md
diff --git a/li.strolch.persistence.xml/pom.xml b/persistence-xml/pom.xml
similarity index 87%
rename from li.strolch.persistence.xml/pom.xml
rename to persistence-xml/pom.xml
index 7ec8c18c4..dcbe62c75 100644
--- a/li.strolch.persistence.xml/pom.xml
+++ b/persistence-xml/pom.xml
@@ -5,13 +5,13 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.persistence.xml</artifactId>
-    <name>li.strolch.persistence.xml</name>
+    <artifactId>persistence-xml</artifactId>
+    <name>persistence.xml</name>
     <description>Reference Persistence Implementation for Strolch</description>
     <inceptionYear>2011</inceptionYear>
 
@@ -37,21 +37,21 @@
         <!-- main -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.xmlpers</artifactId>
+            <artifactId>xmlpers</artifactId>
         </dependency>
 
         <!-- test -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/AbstractDao.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/AbstractDao.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/AbstractDao.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/AbstractDao.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlActivityDao.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/XmlActivityDao.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlActivityDao.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/XmlActivityDao.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlAuditDao.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/XmlAuditDao.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlAuditDao.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/XmlAuditDao.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlLogMessageDao.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/XmlLogMessageDao.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlLogMessageDao.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/XmlLogMessageDao.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlOrderDao.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/XmlOrderDao.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlOrderDao.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/XmlOrderDao.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlPersistenceHandler.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/XmlPersistenceHandler.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlPersistenceHandler.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/XmlPersistenceHandler.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlResourceDao.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/XmlResourceDao.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlResourceDao.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/XmlResourceDao.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlStrolchTransaction.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/XmlStrolchTransaction.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/XmlStrolchTransaction.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/XmlStrolchTransaction.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ActivityContextFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/ActivityContextFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ActivityContextFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/ActivityContextFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ActivityParserFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/ActivityParserFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ActivityParserFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/ActivityParserFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ActivitySaxParser.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/ActivitySaxParser.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ActivitySaxParser.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/ActivitySaxParser.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/AuditContextFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/AuditContextFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/AuditContextFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/AuditContextFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/AuditDomParser.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/AuditDomParser.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/AuditDomParser.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/AuditDomParser.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/AuditParserFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/AuditParserFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/AuditParserFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/AuditParserFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/AuditSaxParser.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/AuditSaxParser.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/AuditSaxParser.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/AuditSaxParser.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageContextFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageContextFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageContextFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageContextFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageParserFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageParserFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageParserFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageParserFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageSaxParser.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageSaxParser.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageSaxParser.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageSaxParser.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageSaxReader.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageSaxReader.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageSaxReader.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageSaxReader.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageToSaxWriterVisitor.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageToSaxWriterVisitor.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/LogMessageToSaxWriterVisitor.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/LogMessageToSaxWriterVisitor.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/OrderContextFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/OrderContextFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/OrderContextFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/OrderContextFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/OrderParserFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/OrderParserFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/OrderParserFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/OrderParserFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/OrderSaxParser.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/OrderSaxParser.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/OrderSaxParser.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/OrderSaxParser.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ResourceContextFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/ResourceContextFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ResourceContextFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/ResourceContextFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ResourceParserFactory.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/ResourceParserFactory.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ResourceParserFactory.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/ResourceParserFactory.java
diff --git a/li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ResourceSaxParser.java b/persistence-xml/src/main/java/li/strolch/persistence/xml/model/ResourceSaxParser.java
similarity index 100%
rename from li.strolch.persistence.xml/src/main/java/li/strolch/persistence/xml/model/ResourceSaxParser.java
rename to persistence-xml/src/main/java/li/strolch/persistence/xml/model/ResourceSaxParser.java
diff --git a/li.strolch.persistence.xml/src/main/resources/componentVersion.properties b/persistence-xml/src/main/resources/componentVersion.properties
similarity index 100%
rename from li.strolch.persistence.xml/src/main/resources/componentVersion.properties
rename to persistence-xml/src/main/resources/componentVersion.properties
diff --git a/li.strolch.persistence.xml/src/test/java/li/strolch/persistence/impl/dao/test/ExistingDbTest.java b/persistence-xml/src/test/java/li/strolch/persistence/impl/dao/test/ExistingDbTest.java
similarity index 100%
rename from li.strolch.persistence.xml/src/test/java/li/strolch/persistence/impl/dao/test/ExistingDbTest.java
rename to persistence-xml/src/test/java/li/strolch/persistence/impl/dao/test/ExistingDbTest.java
diff --git a/li.strolch.persistence.xml/src/test/java/li/strolch/persistence/impl/dao/test/ObserverUpdateTest.java b/persistence-xml/src/test/java/li/strolch/persistence/impl/dao/test/ObserverUpdateTest.java
similarity index 100%
rename from li.strolch.persistence.xml/src/test/java/li/strolch/persistence/impl/dao/test/ObserverUpdateTest.java
rename to persistence-xml/src/test/java/li/strolch/persistence/impl/dao/test/ObserverUpdateTest.java
diff --git a/li.strolch.persistence.xml/src/test/java/li/strolch/persistence/impl/dao/test/XmlCachedDaoTest.java b/persistence-xml/src/test/java/li/strolch/persistence/impl/dao/test/XmlCachedDaoTest.java
similarity index 100%
rename from li.strolch.persistence.xml/src/test/java/li/strolch/persistence/impl/dao/test/XmlCachedDaoTest.java
rename to persistence-xml/src/test/java/li/strolch/persistence/impl/dao/test/XmlCachedDaoTest.java
diff --git a/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml b/persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
rename to persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeConfig.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeRoles.xml b/persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeRoles.xml
rename to persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeRoles.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml b/persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml
rename to persistence-xml/src/test/resources/cachedRuntime/config/PrivilegeUsers.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/StrolchConfiguration.xml b/persistence-xml/src/test/resources/cachedRuntime/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/cachedRuntime/config/StrolchConfiguration.xml
rename to persistence-xml/src/test/resources/cachedRuntime/config/StrolchConfiguration.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/cachedRuntime/data/DefaultRealm.xml b/persistence-xml/src/test/resources/cachedRuntime/data/DefaultRealm.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/cachedRuntime/data/DefaultRealm.xml
rename to persistence-xml/src/test/resources/cachedRuntime/data/DefaultRealm.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml b/persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml
rename to persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeConfig.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeRoles.xml b/persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeRoles.xml
rename to persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeRoles.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeUsers.xml b/persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/PrivilegeUsers.xml
rename to persistence-xml/src/test/resources/existingDbRuntime/config/PrivilegeUsers.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/StrolchConfiguration.xml b/persistence-xml/src/test/resources/existingDbRuntime/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/existingDbRuntime/config/StrolchConfiguration.xml
rename to persistence-xml/src/test/resources/existingDbRuntime/config/StrolchConfiguration.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/data/dbStore/Order/MyType/@1.xml b/persistence-xml/src/test/resources/existingDbRuntime/data/dbStore/Order/MyType/@1.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/existingDbRuntime/data/dbStore/Order/MyType/@1.xml
rename to persistence-xml/src/test/resources/existingDbRuntime/data/dbStore/Order/MyType/@1.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/existingDbRuntime/data/dbStore/Resource/MyType/@1.xml b/persistence-xml/src/test/resources/existingDbRuntime/data/dbStore/Resource/MyType/@1.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/existingDbRuntime/data/dbStore/Resource/MyType/@1.xml
rename to persistence-xml/src/test/resources/existingDbRuntime/data/dbStore/Resource/MyType/@1.xml
diff --git a/li.strolch.persistence.xml/src/test/resources/logback.xml b/persistence-xml/src/test/resources/logback.xml
similarity index 100%
rename from li.strolch.persistence.xml/src/test/resources/logback.xml
rename to persistence-xml/src/test/resources/logback.xml
diff --git a/pom.xml b/pom.xml
index 5b4e3e9aa..d61d397ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>li.strolch</groupId>
-    <artifactId>li.strolch</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <artifactId>strolch</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
 
-    <name>li.strolch</name>
+    <name>strolch</name>
     <description>Module build for strolch</description>
     <packaging>pom</packaging>
-    <url>http://www.strolch.li</url>
+    <url>https://www.strolch.li</url>
     <inceptionYear>2014</inceptionYear>
 
     <issueManagement>
@@ -148,23 +148,23 @@
     </properties>
 
     <modules>
-        <module>li.strolch.privilege</module>
-        <module>li.strolch.utils</module>
-        <module>li.strolch.xmlpers</module>
-        <module>li.strolch.model</module>
-        <module>li.strolch.soql</module>
-        <module>li.strolch.testbase</module>
+        <module>privilege</module>
+        <module>utils</module>
+        <module>xmlpers</module>
+        <module>model</module>
+        <module>soql</module>
+        <module>test-base</module>
 
-        <module>li.strolch.persistence.postgresql</module>
-        <module>li.strolch.persistence.xml</module>
-        <module>li.strolch.agent</module>
-        <module>li.strolch.service</module>
-        <module>li.strolch.rest</module>
-        <module>li.strolch.websocket</module>
+        <module>persistence-postgresql</module>
+        <module>persistence-xml</module>
+        <module>agent</module>
+        <module>service</module>
+        <module>web-rest</module>
+        <module>websocket</module>
 
-        <module>li.strolch.performancetest</module>
+        <module>test-performance</module>
 
-        <module>li.strolch.bom</module>
+        <module>bom</module>
     </modules>
 
     <dependencyManagement>
@@ -185,58 +185,58 @@
             <!-- Strolch -->
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.model</artifactId>
+                <artifactId>model</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.agent</artifactId>
+                <artifactId>agent</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.service</artifactId>
+                <artifactId>service</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.persistence.xml</artifactId>
+                <artifactId>persistence-xml</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.persistence.postgresql</artifactId>
+                <artifactId>persistence-postgresql</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.rest</artifactId>
+                <artifactId>web-rest</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.utils</artifactId>
+                <artifactId>utils</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.xmlpers</artifactId>
+                <artifactId>xmlpers</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.privilege</artifactId>
+                <artifactId>privilege</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.soql</artifactId>
+                <artifactId>soql</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>li.strolch</groupId>
-                <artifactId>li.strolch.testbase</artifactId>
+                <artifactId>test-base</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
@@ -557,7 +557,7 @@
                                 <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
 
                                 <!-- When creating an executable jar, use copy-dependencies plugin with libs in lib/ dir: -->
-                                <!-- mainClass>li.strolch.main.Main</mainClass -->
+                                <!-- mainClass>main.Main</mainClass -->
                                 <!-- addClasspath>true</addClasspath -->
                                 <!-- classpathPrefix>lib/</classpathPrefix -->
                             </manifest>
@@ -615,7 +615,7 @@
                         <archive>
                             <manifest>
                                 <addClasspath>true</addClasspath>
-                                <!-- mainClass>li.strolch.main.Main</mainClass -->
+                                <!-- mainClass>main.Main</mainClass -->
                             </manifest>
                         </archive>
                         <!-- <descriptorRefs> -->
diff --git a/li.strolch.privilege/.gitignore b/privilege/.gitignore
similarity index 100%
rename from li.strolch.privilege/.gitignore
rename to privilege/.gitignore
diff --git a/li.strolch.persistence.xml/LICENSE b/privilege/LICENSE
similarity index 100%
rename from li.strolch.persistence.xml/LICENSE
rename to privilege/LICENSE
diff --git a/li.strolch.privilege/README.md b/privilege/README.md
similarity index 100%
rename from li.strolch.privilege/README.md
rename to privilege/README.md
diff --git a/li.strolch.privilege/docs/PrivilegeAuthentication.dia b/privilege/docs/PrivilegeAuthentication.dia
similarity index 100%
rename from li.strolch.privilege/docs/PrivilegeAuthentication.dia
rename to privilege/docs/PrivilegeAuthentication.dia
diff --git a/li.strolch.privilege/docs/PrivilegeHandlers.dia b/privilege/docs/PrivilegeHandlers.dia
similarity index 100%
rename from li.strolch.privilege/docs/PrivilegeHandlers.dia
rename to privilege/docs/PrivilegeHandlers.dia
diff --git a/li.strolch.privilege/docs/PrivilegeModelPrivilege.dia b/privilege/docs/PrivilegeModelPrivilege.dia
similarity index 100%
rename from li.strolch.privilege/docs/PrivilegeModelPrivilege.dia
rename to privilege/docs/PrivilegeModelPrivilege.dia
diff --git a/li.strolch.privilege/docs/PrivilegeModelUser.dia b/privilege/docs/PrivilegeModelUser.dia
similarity index 100%
rename from li.strolch.privilege/docs/PrivilegeModelUser.dia
rename to privilege/docs/PrivilegeModelUser.dia
diff --git a/li.strolch.privilege/docs/TODO b/privilege/docs/TODO
similarity index 100%
rename from li.strolch.privilege/docs/TODO
rename to privilege/docs/TODO
diff --git a/li.strolch.privilege/pom.xml b/privilege/pom.xml
similarity index 92%
rename from li.strolch.privilege/pom.xml
rename to privilege/pom.xml
index ca40eceae..0924f04cf 100644
--- a/li.strolch.privilege/pom.xml
+++ b/privilege/pom.xml
@@ -5,14 +5,14 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.privilege</artifactId>
+    <artifactId>privilege</artifactId>
     <packaging>jar</packaging>
-    <name>li.strolch.privilege</name>
+    <name>privilege</name>
     <inceptionYear>2011</inceptionYear>
 
     <distributionManagement>
@@ -37,7 +37,7 @@
         <!-- main -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.utils</artifactId>
+            <artifactId>utils</artifactId>
         </dependency>
 
         <dependency>
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/base/AccessDeniedException.java b/privilege/src/main/java/li/strolch/privilege/base/AccessDeniedException.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/base/AccessDeniedException.java
rename to privilege/src/main/java/li/strolch/privilege/base/AccessDeniedException.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/base/InvalidCredentialsException.java b/privilege/src/main/java/li/strolch/privilege/base/InvalidCredentialsException.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/base/InvalidCredentialsException.java
rename to privilege/src/main/java/li/strolch/privilege/base/InvalidCredentialsException.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/base/NotAuthenticatedException.java b/privilege/src/main/java/li/strolch/privilege/base/NotAuthenticatedException.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/base/NotAuthenticatedException.java
rename to privilege/src/main/java/li/strolch/privilege/base/NotAuthenticatedException.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/base/PrivilegeConflictResolution.java b/privilege/src/main/java/li/strolch/privilege/base/PrivilegeConflictResolution.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/base/PrivilegeConflictResolution.java
rename to privilege/src/main/java/li/strolch/privilege/base/PrivilegeConflictResolution.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/base/PrivilegeConstants.java b/privilege/src/main/java/li/strolch/privilege/base/PrivilegeConstants.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/base/PrivilegeConstants.java
rename to privilege/src/main/java/li/strolch/privilege/base/PrivilegeConstants.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/base/PrivilegeException.java b/privilege/src/main/java/li/strolch/privilege/base/PrivilegeException.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/base/PrivilegeException.java
rename to privilege/src/main/java/li/strolch/privilege/base/PrivilegeException.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/base/PrivilegeModelException.java b/privilege/src/main/java/li/strolch/privilege/base/PrivilegeModelException.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/base/PrivilegeModelException.java
rename to privilege/src/main/java/li/strolch/privilege/base/PrivilegeModelException.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/BaseLdapPrivilegeHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/BaseLdapPrivilegeHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/BaseLdapPrivilegeHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/BaseLdapPrivilegeHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/BasicPasswordStrengthHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/BasicPasswordStrengthHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/BasicPasswordStrengthHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/BasicPasswordStrengthHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/ConsoleUserChallengeHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/ConsoleUserChallengeHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/ConsoleUserChallengeHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/ConsoleUserChallengeHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultEncryptionHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/DefaultEncryptionHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultEncryptionHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/DefaultEncryptionHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/DefaultPrivilegeHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/EncryptionHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/EncryptionHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/EncryptionHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/EncryptionHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/JsonConfigLdapPrivilegeHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/JsonConfigLdapPrivilegeHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/JsonConfigLdapPrivilegeHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/JsonConfigLdapPrivilegeHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/MailUserChallengeHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/MailUserChallengeHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/MailUserChallengeHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/MailUserChallengeHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/PasswordStrengthHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/PasswordStrengthHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/PasswordStrengthHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/PasswordStrengthHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/PersistenceHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/PersistenceHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/PersistenceHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/PersistenceHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/PrivilegeHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/PrivilegeHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/PrivilegeHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/PrivilegeHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SimpleLdapPrivilegeHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/SimpleLdapPrivilegeHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SimpleLdapPrivilegeHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/SimpleLdapPrivilegeHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SimplePasswordStrengthHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/SimplePasswordStrengthHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SimplePasswordStrengthHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/SimplePasswordStrengthHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SingleSignOnHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/SingleSignOnHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SingleSignOnHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/SingleSignOnHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SystemAction.java b/privilege/src/main/java/li/strolch/privilege/handler/SystemAction.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SystemAction.java
rename to privilege/src/main/java/li/strolch/privilege/handler/SystemAction.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SystemActionWithResult.java b/privilege/src/main/java/li/strolch/privilege/handler/SystemActionWithResult.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/SystemActionWithResult.java
rename to privilege/src/main/java/li/strolch/privilege/handler/SystemActionWithResult.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/UserChallengeHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/UserChallengeHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/UserChallengeHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/UserChallengeHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/handler/XmlPersistenceHandler.java b/privilege/src/main/java/li/strolch/privilege/handler/XmlPersistenceHandler.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/handler/XmlPersistenceHandler.java
rename to privilege/src/main/java/li/strolch/privilege/handler/XmlPersistenceHandler.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/helper/BootstrapConfigurationHelper.java b/privilege/src/main/java/li/strolch/privilege/helper/BootstrapConfigurationHelper.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/helper/BootstrapConfigurationHelper.java
rename to privilege/src/main/java/li/strolch/privilege/helper/BootstrapConfigurationHelper.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/helper/Crypt.java b/privilege/src/main/java/li/strolch/privilege/helper/Crypt.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/helper/Crypt.java
rename to privilege/src/main/java/li/strolch/privilege/helper/Crypt.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/helper/CryptHelper.java b/privilege/src/main/java/li/strolch/privilege/helper/CryptHelper.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/helper/CryptHelper.java
rename to privilege/src/main/java/li/strolch/privilege/helper/CryptHelper.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/helper/LdapHelper.java b/privilege/src/main/java/li/strolch/privilege/helper/LdapHelper.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/helper/LdapHelper.java
rename to privilege/src/main/java/li/strolch/privilege/helper/LdapHelper.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/helper/PasswordCreator.java b/privilege/src/main/java/li/strolch/privilege/helper/PasswordCreator.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/helper/PasswordCreator.java
rename to privilege/src/main/java/li/strolch/privilege/helper/PasswordCreator.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/helper/PrivilegeInitializationHelper.java b/privilege/src/main/java/li/strolch/privilege/helper/PrivilegeInitializationHelper.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/helper/PrivilegeInitializationHelper.java
rename to privilege/src/main/java/li/strolch/privilege/helper/PrivilegeInitializationHelper.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/helper/WriteRolesFileHelper.java b/privilege/src/main/java/li/strolch/privilege/helper/WriteRolesFileHelper.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/helper/WriteRolesFileHelper.java
rename to privilege/src/main/java/li/strolch/privilege/helper/WriteRolesFileHelper.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/helper/XmlConstants.java b/privilege/src/main/java/li/strolch/privilege/helper/XmlConstants.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/helper/XmlConstants.java
rename to privilege/src/main/java/li/strolch/privilege/helper/XmlConstants.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/i18n/PrivilegeMessages.java b/privilege/src/main/java/li/strolch/privilege/i18n/PrivilegeMessages.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/i18n/PrivilegeMessages.java
rename to privilege/src/main/java/li/strolch/privilege/i18n/PrivilegeMessages.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/Certificate.java b/privilege/src/main/java/li/strolch/privilege/model/Certificate.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/Certificate.java
rename to privilege/src/main/java/li/strolch/privilege/model/Certificate.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/IPrivilege.java b/privilege/src/main/java/li/strolch/privilege/model/IPrivilege.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/IPrivilege.java
rename to privilege/src/main/java/li/strolch/privilege/model/IPrivilege.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/PrivilegeContext.java b/privilege/src/main/java/li/strolch/privilege/model/PrivilegeContext.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/PrivilegeContext.java
rename to privilege/src/main/java/li/strolch/privilege/model/PrivilegeContext.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/PrivilegeElementVisitor.java b/privilege/src/main/java/li/strolch/privilege/model/PrivilegeElementVisitor.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/PrivilegeElementVisitor.java
rename to privilege/src/main/java/li/strolch/privilege/model/PrivilegeElementVisitor.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/PrivilegeRep.java b/privilege/src/main/java/li/strolch/privilege/model/PrivilegeRep.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/PrivilegeRep.java
rename to privilege/src/main/java/li/strolch/privilege/model/PrivilegeRep.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/Restrictable.java b/privilege/src/main/java/li/strolch/privilege/model/Restrictable.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/Restrictable.java
rename to privilege/src/main/java/li/strolch/privilege/model/Restrictable.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/RoleRep.java b/privilege/src/main/java/li/strolch/privilege/model/RoleRep.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/RoleRep.java
rename to privilege/src/main/java/li/strolch/privilege/model/RoleRep.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/SimpleRestrictable.java b/privilege/src/main/java/li/strolch/privilege/model/SimpleRestrictable.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/SimpleRestrictable.java
rename to privilege/src/main/java/li/strolch/privilege/model/SimpleRestrictable.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/Usage.java b/privilege/src/main/java/li/strolch/privilege/model/Usage.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/Usage.java
rename to privilege/src/main/java/li/strolch/privilege/model/Usage.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/UserRep.java b/privilege/src/main/java/li/strolch/privilege/model/UserRep.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/UserRep.java
rename to privilege/src/main/java/li/strolch/privilege/model/UserRep.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/UserState.java b/privilege/src/main/java/li/strolch/privilege/model/UserState.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/UserState.java
rename to privilege/src/main/java/li/strolch/privilege/model/UserState.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/PrivilegeContainerModel.java b/privilege/src/main/java/li/strolch/privilege/model/internal/PrivilegeContainerModel.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/PrivilegeContainerModel.java
rename to privilege/src/main/java/li/strolch/privilege/model/internal/PrivilegeContainerModel.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/PrivilegeImpl.java b/privilege/src/main/java/li/strolch/privilege/model/internal/PrivilegeImpl.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/PrivilegeImpl.java
rename to privilege/src/main/java/li/strolch/privilege/model/internal/PrivilegeImpl.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/Role.java b/privilege/src/main/java/li/strolch/privilege/model/internal/Role.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/Role.java
rename to privilege/src/main/java/li/strolch/privilege/model/internal/Role.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/User.java b/privilege/src/main/java/li/strolch/privilege/model/internal/User.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/User.java
rename to privilege/src/main/java/li/strolch/privilege/model/internal/User.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/UserChallenge.java b/privilege/src/main/java/li/strolch/privilege/model/internal/UserChallenge.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/UserChallenge.java
rename to privilege/src/main/java/li/strolch/privilege/model/internal/UserChallenge.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/UserHistory.java b/privilege/src/main/java/li/strolch/privilege/model/internal/UserHistory.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/model/internal/UserHistory.java
rename to privilege/src/main/java/li/strolch/privilege/model/internal/UserHistory.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/policy/DefaultPrivilege.java b/privilege/src/main/java/li/strolch/privilege/policy/DefaultPrivilege.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/policy/DefaultPrivilege.java
rename to privilege/src/main/java/li/strolch/privilege/policy/DefaultPrivilege.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/policy/PrivilegePolicy.java b/privilege/src/main/java/li/strolch/privilege/policy/PrivilegePolicy.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/policy/PrivilegePolicy.java
rename to privilege/src/main/java/li/strolch/privilege/policy/PrivilegePolicy.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/policy/PrivilegePolicyHelper.java b/privilege/src/main/java/li/strolch/privilege/policy/PrivilegePolicyHelper.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/policy/PrivilegePolicyHelper.java
rename to privilege/src/main/java/li/strolch/privilege/policy/PrivilegePolicyHelper.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/policy/RoleAccessPrivilege.java b/privilege/src/main/java/li/strolch/privilege/policy/RoleAccessPrivilege.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/policy/RoleAccessPrivilege.java
rename to privilege/src/main/java/li/strolch/privilege/policy/RoleAccessPrivilege.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/policy/UserAccessPrivilege.java b/privilege/src/main/java/li/strolch/privilege/policy/UserAccessPrivilege.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/policy/UserAccessPrivilege.java
rename to privilege/src/main/java/li/strolch/privilege/policy/UserAccessPrivilege.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/policy/UserAccessWithSameOrganisationPrivilege.java b/privilege/src/main/java/li/strolch/privilege/policy/UserAccessWithSameOrganisationPrivilege.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/policy/UserAccessWithSameOrganisationPrivilege.java
rename to privilege/src/main/java/li/strolch/privilege/policy/UserAccessWithSameOrganisationPrivilege.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/policy/UsernameFromCertificatePrivilege.java b/privilege/src/main/java/li/strolch/privilege/policy/UsernameFromCertificatePrivilege.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/policy/UsernameFromCertificatePrivilege.java
rename to privilege/src/main/java/li/strolch/privilege/policy/UsernameFromCertificatePrivilege.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/policy/UsernameFromCertificateWithSameOrganisationPrivilege.java b/privilege/src/main/java/li/strolch/privilege/policy/UsernameFromCertificateWithSameOrganisationPrivilege.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/policy/UsernameFromCertificateWithSameOrganisationPrivilege.java
rename to privilege/src/main/java/li/strolch/privilege/policy/UsernameFromCertificateWithSameOrganisationPrivilege.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsDomWriter.java b/privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsDomWriter.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsDomWriter.java
rename to privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsDomWriter.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsSaxReader.java b/privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsSaxReader.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsSaxReader.java
rename to privilege/src/main/java/li/strolch/privilege/xml/CertificateStubsSaxReader.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/ElementParser.java b/privilege/src/main/java/li/strolch/privilege/xml/ElementParser.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/ElementParser.java
rename to privilege/src/main/java/li/strolch/privilege/xml/ElementParser.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/ElementParserAdapter.java b/privilege/src/main/java/li/strolch/privilege/xml/ElementParserAdapter.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/ElementParserAdapter.java
rename to privilege/src/main/java/li/strolch/privilege/xml/ElementParserAdapter.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeConfigDomWriter.java b/privilege/src/main/java/li/strolch/privilege/xml/PrivilegeConfigDomWriter.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeConfigDomWriter.java
rename to privilege/src/main/java/li/strolch/privilege/xml/PrivilegeConfigDomWriter.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeConfigSaxReader.java b/privilege/src/main/java/li/strolch/privilege/xml/PrivilegeConfigSaxReader.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeConfigSaxReader.java
rename to privilege/src/main/java/li/strolch/privilege/xml/PrivilegeConfigSaxReader.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesDomWriter.java b/privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesDomWriter.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesDomWriter.java
rename to privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesDomWriter.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesSaxReader.java b/privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesSaxReader.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesSaxReader.java
rename to privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesSaxReader.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersDomWriter.java b/privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersDomWriter.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersDomWriter.java
rename to privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersDomWriter.java
diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersSaxReader.java b/privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersSaxReader.java
similarity index 100%
rename from li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersSaxReader.java
rename to privilege/src/main/java/li/strolch/privilege/xml/PrivilegeUsersSaxReader.java
diff --git a/li.strolch.privilege/src/main/resources/Privilege.xsd b/privilege/src/main/resources/Privilege.xsd
similarity index 100%
rename from li.strolch.privilege/src/main/resources/Privilege.xsd
rename to privilege/src/main/resources/Privilege.xsd
diff --git a/li.strolch.privilege/src/main/resources/PrivilegeMessages.properties b/privilege/src/main/resources/PrivilegeMessages.properties
similarity index 100%
rename from li.strolch.privilege/src/main/resources/PrivilegeMessages.properties
rename to privilege/src/main/resources/PrivilegeMessages.properties
diff --git a/li.strolch.privilege/src/main/resources/PrivilegeMessages_de.properties b/privilege/src/main/resources/PrivilegeMessages_de.properties
similarity index 100%
rename from li.strolch.privilege/src/main/resources/PrivilegeMessages_de.properties
rename to privilege/src/main/resources/PrivilegeMessages_de.properties
diff --git a/li.strolch.privilege/src/main/resources/PrivilegeModel.xsd b/privilege/src/main/resources/PrivilegeModel.xsd
similarity index 100%
rename from li.strolch.privilege/src/main/resources/PrivilegeModel.xsd
rename to privilege/src/main/resources/PrivilegeModel.xsd
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/AbstractPrivilegeTest.java b/privilege/src/test/java/li/strolch/privilege/test/AbstractPrivilegeTest.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/AbstractPrivilegeTest.java
rename to privilege/src/test/java/li/strolch/privilege/test/AbstractPrivilegeTest.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/BasicPasswordStrengthHandlerTest.java b/privilege/src/test/java/li/strolch/privilege/test/BasicPasswordStrengthHandlerTest.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/BasicPasswordStrengthHandlerTest.java
rename to privilege/src/test/java/li/strolch/privilege/test/BasicPasswordStrengthHandlerTest.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/CryptTest.java b/privilege/src/test/java/li/strolch/privilege/test/CryptTest.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/CryptTest.java
rename to privilege/src/test/java/li/strolch/privilege/test/CryptTest.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/PersistSessionsTest.java b/privilege/src/test/java/li/strolch/privilege/test/PersistSessionsTest.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/PersistSessionsTest.java
rename to privilege/src/test/java/li/strolch/privilege/test/PersistSessionsTest.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/PrivilegeConflictMergeTest.java b/privilege/src/test/java/li/strolch/privilege/test/PrivilegeConflictMergeTest.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/PrivilegeConflictMergeTest.java
rename to privilege/src/test/java/li/strolch/privilege/test/PrivilegeConflictMergeTest.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/PrivilegeTest.java b/privilege/src/test/java/li/strolch/privilege/test/PrivilegeTest.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/PrivilegeTest.java
rename to privilege/src/test/java/li/strolch/privilege/test/PrivilegeTest.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/SsoHandlerTest.java b/privilege/src/test/java/li/strolch/privilege/test/SsoHandlerTest.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/SsoHandlerTest.java
rename to privilege/src/test/java/li/strolch/privilege/test/SsoHandlerTest.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/WriteRolesFileHelperTest.java b/privilege/src/test/java/li/strolch/privilege/test/WriteRolesFileHelperTest.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/WriteRolesFileHelperTest.java
rename to privilege/src/test/java/li/strolch/privilege/test/WriteRolesFileHelperTest.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java b/privilege/src/test/java/li/strolch/privilege/test/XmlTest.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/XmlTest.java
rename to privilege/src/test/java/li/strolch/privilege/test/XmlTest.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/DummySsoHandler.java b/privilege/src/test/java/li/strolch/privilege/test/model/DummySsoHandler.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/DummySsoHandler.java
rename to privilege/src/test/java/li/strolch/privilege/test/model/DummySsoHandler.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestRestrictable.java b/privilege/src/test/java/li/strolch/privilege/test/model/TestRestrictable.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestRestrictable.java
rename to privilege/src/test/java/li/strolch/privilege/test/model/TestRestrictable.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestSystemRestrictable.java b/privilege/src/test/java/li/strolch/privilege/test/model/TestSystemRestrictable.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestSystemRestrictable.java
rename to privilege/src/test/java/li/strolch/privilege/test/model/TestSystemRestrictable.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestSystemUserAction.java b/privilege/src/test/java/li/strolch/privilege/test/model/TestSystemUserAction.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestSystemUserAction.java
rename to privilege/src/test/java/li/strolch/privilege/test/model/TestSystemUserAction.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestSystemUserActionDeny.java b/privilege/src/test/java/li/strolch/privilege/test/model/TestSystemUserActionDeny.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestSystemUserActionDeny.java
rename to privilege/src/test/java/li/strolch/privilege/test/model/TestSystemUserActionDeny.java
diff --git a/li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestUserChallengeHandler.java b/privilege/src/test/java/li/strolch/privilege/test/model/TestUserChallengeHandler.java
similarity index 100%
rename from li.strolch.privilege/src/test/java/li/strolch/privilege/test/model/TestUserChallengeHandler.java
rename to privilege/src/test/java/li/strolch/privilege/test/model/TestUserChallengeHandler.java
diff --git a/li.strolch.privilege/src/test/resources/config/PrivilegeConfig.xml b/privilege/src/test/resources/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.privilege/src/test/resources/config/PrivilegeConfig.xml
rename to privilege/src/test/resources/config/PrivilegeConfig.xml
diff --git a/li.strolch.privilege/src/test/resources/config/PrivilegeConfigMerge.xml b/privilege/src/test/resources/config/PrivilegeConfigMerge.xml
similarity index 100%
rename from li.strolch.privilege/src/test/resources/config/PrivilegeConfigMerge.xml
rename to privilege/src/test/resources/config/PrivilegeConfigMerge.xml
diff --git a/li.strolch.privilege/src/test/resources/config/PrivilegeRoles.xml b/privilege/src/test/resources/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.privilege/src/test/resources/config/PrivilegeRoles.xml
rename to privilege/src/test/resources/config/PrivilegeRoles.xml
diff --git a/li.strolch.privilege/src/test/resources/config/PrivilegeRolesMerge.xml b/privilege/src/test/resources/config/PrivilegeRolesMerge.xml
similarity index 100%
rename from li.strolch.privilege/src/test/resources/config/PrivilegeRolesMerge.xml
rename to privilege/src/test/resources/config/PrivilegeRolesMerge.xml
diff --git a/li.strolch.privilege/src/test/resources/config/PrivilegeUsers.xml b/privilege/src/test/resources/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.privilege/src/test/resources/config/PrivilegeUsers.xml
rename to privilege/src/test/resources/config/PrivilegeUsers.xml
diff --git a/li.strolch.privilege/src/test/resources/config/PrivilegeUsersMerge.xml b/privilege/src/test/resources/config/PrivilegeUsersMerge.xml
similarity index 100%
rename from li.strolch.privilege/src/test/resources/config/PrivilegeUsersMerge.xml
rename to privilege/src/test/resources/config/PrivilegeUsersMerge.xml
diff --git a/li.strolch.privilege/src/test/resources/logback.xml b/privilege/src/test/resources/logback.xml
similarity index 100%
rename from li.strolch.privilege/src/test/resources/logback.xml
rename to privilege/src/test/resources/logback.xml
diff --git a/li.strolch.rest/.gitignore b/service/.gitignore
similarity index 100%
rename from li.strolch.rest/.gitignore
rename to service/.gitignore
diff --git a/li.strolch.privilege/LICENSE b/service/LICENSE
similarity index 100%
rename from li.strolch.privilege/LICENSE
rename to service/LICENSE
diff --git a/li.strolch.service/README.md b/service/README.md
similarity index 100%
rename from li.strolch.service/README.md
rename to service/README.md
diff --git a/li.strolch.service/pom.xml b/service/pom.xml
similarity index 86%
rename from li.strolch.service/pom.xml
rename to service/pom.xml
index 852515f48..173591a69 100644
--- a/li.strolch.service/pom.xml
+++ b/service/pom.xml
@@ -5,13 +5,13 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.service</artifactId>
-    <name>li.strolch.service</name>
+    <artifactId>service</artifactId>
+    <name>service</name>
     <description>Service API for Strolch</description>
     <inceptionYear>2011</inceptionYear>
 
@@ -37,26 +37,26 @@
         <!-- main -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.privilege</artifactId>
+            <artifactId>privilege</artifactId>
         </dependency>
 
         <!-- test -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.persistence.postgresql</artifactId>
+            <artifactId>persistence-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/li.strolch.service/src/main/java/li/strolch/command/AddOrderCollectionCommand.java b/service/src/main/java/li/strolch/command/AddOrderCollectionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/AddOrderCollectionCommand.java
rename to service/src/main/java/li/strolch/command/AddOrderCollectionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/command/AddResourceCollectionCommand.java b/service/src/main/java/li/strolch/command/AddResourceCollectionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/AddResourceCollectionCommand.java
rename to service/src/main/java/li/strolch/command/AddResourceCollectionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/command/ClearModelCommand.java b/service/src/main/java/li/strolch/command/ClearModelCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/ClearModelCommand.java
rename to service/src/main/java/li/strolch/command/ClearModelCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/command/RemoveActivityCollectionCommand.java b/service/src/main/java/li/strolch/command/RemoveActivityCollectionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/RemoveActivityCollectionCommand.java
rename to service/src/main/java/li/strolch/command/RemoveActivityCollectionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/command/RemoveOrderCollectionCommand.java b/service/src/main/java/li/strolch/command/RemoveOrderCollectionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/RemoveOrderCollectionCommand.java
rename to service/src/main/java/li/strolch/command/RemoveOrderCollectionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/command/RemoveResourceCollectionCommand.java b/service/src/main/java/li/strolch/command/RemoveResourceCollectionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/RemoveResourceCollectionCommand.java
rename to service/src/main/java/li/strolch/command/RemoveResourceCollectionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/command/UpdateOrderCollectionCommand.java b/service/src/main/java/li/strolch/command/UpdateOrderCollectionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/UpdateOrderCollectionCommand.java
rename to service/src/main/java/li/strolch/command/UpdateOrderCollectionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/command/UpdateResourceCollectionCommand.java b/service/src/main/java/li/strolch/command/UpdateResourceCollectionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/UpdateResourceCollectionCommand.java
rename to service/src/main/java/li/strolch/command/UpdateResourceCollectionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/command/XmlExportModelCommand.java b/service/src/main/java/li/strolch/command/XmlExportModelCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/XmlExportModelCommand.java
rename to service/src/main/java/li/strolch/command/XmlExportModelCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/command/XmlImportModelCommand.java b/service/src/main/java/li/strolch/command/XmlImportModelCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/command/XmlImportModelCommand.java
rename to service/src/main/java/li/strolch/command/XmlImportModelCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/ArchiveExecutedActivitiesJob.java b/service/src/main/java/li/strolch/execution/ArchiveExecutedActivitiesJob.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/ArchiveExecutedActivitiesJob.java
rename to service/src/main/java/li/strolch/execution/ArchiveExecutedActivitiesJob.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/Controller.java b/service/src/main/java/li/strolch/execution/Controller.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/Controller.java
rename to service/src/main/java/li/strolch/execution/Controller.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/DelayedExecutionTimer.java b/service/src/main/java/li/strolch/execution/DelayedExecutionTimer.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/DelayedExecutionTimer.java
rename to service/src/main/java/li/strolch/execution/DelayedExecutionTimer.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java b/service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java
rename to service/src/main/java/li/strolch/execution/EventBasedExecutionHandler.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/ExecutionHandler.java b/service/src/main/java/li/strolch/execution/ExecutionHandler.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/ExecutionHandler.java
rename to service/src/main/java/li/strolch/execution/ExecutionHandler.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/ExecutionHandlerState.java b/service/src/main/java/li/strolch/execution/ExecutionHandlerState.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/ExecutionHandlerState.java
rename to service/src/main/java/li/strolch/execution/ExecutionHandlerState.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/SimpleDurationExecutionTimer.java b/service/src/main/java/li/strolch/execution/SimpleDurationExecutionTimer.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/SimpleDurationExecutionTimer.java
rename to service/src/main/java/li/strolch/execution/SimpleDurationExecutionTimer.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/ActionExecutionCommand.java b/service/src/main/java/li/strolch/execution/command/ActionExecutionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/ActionExecutionCommand.java
rename to service/src/main/java/li/strolch/execution/command/ActionExecutionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/ArchiveActivityCommand.java b/service/src/main/java/li/strolch/execution/command/ArchiveActivityCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/ArchiveActivityCommand.java
rename to service/src/main/java/li/strolch/execution/command/ArchiveActivityCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/AssignActionCommand.java b/service/src/main/java/li/strolch/execution/command/AssignActionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/AssignActionCommand.java
rename to service/src/main/java/li/strolch/execution/command/AssignActionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/BasePlanningAndExecutionCommand.java b/service/src/main/java/li/strolch/execution/command/BasePlanningAndExecutionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/BasePlanningAndExecutionCommand.java
rename to service/src/main/java/li/strolch/execution/command/BasePlanningAndExecutionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/ExecuteActivityCommand.java b/service/src/main/java/li/strolch/execution/command/ExecuteActivityCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/ExecuteActivityCommand.java
rename to service/src/main/java/li/strolch/execution/command/ExecuteActivityCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/PlanActionCommand.java b/service/src/main/java/li/strolch/execution/command/PlanActionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/PlanActionCommand.java
rename to service/src/main/java/li/strolch/execution/command/PlanActionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/PlanActivityCommand.java b/service/src/main/java/li/strolch/execution/command/PlanActivityCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/PlanActivityCommand.java
rename to service/src/main/java/li/strolch/execution/command/PlanActivityCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/PlanningCommand.java b/service/src/main/java/li/strolch/execution/command/PlanningCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/PlanningCommand.java
rename to service/src/main/java/li/strolch/execution/command/PlanningCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToClosedCommand.java b/service/src/main/java/li/strolch/execution/command/SetActionToClosedCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToClosedCommand.java
rename to service/src/main/java/li/strolch/execution/command/SetActionToClosedCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToCreatedCommand.java b/service/src/main/java/li/strolch/execution/command/SetActionToCreatedCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToCreatedCommand.java
rename to service/src/main/java/li/strolch/execution/command/SetActionToCreatedCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToErrorCommand.java b/service/src/main/java/li/strolch/execution/command/SetActionToErrorCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToErrorCommand.java
rename to service/src/main/java/li/strolch/execution/command/SetActionToErrorCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToExecutedCommand.java b/service/src/main/java/li/strolch/execution/command/SetActionToExecutedCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToExecutedCommand.java
rename to service/src/main/java/li/strolch/execution/command/SetActionToExecutedCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToPlannedCommand.java b/service/src/main/java/li/strolch/execution/command/SetActionToPlannedCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToPlannedCommand.java
rename to service/src/main/java/li/strolch/execution/command/SetActionToPlannedCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToStoppedCommand.java b/service/src/main/java/li/strolch/execution/command/SetActionToStoppedCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToStoppedCommand.java
rename to service/src/main/java/li/strolch/execution/command/SetActionToStoppedCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToWarningCommand.java b/service/src/main/java/li/strolch/execution/command/SetActionToWarningCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/SetActionToWarningCommand.java
rename to service/src/main/java/li/strolch/execution/command/SetActionToWarningCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/ShiftActionCommand.java b/service/src/main/java/li/strolch/execution/command/ShiftActionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/ShiftActionCommand.java
rename to service/src/main/java/li/strolch/execution/command/ShiftActionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/UnplanActionCommand.java b/service/src/main/java/li/strolch/execution/command/UnplanActionCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/UnplanActionCommand.java
rename to service/src/main/java/li/strolch/execution/command/UnplanActionCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/command/UnplanActivityCommand.java b/service/src/main/java/li/strolch/execution/command/UnplanActivityCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/command/UnplanActivityCommand.java
rename to service/src/main/java/li/strolch/execution/command/UnplanActivityCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/ActivityArchivalPolicy.java b/service/src/main/java/li/strolch/execution/policy/ActivityArchivalPolicy.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/ActivityArchivalPolicy.java
rename to service/src/main/java/li/strolch/execution/policy/ActivityArchivalPolicy.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/ActivityCreationPolicy.java b/service/src/main/java/li/strolch/execution/policy/ActivityCreationPolicy.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/ActivityCreationPolicy.java
rename to service/src/main/java/li/strolch/execution/policy/ActivityCreationPolicy.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/ConfirmationPolicy.java b/service/src/main/java/li/strolch/execution/policy/ConfirmationPolicy.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/ConfirmationPolicy.java
rename to service/src/main/java/li/strolch/execution/policy/ConfirmationPolicy.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/DurationExecution.java b/service/src/main/java/li/strolch/execution/policy/DurationExecution.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/DurationExecution.java
rename to service/src/main/java/li/strolch/execution/policy/DurationExecution.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/ExecutionPolicy.java b/service/src/main/java/li/strolch/execution/policy/ExecutionPolicy.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/ExecutionPolicy.java
rename to service/src/main/java/li/strolch/execution/policy/ExecutionPolicy.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/NoPlanning.java b/service/src/main/java/li/strolch/execution/policy/NoPlanning.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/NoPlanning.java
rename to service/src/main/java/li/strolch/execution/policy/NoPlanning.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/PlanningPolicy.java b/service/src/main/java/li/strolch/execution/policy/PlanningPolicy.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/PlanningPolicy.java
rename to service/src/main/java/li/strolch/execution/policy/PlanningPolicy.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/RandomDurationExecution.java b/service/src/main/java/li/strolch/execution/policy/RandomDurationExecution.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/RandomDurationExecution.java
rename to service/src/main/java/li/strolch/execution/policy/RandomDurationExecution.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/RemoveActivityArchival.java b/service/src/main/java/li/strolch/execution/policy/RemoveActivityArchival.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/RemoveActivityArchival.java
rename to service/src/main/java/li/strolch/execution/policy/RemoveActivityArchival.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/ReservationExecution.java b/service/src/main/java/li/strolch/execution/policy/ReservationExecution.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/ReservationExecution.java
rename to service/src/main/java/li/strolch/execution/policy/ReservationExecution.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/SimpleExecution.java b/service/src/main/java/li/strolch/execution/policy/SimpleExecution.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/SimpleExecution.java
rename to service/src/main/java/li/strolch/execution/policy/SimpleExecution.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/SimplePlanning.java b/service/src/main/java/li/strolch/execution/policy/SimplePlanning.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/SimplePlanning.java
rename to service/src/main/java/li/strolch/execution/policy/SimplePlanning.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/policy/ToErrorReservationExecution.java b/service/src/main/java/li/strolch/execution/policy/ToErrorReservationExecution.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/policy/ToErrorReservationExecution.java
rename to service/src/main/java/li/strolch/execution/policy/ToErrorReservationExecution.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/ClearAllCurrentExecutionsService.java b/service/src/main/java/li/strolch/execution/service/ClearAllCurrentExecutionsService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/ClearAllCurrentExecutionsService.java
rename to service/src/main/java/li/strolch/execution/service/ClearAllCurrentExecutionsService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/ExecuteActionService.java b/service/src/main/java/li/strolch/execution/service/ExecuteActionService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/ExecuteActionService.java
rename to service/src/main/java/li/strolch/execution/service/ExecuteActionService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/ReloadActivitiesInExecutionService.java b/service/src/main/java/li/strolch/execution/service/ReloadActivitiesInExecutionService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/ReloadActivitiesInExecutionService.java
rename to service/src/main/java/li/strolch/execution/service/ReloadActivitiesInExecutionService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/RemoveActivityFromExecutionService.java b/service/src/main/java/li/strolch/execution/service/RemoveActivityFromExecutionService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/RemoveActivityFromExecutionService.java
rename to service/src/main/java/li/strolch/execution/service/RemoveActivityFromExecutionService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToClosedService.java b/service/src/main/java/li/strolch/execution/service/SetActionToClosedService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToClosedService.java
rename to service/src/main/java/li/strolch/execution/service/SetActionToClosedService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToCreatedService.java b/service/src/main/java/li/strolch/execution/service/SetActionToCreatedService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToCreatedService.java
rename to service/src/main/java/li/strolch/execution/service/SetActionToCreatedService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToErrorService.java b/service/src/main/java/li/strolch/execution/service/SetActionToErrorService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToErrorService.java
rename to service/src/main/java/li/strolch/execution/service/SetActionToErrorService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToExecutedService.java b/service/src/main/java/li/strolch/execution/service/SetActionToExecutedService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToExecutedService.java
rename to service/src/main/java/li/strolch/execution/service/SetActionToExecutedService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToPlannedService.java b/service/src/main/java/li/strolch/execution/service/SetActionToPlannedService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToPlannedService.java
rename to service/src/main/java/li/strolch/execution/service/SetActionToPlannedService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToStoppedService.java b/service/src/main/java/li/strolch/execution/service/SetActionToStoppedService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToStoppedService.java
rename to service/src/main/java/li/strolch/execution/service/SetActionToStoppedService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToWarningService.java b/service/src/main/java/li/strolch/execution/service/SetActionToWarningService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/SetActionToWarningService.java
rename to service/src/main/java/li/strolch/execution/service/SetActionToWarningService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/SetExecutionHandlerStateService.java b/service/src/main/java/li/strolch/execution/service/SetExecutionHandlerStateService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/SetExecutionHandlerStateService.java
rename to service/src/main/java/li/strolch/execution/service/SetExecutionHandlerStateService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/StartActivityExecutionService.java b/service/src/main/java/li/strolch/execution/service/StartActivityExecutionService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/StartActivityExecutionService.java
rename to service/src/main/java/li/strolch/execution/service/StartActivityExecutionService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/TriggerExecutionForRealmService.java b/service/src/main/java/li/strolch/execution/service/TriggerExecutionForRealmService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/execution/service/TriggerExecutionForRealmService.java
rename to service/src/main/java/li/strolch/execution/service/TriggerExecutionForRealmService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/handler/mail/MailHandler.java b/service/src/main/java/li/strolch/handler/mail/MailHandler.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/handler/mail/MailHandler.java
rename to service/src/main/java/li/strolch/handler/mail/MailHandler.java
diff --git a/li.strolch.service/src/main/java/li/strolch/handler/mail/SmtpMailHandler.java b/service/src/main/java/li/strolch/handler/mail/SmtpMailHandler.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/handler/mail/SmtpMailHandler.java
rename to service/src/main/java/li/strolch/handler/mail/SmtpMailHandler.java
diff --git a/li.strolch.service/src/main/java/li/strolch/metrics/MetricPolicy.java b/service/src/main/java/li/strolch/metrics/MetricPolicy.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/metrics/MetricPolicy.java
rename to service/src/main/java/li/strolch/metrics/MetricPolicy.java
diff --git a/li.strolch.service/src/main/java/li/strolch/migrations/CodeMigration.java b/service/src/main/java/li/strolch/migrations/CodeMigration.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/migrations/CodeMigration.java
rename to service/src/main/java/li/strolch/migrations/CodeMigration.java
diff --git a/li.strolch.service/src/main/java/li/strolch/migrations/CurrentMigrationVersionQuery.java b/service/src/main/java/li/strolch/migrations/CurrentMigrationVersionQuery.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/migrations/CurrentMigrationVersionQuery.java
rename to service/src/main/java/li/strolch/migrations/CurrentMigrationVersionQuery.java
diff --git a/li.strolch.service/src/main/java/li/strolch/migrations/DataMigration.java b/service/src/main/java/li/strolch/migrations/DataMigration.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/migrations/DataMigration.java
rename to service/src/main/java/li/strolch/migrations/DataMigration.java
diff --git a/li.strolch.service/src/main/java/li/strolch/migrations/Migration.java b/service/src/main/java/li/strolch/migrations/Migration.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/migrations/Migration.java
rename to service/src/main/java/li/strolch/migrations/Migration.java
diff --git a/li.strolch.service/src/main/java/li/strolch/migrations/MigrationVersion.java b/service/src/main/java/li/strolch/migrations/MigrationVersion.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/migrations/MigrationVersion.java
rename to service/src/main/java/li/strolch/migrations/MigrationVersion.java
diff --git a/li.strolch.service/src/main/java/li/strolch/migrations/Migrations.java b/service/src/main/java/li/strolch/migrations/Migrations.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/migrations/Migrations.java
rename to service/src/main/java/li/strolch/migrations/Migrations.java
diff --git a/li.strolch.service/src/main/java/li/strolch/migrations/MigrationsHandler.java b/service/src/main/java/li/strolch/migrations/MigrationsHandler.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/migrations/MigrationsHandler.java
rename to service/src/main/java/li/strolch/migrations/MigrationsHandler.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/Report.java b/service/src/main/java/li/strolch/report/Report.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/Report.java
rename to service/src/main/java/li/strolch/report/Report.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/ReportConstants.java b/service/src/main/java/li/strolch/report/ReportConstants.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/ReportConstants.java
rename to service/src/main/java/li/strolch/report/ReportConstants.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/ReportElement.java b/service/src/main/java/li/strolch/report/ReportElement.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/ReportElement.java
rename to service/src/main/java/li/strolch/report/ReportElement.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/ReportSearch.java b/service/src/main/java/li/strolch/report/ReportSearch.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/ReportSearch.java
rename to service/src/main/java/li/strolch/report/ReportSearch.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/policy/ContainsReportFilter.java b/service/src/main/java/li/strolch/report/policy/ContainsReportFilter.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/policy/ContainsReportFilter.java
rename to service/src/main/java/li/strolch/report/policy/ContainsReportFilter.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/policy/EqualsReportFilter.java b/service/src/main/java/li/strolch/report/policy/EqualsReportFilter.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/policy/EqualsReportFilter.java
rename to service/src/main/java/li/strolch/report/policy/EqualsReportFilter.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/policy/GenericReport.java b/service/src/main/java/li/strolch/report/policy/GenericReport.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/policy/GenericReport.java
rename to service/src/main/java/li/strolch/report/policy/GenericReport.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/policy/GreaterThanReportFilter.java b/service/src/main/java/li/strolch/report/policy/GreaterThanReportFilter.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/policy/GreaterThanReportFilter.java
rename to service/src/main/java/li/strolch/report/policy/GreaterThanReportFilter.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/policy/IsInReportFilter.java b/service/src/main/java/li/strolch/report/policy/IsInReportFilter.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/policy/IsInReportFilter.java
rename to service/src/main/java/li/strolch/report/policy/IsInReportFilter.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/policy/LessThanReportFilter.java b/service/src/main/java/li/strolch/report/policy/LessThanReportFilter.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/policy/LessThanReportFilter.java
rename to service/src/main/java/li/strolch/report/policy/LessThanReportFilter.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/policy/ReportFilterPolicy.java b/service/src/main/java/li/strolch/report/policy/ReportFilterPolicy.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/policy/ReportFilterPolicy.java
rename to service/src/main/java/li/strolch/report/policy/ReportFilterPolicy.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/policy/ReportPolicy.java b/service/src/main/java/li/strolch/report/policy/ReportPolicy.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/policy/ReportPolicy.java
rename to service/src/main/java/li/strolch/report/policy/ReportPolicy.java
diff --git a/li.strolch.service/src/main/java/li/strolch/report/policy/ValueRefReportFilter.java b/service/src/main/java/li/strolch/report/policy/ValueRefReportFilter.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/report/policy/ValueRefReportFilter.java
rename to service/src/main/java/li/strolch/report/policy/ValueRefReportFilter.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddActivitiesService.java b/service/src/main/java/li/strolch/service/AddActivitiesService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddActivitiesService.java
rename to service/src/main/java/li/strolch/service/AddActivitiesService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddActivityService.java b/service/src/main/java/li/strolch/service/AddActivityService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddActivityService.java
rename to service/src/main/java/li/strolch/service/AddActivityService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateActivityService.java b/service/src/main/java/li/strolch/service/AddOrUpdateActivityService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateActivityService.java
rename to service/src/main/java/li/strolch/service/AddOrUpdateActivityService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateOrderService.java b/service/src/main/java/li/strolch/service/AddOrUpdateOrderService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateOrderService.java
rename to service/src/main/java/li/strolch/service/AddOrUpdateOrderService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateResourceService.java b/service/src/main/java/li/strolch/service/AddOrUpdateResourceService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateResourceService.java
rename to service/src/main/java/li/strolch/service/AddOrUpdateResourceService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateStrolchRootElementService.java b/service/src/main/java/li/strolch/service/AddOrUpdateStrolchRootElementService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateStrolchRootElementService.java
rename to service/src/main/java/li/strolch/service/AddOrUpdateStrolchRootElementService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateStrolchRootElementsService.java b/service/src/main/java/li/strolch/service/AddOrUpdateStrolchRootElementsService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddOrUpdateStrolchRootElementsService.java
rename to service/src/main/java/li/strolch/service/AddOrUpdateStrolchRootElementsService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddOrderService.java b/service/src/main/java/li/strolch/service/AddOrderService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddOrderService.java
rename to service/src/main/java/li/strolch/service/AddOrderService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddOrdersService.java b/service/src/main/java/li/strolch/service/AddOrdersService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddOrdersService.java
rename to service/src/main/java/li/strolch/service/AddOrdersService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddResourceService.java b/service/src/main/java/li/strolch/service/AddResourceService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddResourceService.java
rename to service/src/main/java/li/strolch/service/AddResourceService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddResourcesService.java b/service/src/main/java/li/strolch/service/AddResourcesService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddResourcesService.java
rename to service/src/main/java/li/strolch/service/AddResourcesService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddStrolchRootElementService.java b/service/src/main/java/li/strolch/service/AddStrolchRootElementService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddStrolchRootElementService.java
rename to service/src/main/java/li/strolch/service/AddStrolchRootElementService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/AddStrolchRootElementsService.java b/service/src/main/java/li/strolch/service/AddStrolchRootElementsService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/AddStrolchRootElementsService.java
rename to service/src/main/java/li/strolch/service/AddStrolchRootElementsService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/ClearModelArgument.java b/service/src/main/java/li/strolch/service/ClearModelArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/ClearModelArgument.java
rename to service/src/main/java/li/strolch/service/ClearModelArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/ClearModelService.java b/service/src/main/java/li/strolch/service/ClearModelService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/ClearModelService.java
rename to service/src/main/java/li/strolch/service/ClearModelService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/I18nService.java b/service/src/main/java/li/strolch/service/I18nService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/I18nService.java
rename to service/src/main/java/li/strolch/service/I18nService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/JsonServiceArgument.java b/service/src/main/java/li/strolch/service/JsonServiceArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/JsonServiceArgument.java
rename to service/src/main/java/li/strolch/service/JsonServiceArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/JsonServiceResult.java b/service/src/main/java/li/strolch/service/JsonServiceResult.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/JsonServiceResult.java
rename to service/src/main/java/li/strolch/service/JsonServiceResult.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/LocatorArgument.java b/service/src/main/java/li/strolch/service/LocatorArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/LocatorArgument.java
rename to service/src/main/java/li/strolch/service/LocatorArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/LocatorListArgument.java b/service/src/main/java/li/strolch/service/LocatorListArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/LocatorListArgument.java
rename to service/src/main/java/li/strolch/service/LocatorListArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveActivitiesService.java b/service/src/main/java/li/strolch/service/RemoveActivitiesService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/RemoveActivitiesService.java
rename to service/src/main/java/li/strolch/service/RemoveActivitiesService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveActivityService.java b/service/src/main/java/li/strolch/service/RemoveActivityService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/RemoveActivityService.java
rename to service/src/main/java/li/strolch/service/RemoveActivityService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveOrderService.java b/service/src/main/java/li/strolch/service/RemoveOrderService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/RemoveOrderService.java
rename to service/src/main/java/li/strolch/service/RemoveOrderService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveOrdersService.java b/service/src/main/java/li/strolch/service/RemoveOrdersService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/RemoveOrdersService.java
rename to service/src/main/java/li/strolch/service/RemoveOrdersService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveResourceService.java b/service/src/main/java/li/strolch/service/RemoveResourceService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/RemoveResourceService.java
rename to service/src/main/java/li/strolch/service/RemoveResourceService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveResourcesService.java b/service/src/main/java/li/strolch/service/RemoveResourcesService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/RemoveResourcesService.java
rename to service/src/main/java/li/strolch/service/RemoveResourcesService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveStrolchRootElementService.java b/service/src/main/java/li/strolch/service/RemoveStrolchRootElementService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/RemoveStrolchRootElementService.java
rename to service/src/main/java/li/strolch/service/RemoveStrolchRootElementService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/RemoveStrolchRootElementsService.java b/service/src/main/java/li/strolch/service/RemoveStrolchRootElementsService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/RemoveStrolchRootElementsService.java
rename to service/src/main/java/li/strolch/service/RemoveStrolchRootElementsService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StringArgument.java b/service/src/main/java/li/strolch/service/StringArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StringArgument.java
rename to service/src/main/java/li/strolch/service/StringArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StringListArgument.java b/service/src/main/java/li/strolch/service/StringListArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StringListArgument.java
rename to service/src/main/java/li/strolch/service/StringListArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StringMapArgument.java b/service/src/main/java/li/strolch/service/StringMapArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StringMapArgument.java
rename to service/src/main/java/li/strolch/service/StringMapArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StringMapResult.java b/service/src/main/java/li/strolch/service/StringMapResult.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StringMapResult.java
rename to service/src/main/java/li/strolch/service/StringMapResult.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StringServiceArgument.java b/service/src/main/java/li/strolch/service/StringServiceArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StringServiceArgument.java
rename to service/src/main/java/li/strolch/service/StringServiceArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StrolchElementArgument.java b/service/src/main/java/li/strolch/service/StrolchElementArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StrolchElementArgument.java
rename to service/src/main/java/li/strolch/service/StrolchElementArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StrolchRootElementArgument.java b/service/src/main/java/li/strolch/service/StrolchRootElementArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StrolchRootElementArgument.java
rename to service/src/main/java/li/strolch/service/StrolchRootElementArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StrolchRootElementListArgument.java b/service/src/main/java/li/strolch/service/StrolchRootElementListArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StrolchRootElementListArgument.java
rename to service/src/main/java/li/strolch/service/StrolchRootElementListArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StrolchRootElementListResult.java b/service/src/main/java/li/strolch/service/StrolchRootElementListResult.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StrolchRootElementListResult.java
rename to service/src/main/java/li/strolch/service/StrolchRootElementListResult.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/StrolchRootElementResult.java b/service/src/main/java/li/strolch/service/StrolchRootElementResult.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/StrolchRootElementResult.java
rename to service/src/main/java/li/strolch/service/StrolchRootElementResult.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/UpdateActivitiesService.java b/service/src/main/java/li/strolch/service/UpdateActivitiesService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/UpdateActivitiesService.java
rename to service/src/main/java/li/strolch/service/UpdateActivitiesService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/UpdateActivityService.java b/service/src/main/java/li/strolch/service/UpdateActivityService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/UpdateActivityService.java
rename to service/src/main/java/li/strolch/service/UpdateActivityService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/UpdateOrderService.java b/service/src/main/java/li/strolch/service/UpdateOrderService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/UpdateOrderService.java
rename to service/src/main/java/li/strolch/service/UpdateOrderService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/UpdateOrdersService.java b/service/src/main/java/li/strolch/service/UpdateOrdersService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/UpdateOrdersService.java
rename to service/src/main/java/li/strolch/service/UpdateOrdersService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/UpdateResourceService.java b/service/src/main/java/li/strolch/service/UpdateResourceService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/UpdateResourceService.java
rename to service/src/main/java/li/strolch/service/UpdateResourceService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/UpdateResourcesService.java b/service/src/main/java/li/strolch/service/UpdateResourcesService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/UpdateResourcesService.java
rename to service/src/main/java/li/strolch/service/UpdateResourcesService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/UpdateStrolchRootElementService.java b/service/src/main/java/li/strolch/service/UpdateStrolchRootElementService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/UpdateStrolchRootElementService.java
rename to service/src/main/java/li/strolch/service/UpdateStrolchRootElementService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/UpdateStrolchRootElementsService.java b/service/src/main/java/li/strolch/service/UpdateStrolchRootElementsService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/UpdateStrolchRootElementsService.java
rename to service/src/main/java/li/strolch/service/UpdateStrolchRootElementsService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelArgument.java b/service/src/main/java/li/strolch/service/XmlExportModelArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/XmlExportModelArgument.java
rename to service/src/main/java/li/strolch/service/XmlExportModelArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/XmlExportModelService.java b/service/src/main/java/li/strolch/service/XmlExportModelService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/XmlExportModelService.java
rename to service/src/main/java/li/strolch/service/XmlExportModelService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/XmlImportModelArgument.java b/service/src/main/java/li/strolch/service/XmlImportModelArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/XmlImportModelArgument.java
rename to service/src/main/java/li/strolch/service/XmlImportModelArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/XmlImportModelResult.java b/service/src/main/java/li/strolch/service/XmlImportModelResult.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/XmlImportModelResult.java
rename to service/src/main/java/li/strolch/service/XmlImportModelResult.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/XmlImportModelService.java b/service/src/main/java/li/strolch/service/XmlImportModelService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/XmlImportModelService.java
rename to service/src/main/java/li/strolch/service/XmlImportModelService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/executor/ServiceExecutionHandler.java b/service/src/main/java/li/strolch/service/executor/ServiceExecutionHandler.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/executor/ServiceExecutionHandler.java
rename to service/src/main/java/li/strolch/service/executor/ServiceExecutionHandler.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/executor/ServiceExecutionStatus.java b/service/src/main/java/li/strolch/service/executor/ServiceExecutionStatus.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/executor/ServiceExecutionStatus.java
rename to service/src/main/java/li/strolch/service/executor/ServiceExecutionStatus.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/parameter/AddParameterService.java b/service/src/main/java/li/strolch/service/parameter/AddParameterService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/parameter/AddParameterService.java
rename to service/src/main/java/li/strolch/service/parameter/AddParameterService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/parameter/RemoveParameterService.java b/service/src/main/java/li/strolch/service/parameter/RemoveParameterService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/parameter/RemoveParameterService.java
rename to service/src/main/java/li/strolch/service/parameter/RemoveParameterService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/parameter/SetParameterService.java b/service/src/main/java/li/strolch/service/parameter/SetParameterService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/parameter/SetParameterService.java
rename to service/src/main/java/li/strolch/service/parameter/SetParameterService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddOrReplacePrivilegeOnRoleArgument.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddOrReplacePrivilegeOnRoleArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddOrReplacePrivilegeOnRoleArgument.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddOrReplacePrivilegeOnRoleArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddOrReplacePrivilegeOnRoleService.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddOrReplacePrivilegeOnRoleService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddOrReplacePrivilegeOnRoleService.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddOrReplacePrivilegeOnRoleService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddRoleService.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddRoleService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddRoleService.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeAddRoleService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleArgument.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleArgument.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleService.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleService.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemovePrivilegeFromRoleService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemoveRoleService.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemoveRoleService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemoveRoleService.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRemoveRoleService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleArgument.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleArgument.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleNameArgument.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleNameArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleNameArgument.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleNameArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleResult.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleResult.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleResult.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeRoleResult.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeUpdateRoleService.java b/service/src/main/java/li/strolch/service/privilege/roles/PrivilegeUpdateRoleService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/roles/PrivilegeUpdateRoleService.java
rename to service/src/main/java/li/strolch/service/privilege/roles/PrivilegeUpdateRoleService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/ClearUserPasswordService.java b/service/src/main/java/li/strolch/service/privilege/users/ClearUserPasswordService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/ClearUserPasswordService.java
rename to service/src/main/java/li/strolch/service/privilege/users/ClearUserPasswordService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddRoleToUserService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddRoleToUserService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddRoleToUserService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddRoleToUserService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserAndSetPasswordCommand.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserAndSetPasswordCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserAndSetPasswordCommand.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserAndSetPasswordCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUsersCommand.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUsersCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUsersCommand.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUsersCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveRoleFromUserService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveRoleFromUserService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveRoleFromUserService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveRoleFromUserService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserCommand.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserCommand.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserCommand.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserCommand.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRoleUserNamesArgument.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeRoleUserNamesArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRoleUserNamesArgument.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeRoleUserNamesArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleArgument.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleArgument.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordArgument.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordArgument.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordStateService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordStateService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordStateService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordStateService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateArgument.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateArgument.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserRolesService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserRolesService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserRolesService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserRolesService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserService.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserService.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserService.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserService.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserArgument.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserArgument.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserNameArgument.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserNameArgument.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserNameArgument.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserNameArgument.java
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserResult.java b/service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserResult.java
similarity index 100%
rename from li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserResult.java
rename to service/src/main/java/li/strolch/service/privilege/users/PrivilegeUserResult.java
diff --git a/li.strolch.rest/src/main/resources/componentVersion.properties b/service/src/main/resources/componentVersion.properties
similarity index 100%
rename from li.strolch.rest/src/main/resources/componentVersion.properties
rename to service/src/main/resources/componentVersion.properties
diff --git a/li.strolch.service/src/main/resources/strolch-service.properties b/service/src/main/resources/strolch-service.properties
similarity index 100%
rename from li.strolch.service/src/main/resources/strolch-service.properties
rename to service/src/main/resources/strolch-service.properties
diff --git a/li.strolch.service/src/test/java/li/strolch/command/AbstractRealmCommandTest.java b/service/src/test/java/li/strolch/command/AbstractRealmCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/AbstractRealmCommandTest.java
rename to service/src/test/java/li/strolch/command/AbstractRealmCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/AddOrderCollectionCommandTest.java b/service/src/test/java/li/strolch/command/AddOrderCollectionCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/AddOrderCollectionCommandTest.java
rename to service/src/test/java/li/strolch/command/AddOrderCollectionCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/AddOrderCommandTest.java b/service/src/test/java/li/strolch/command/AddOrderCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/AddOrderCommandTest.java
rename to service/src/test/java/li/strolch/command/AddOrderCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/AddResourceCollectionCommandTest.java b/service/src/test/java/li/strolch/command/AddResourceCollectionCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/AddResourceCollectionCommandTest.java
rename to service/src/test/java/li/strolch/command/AddResourceCollectionCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/AddResourceCommandTest.java b/service/src/test/java/li/strolch/command/AddResourceCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/AddResourceCommandTest.java
rename to service/src/test/java/li/strolch/command/AddResourceCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/InMemoryTransactionTest.java b/service/src/test/java/li/strolch/command/InMemoryTransactionTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/InMemoryTransactionTest.java
rename to service/src/test/java/li/strolch/command/InMemoryTransactionTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/RemoveActivityCollectionCommandTest.java b/service/src/test/java/li/strolch/command/RemoveActivityCollectionCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/RemoveActivityCollectionCommandTest.java
rename to service/src/test/java/li/strolch/command/RemoveActivityCollectionCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/RemoveOrderCollectionCommandTest.java b/service/src/test/java/li/strolch/command/RemoveOrderCollectionCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/RemoveOrderCollectionCommandTest.java
rename to service/src/test/java/li/strolch/command/RemoveOrderCollectionCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/RemoveOrderCommandTest.java b/service/src/test/java/li/strolch/command/RemoveOrderCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/RemoveOrderCommandTest.java
rename to service/src/test/java/li/strolch/command/RemoveOrderCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/RemoveResourceCollectionCommandTest.java b/service/src/test/java/li/strolch/command/RemoveResourceCollectionCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/RemoveResourceCollectionCommandTest.java
rename to service/src/test/java/li/strolch/command/RemoveResourceCollectionCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/RemoveResourceCommandTest.java b/service/src/test/java/li/strolch/command/RemoveResourceCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/RemoveResourceCommandTest.java
rename to service/src/test/java/li/strolch/command/RemoveResourceCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/UpdateOrderCollectionCommandTest.java b/service/src/test/java/li/strolch/command/UpdateOrderCollectionCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/UpdateOrderCollectionCommandTest.java
rename to service/src/test/java/li/strolch/command/UpdateOrderCollectionCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/UpdateOrderCommandTest.java b/service/src/test/java/li/strolch/command/UpdateOrderCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/UpdateOrderCommandTest.java
rename to service/src/test/java/li/strolch/command/UpdateOrderCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/UpdateResourceCollectionCommandTest.java b/service/src/test/java/li/strolch/command/UpdateResourceCollectionCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/UpdateResourceCollectionCommandTest.java
rename to service/src/test/java/li/strolch/command/UpdateResourceCollectionCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/UpdateResourceCommandTest.java b/service/src/test/java/li/strolch/command/UpdateResourceCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/UpdateResourceCommandTest.java
rename to service/src/test/java/li/strolch/command/UpdateResourceCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/command/privilege/users/PrivilegeAddUserCommandTest.java b/service/src/test/java/li/strolch/command/privilege/users/PrivilegeAddUserCommandTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/command/privilege/users/PrivilegeAddUserCommandTest.java
rename to service/src/test/java/li/strolch/command/privilege/users/PrivilegeAddUserCommandTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/execution/AssignActionTest.java b/service/src/test/java/li/strolch/execution/AssignActionTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/execution/AssignActionTest.java
rename to service/src/test/java/li/strolch/execution/AssignActionTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/execution/PlanActionTest.java b/service/src/test/java/li/strolch/execution/PlanActionTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/execution/PlanActionTest.java
rename to service/src/test/java/li/strolch/execution/PlanActionTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/execution/PlanActivityTest.java b/service/src/test/java/li/strolch/execution/PlanActivityTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/execution/PlanActivityTest.java
rename to service/src/test/java/li/strolch/execution/PlanActivityTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/execution/ReservationExecutionTest.java b/service/src/test/java/li/strolch/execution/ReservationExecutionTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/execution/ReservationExecutionTest.java
rename to service/src/test/java/li/strolch/execution/ReservationExecutionTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/execution/ShiftActionTest.java b/service/src/test/java/li/strolch/execution/ShiftActionTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/execution/ShiftActionTest.java
rename to service/src/test/java/li/strolch/execution/ShiftActionTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java b/service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java
rename to service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/migrations/MigrationsTest.java b/service/src/test/java/li/strolch/migrations/MigrationsTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/migrations/MigrationsTest.java
rename to service/src/test/java/li/strolch/migrations/MigrationsTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/operationslog/OperationsLogTest.java b/service/src/test/java/li/strolch/operationslog/OperationsLogTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/operationslog/OperationsLogTest.java
rename to service/src/test/java/li/strolch/operationslog/OperationsLogTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/report/GenericReportTest.java b/service/src/test/java/li/strolch/report/GenericReportTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/report/GenericReportTest.java
rename to service/src/test/java/li/strolch/report/GenericReportTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/report/PackableFilterPolicy.java b/service/src/test/java/li/strolch/report/PackableFilterPolicy.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/report/PackableFilterPolicy.java
rename to service/src/test/java/li/strolch/report/PackableFilterPolicy.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/AddActivityServiceTest.java b/service/src/test/java/li/strolch/service/AddActivityServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/AddActivityServiceTest.java
rename to service/src/test/java/li/strolch/service/AddActivityServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/AddOrUpdateResourceServiceTest.java b/service/src/test/java/li/strolch/service/AddOrUpdateResourceServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/AddOrUpdateResourceServiceTest.java
rename to service/src/test/java/li/strolch/service/AddOrUpdateResourceServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/AddOrderServiceTest.java b/service/src/test/java/li/strolch/service/AddOrderServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/AddOrderServiceTest.java
rename to service/src/test/java/li/strolch/service/AddOrderServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/AddOrdersServiceTest.java b/service/src/test/java/li/strolch/service/AddOrdersServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/AddOrdersServiceTest.java
rename to service/src/test/java/li/strolch/service/AddOrdersServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/AddResourceCollectionServiceTest.java b/service/src/test/java/li/strolch/service/AddResourceCollectionServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/AddResourceCollectionServiceTest.java
rename to service/src/test/java/li/strolch/service/AddResourceCollectionServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/AddResourceServiceTest.java b/service/src/test/java/li/strolch/service/AddResourceServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/AddResourceServiceTest.java
rename to service/src/test/java/li/strolch/service/AddResourceServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/ClearModelServiceTest.java b/service/src/test/java/li/strolch/service/ClearModelServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/ClearModelServiceTest.java
rename to service/src/test/java/li/strolch/service/ClearModelServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/FlushTxTest.java b/service/src/test/java/li/strolch/service/FlushTxTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/FlushTxTest.java
rename to service/src/test/java/li/strolch/service/FlushTxTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveActivityServiceTest.java b/service/src/test/java/li/strolch/service/RemoveActivityServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/RemoveActivityServiceTest.java
rename to service/src/test/java/li/strolch/service/RemoveActivityServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderCollectionServiceTest.java b/service/src/test/java/li/strolch/service/RemoveOrderCollectionServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/RemoveOrderCollectionServiceTest.java
rename to service/src/test/java/li/strolch/service/RemoveOrderCollectionServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveOrderServiceTest.java b/service/src/test/java/li/strolch/service/RemoveOrderServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/RemoveOrderServiceTest.java
rename to service/src/test/java/li/strolch/service/RemoveOrderServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceCollectionServiceTest.java b/service/src/test/java/li/strolch/service/RemoveResourceCollectionServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/RemoveResourceCollectionServiceTest.java
rename to service/src/test/java/li/strolch/service/RemoveResourceCollectionServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/RemoveResourceServiceTest.java b/service/src/test/java/li/strolch/service/RemoveResourceServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/RemoveResourceServiceTest.java
rename to service/src/test/java/li/strolch/service/RemoveResourceServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/SimpleModelTest.java b/service/src/test/java/li/strolch/service/SimpleModelTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/SimpleModelTest.java
rename to service/src/test/java/li/strolch/service/SimpleModelTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/TxExtendedTest.java b/service/src/test/java/li/strolch/service/TxExtendedTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/TxExtendedTest.java
rename to service/src/test/java/li/strolch/service/TxExtendedTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/TxModifyTest.java b/service/src/test/java/li/strolch/service/TxModifyTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/TxModifyTest.java
rename to service/src/test/java/li/strolch/service/TxModifyTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/TxTest.java b/service/src/test/java/li/strolch/service/TxTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/TxTest.java
rename to service/src/test/java/li/strolch/service/TxTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/UpdateActivityServiceTest.java b/service/src/test/java/li/strolch/service/UpdateActivityServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/UpdateActivityServiceTest.java
rename to service/src/test/java/li/strolch/service/UpdateActivityServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/UpdateOrderCollectionServiceTest.java b/service/src/test/java/li/strolch/service/UpdateOrderCollectionServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/UpdateOrderCollectionServiceTest.java
rename to service/src/test/java/li/strolch/service/UpdateOrderCollectionServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/UpdateOrderServiceTest.java b/service/src/test/java/li/strolch/service/UpdateOrderServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/UpdateOrderServiceTest.java
rename to service/src/test/java/li/strolch/service/UpdateOrderServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/UpdateResourceCollectionServiceTest.java b/service/src/test/java/li/strolch/service/UpdateResourceCollectionServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/UpdateResourceCollectionServiceTest.java
rename to service/src/test/java/li/strolch/service/UpdateResourceCollectionServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/UpdateResourceServiceTest.java b/service/src/test/java/li/strolch/service/UpdateResourceServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/UpdateResourceServiceTest.java
rename to service/src/test/java/li/strolch/service/UpdateResourceServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/XmlExportModelServiceTest.java b/service/src/test/java/li/strolch/service/XmlExportModelServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/XmlExportModelServiceTest.java
rename to service/src/test/java/li/strolch/service/XmlExportModelServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/XmlImportModelServiceTest.java b/service/src/test/java/li/strolch/service/XmlImportModelServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/XmlImportModelServiceTest.java
rename to service/src/test/java/li/strolch/service/XmlImportModelServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/parameter/AddParameterServiceTest.java b/service/src/test/java/li/strolch/service/parameter/AddParameterServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/parameter/AddParameterServiceTest.java
rename to service/src/test/java/li/strolch/service/parameter/AddParameterServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/parameter/RemoveParameterServiceTest.java b/service/src/test/java/li/strolch/service/parameter/RemoveParameterServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/parameter/RemoveParameterServiceTest.java
rename to service/src/test/java/li/strolch/service/parameter/RemoveParameterServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/parameter/SetParameterServiceTest.java b/service/src/test/java/li/strolch/service/parameter/SetParameterServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/parameter/SetParameterServiceTest.java
rename to service/src/test/java/li/strolch/service/parameter/SetParameterServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/privilege/users/PrivilegeAddUserServiceTest.java b/service/src/test/java/li/strolch/service/privilege/users/PrivilegeAddUserServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/privilege/users/PrivilegeAddUserServiceTest.java
rename to service/src/test/java/li/strolch/service/privilege/users/PrivilegeAddUserServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/AbstractRealmServiceTest.java b/service/src/test/java/li/strolch/service/test/AbstractRealmServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/test/AbstractRealmServiceTest.java
rename to service/src/test/java/li/strolch/service/test/AbstractRealmServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/AbstractServiceTest.java b/service/src/test/java/li/strolch/service/test/AbstractServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/test/AbstractServiceTest.java
rename to service/src/test/java/li/strolch/service/test/AbstractServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/GreetingServiceTest.java b/service/src/test/java/li/strolch/service/test/GreetingServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/test/GreetingServiceTest.java
rename to service/src/test/java/li/strolch/service/test/GreetingServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/ServiceLockingTest.java b/service/src/test/java/li/strolch/service/test/ServiceLockingTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/test/ServiceLockingTest.java
rename to service/src/test/java/li/strolch/service/test/ServiceLockingTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/ServiceTest.java b/service/src/test/java/li/strolch/service/test/ServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/test/ServiceTest.java
rename to service/src/test/java/li/strolch/service/test/ServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/XmlExportServiceTest.java b/service/src/test/java/li/strolch/service/test/XmlExportServiceTest.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/test/XmlExportServiceTest.java
rename to service/src/test/java/li/strolch/service/test/XmlExportServiceTest.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/model/GreetingResult.java b/service/src/test/java/li/strolch/service/test/model/GreetingResult.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/test/model/GreetingResult.java
rename to service/src/test/java/li/strolch/service/test/model/GreetingResult.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/model/GreetingService.java b/service/src/test/java/li/strolch/service/test/model/GreetingService.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/test/model/GreetingService.java
rename to service/src/test/java/li/strolch/service/test/model/GreetingService.java
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/model/TestService.java b/service/src/test/java/li/strolch/service/test/model/TestService.java
similarity index 100%
rename from li.strolch.service/src/test/java/li/strolch/service/test/model/TestService.java
rename to service/src/test/java/li/strolch/service/test/model/TestService.java
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml b/service/src/test/resources/executiontest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
rename to service/src/test/resources/executiontest/config/PrivilegeConfig.xml
diff --git a/li.strolch.service/src/test/resources/executiontest/config/PrivilegeRoles.xml b/service/src/test/resources/executiontest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/executiontest/config/PrivilegeRoles.xml
rename to service/src/test/resources/executiontest/config/PrivilegeRoles.xml
diff --git a/li.strolch.service/src/test/resources/executiontest/config/PrivilegeUsers.xml b/service/src/test/resources/executiontest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/executiontest/config/PrivilegeUsers.xml
rename to service/src/test/resources/executiontest/config/PrivilegeUsers.xml
diff --git a/li.strolch.service/src/test/resources/executiontest/config/StrolchConfiguration.xml b/service/src/test/resources/executiontest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/executiontest/config/StrolchConfiguration.xml
rename to service/src/test/resources/executiontest/config/StrolchConfiguration.xml
diff --git a/li.strolch.service/src/test/resources/executiontest/config/StrolchPolicies.xml b/service/src/test/resources/executiontest/config/StrolchPolicies.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/executiontest/config/StrolchPolicies.xml
rename to service/src/test/resources/executiontest/config/StrolchPolicies.xml
diff --git a/li.strolch.service/src/test/resources/executiontest/data/StrolchModel.xml b/service/src/test/resources/executiontest/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/executiontest/data/StrolchModel.xml
rename to service/src/test/resources/executiontest/data/StrolchModel.xml
diff --git a/li.strolch.rest/src/test/resources/logback.xml b/service/src/test/resources/logback.xml
similarity index 100%
rename from li.strolch.rest/src/test/resources/logback.xml
rename to service/src/test/resources/logback.xml
diff --git a/li.strolch.service/src/test/resources/executiontest/config/PrivilegeConfig.xml b/service/src/test/resources/migrationstest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/executiontest/config/PrivilegeConfig.xml
rename to service/src/test/resources/migrationstest/config/PrivilegeConfig.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeRoles.xml b/service/src/test/resources/migrationstest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/config/PrivilegeRoles.xml
rename to service/src/test/resources/migrationstest/config/PrivilegeRoles.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeUsers.xml b/service/src/test/resources/migrationstest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/config/PrivilegeUsers.xml
rename to service/src/test/resources/migrationstest/config/PrivilegeUsers.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/config/StrolchConfiguration.xml b/service/src/test/resources/migrationstest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/config/StrolchConfiguration.xml
rename to service/src/test/resources/migrationstest/config/StrolchConfiguration.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/data/StrolchModel.xml b/service/src/test/resources/migrationstest/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/data/StrolchModel.xml
rename to service/src/test/resources/migrationstest/data/StrolchModel.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml
rename to service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml
rename to service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml
rename to service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml
rename to service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml
rename to service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml
rename to service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml
diff --git a/li.strolch.service/src/test/resources/migrationstest/config/PrivilegeConfig.xml b/service/src/test/resources/reporttest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/migrationstest/config/PrivilegeConfig.xml
rename to service/src/test/resources/reporttest/config/PrivilegeConfig.xml
diff --git a/li.strolch.service/src/test/resources/reporttest/config/PrivilegeRoles.xml b/service/src/test/resources/reporttest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/reporttest/config/PrivilegeRoles.xml
rename to service/src/test/resources/reporttest/config/PrivilegeRoles.xml
diff --git a/li.strolch.service/src/test/resources/reporttest/config/PrivilegeUsers.xml b/service/src/test/resources/reporttest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/reporttest/config/PrivilegeUsers.xml
rename to service/src/test/resources/reporttest/config/PrivilegeUsers.xml
diff --git a/li.strolch.service/src/test/resources/reporttest/config/StrolchConfiguration.xml b/service/src/test/resources/reporttest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/reporttest/config/StrolchConfiguration.xml
rename to service/src/test/resources/reporttest/config/StrolchConfiguration.xml
diff --git a/li.strolch.service/src/test/resources/reporttest/config/StrolchPolicies.xml b/service/src/test/resources/reporttest/config/StrolchPolicies.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/reporttest/config/StrolchPolicies.xml
rename to service/src/test/resources/reporttest/config/StrolchPolicies.xml
diff --git a/li.strolch.service/src/test/resources/reporttest/data/StrolchModel.xml b/service/src/test/resources/reporttest/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/reporttest/data/StrolchModel.xml
rename to service/src/test/resources/reporttest/data/StrolchModel.xml
diff --git a/li.strolch.service/src/test/resources/reporttest/temp/.gitignore b/service/src/test/resources/reporttest/temp/.gitignore
similarity index 100%
rename from li.strolch.service/src/test/resources/reporttest/temp/.gitignore
rename to service/src/test/resources/reporttest/temp/.gitignore
diff --git a/li.strolch.service/src/test/resources/reporttest/config/PrivilegeConfig.xml b/service/src/test/resources/svctest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/reporttest/config/PrivilegeConfig.xml
rename to service/src/test/resources/svctest/config/PrivilegeConfig.xml
diff --git a/li.strolch.service/src/test/resources/svctest/config/PrivilegeRoles.xml b/service/src/test/resources/svctest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/config/PrivilegeRoles.xml
rename to service/src/test/resources/svctest/config/PrivilegeRoles.xml
diff --git a/li.strolch.service/src/test/resources/svctest/config/PrivilegeUsers.xml b/service/src/test/resources/svctest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/config/PrivilegeUsers.xml
rename to service/src/test/resources/svctest/config/PrivilegeUsers.xml
diff --git a/li.strolch.service/src/test/resources/svctest/config/StrolchConfiguration.xml b/service/src/test/resources/svctest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/config/StrolchConfiguration.xml
rename to service/src/test/resources/svctest/config/StrolchConfiguration.xml
diff --git a/li.strolch.service/src/test/resources/svctest/config/StrolchPolicies.xml b/service/src/test/resources/svctest/config/StrolchPolicies.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/config/StrolchPolicies.xml
rename to service/src/test/resources/svctest/config/StrolchPolicies.xml
diff --git a/li.strolch.service/src/test/resources/svctest/data/Activities.xml b/service/src/test/resources/svctest/data/Activities.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/data/Activities.xml
rename to service/src/test/resources/svctest/data/Activities.xml
diff --git a/li.strolch.service/src/test/resources/svctest/data/Enums.xml b/service/src/test/resources/svctest/data/Enums.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/data/Enums.xml
rename to service/src/test/resources/svctest/data/Enums.xml
diff --git a/li.strolch.service/src/test/resources/svctest/data/Orders.xml b/service/src/test/resources/svctest/data/Orders.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/data/Orders.xml
rename to service/src/test/resources/svctest/data/Orders.xml
diff --git a/li.strolch.service/src/test/resources/svctest/data/Resources.xml b/service/src/test/resources/svctest/data/Resources.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/data/Resources.xml
rename to service/src/test/resources/svctest/data/Resources.xml
diff --git a/li.strolch.service/src/test/resources/svctest/data/StrolchModel.xml b/service/src/test/resources/svctest/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/data/StrolchModel.xml
rename to service/src/test/resources/svctest/data/StrolchModel.xml
diff --git a/li.strolch.service/src/test/resources/svctest/config/PrivilegeConfig.xml b/service/src/test/resources/transienttest/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/svctest/config/PrivilegeConfig.xml
rename to service/src/test/resources/transienttest/config/PrivilegeConfig.xml
diff --git a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeRoles.xml b/service/src/test/resources/transienttest/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/transienttest/config/PrivilegeRoles.xml
rename to service/src/test/resources/transienttest/config/PrivilegeRoles.xml
diff --git a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeUsers.xml b/service/src/test/resources/transienttest/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/transienttest/config/PrivilegeUsers.xml
rename to service/src/test/resources/transienttest/config/PrivilegeUsers.xml
diff --git a/li.strolch.service/src/test/resources/transienttest/config/StrolchConfiguration.xml b/service/src/test/resources/transienttest/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/transienttest/config/StrolchConfiguration.xml
rename to service/src/test/resources/transienttest/config/StrolchConfiguration.xml
diff --git a/li.strolch.service/src/test/resources/transienttest/data/Enums.xml b/service/src/test/resources/transienttest/data/Enums.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/transienttest/data/Enums.xml
rename to service/src/test/resources/transienttest/data/Enums.xml
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml b/service/src/test/resources/transienttest/data/Orders.xml
similarity index 100%
rename from li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml
rename to service/src/test/resources/transienttest/data/Orders.xml
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml b/service/src/test/resources/transienttest/data/Resources.xml
similarity index 100%
rename from li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml
rename to service/src/test/resources/transienttest/data/Resources.xml
diff --git a/li.strolch.service/src/test/resources/transienttest/data/StrolchModel.xml b/service/src/test/resources/transienttest/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/transienttest/data/StrolchModel.xml
rename to service/src/test/resources/transienttest/data/StrolchModel.xml
diff --git a/li.strolch.service/src/test/resources/transienttest/data/example-model.xml b/service/src/test/resources/transienttest/data/example-model.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/transienttest/data/example-model.xml
rename to service/src/test/resources/transienttest/data/example-model.xml
diff --git a/li.strolch.service/src/test/resources/transienttest/config/PrivilegeConfig.xml b/service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/transienttest/config/PrivilegeConfig.xml
rename to service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
diff --git a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeRoles.xml b/service/src/test/resources/withPrivilegeRuntime/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeRoles.xml
rename to service/src/test/resources/withPrivilegeRuntime/config/PrivilegeRoles.xml
diff --git a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml b/service/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml
rename to service/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml
diff --git a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml b/service/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
rename to service/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
diff --git a/li.strolch.service/.gitignore b/soql/.gitignore
similarity index 100%
rename from li.strolch.service/.gitignore
rename to soql/.gitignore
diff --git a/li.strolch.rest/LICENSE b/soql/LICENSE
similarity index 100%
rename from li.strolch.rest/LICENSE
rename to soql/LICENSE
diff --git a/li.strolch.soql/README.md b/soql/README.md
similarity index 100%
rename from li.strolch.soql/README.md
rename to soql/README.md
diff --git a/li.strolch.soql/pom.xml b/soql/pom.xml
similarity index 88%
rename from li.strolch.soql/pom.xml
rename to soql/pom.xml
index a2a50e713..80bd29510 100644
--- a/li.strolch.soql/pom.xml
+++ b/soql/pom.xml
@@ -5,14 +5,14 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.soql</artifactId>
+    <artifactId>soql</artifactId>
     <packaging>jar</packaging>
-    <name>li.strolch.soql</name>
+    <name>soql</name>
     <inceptionYear>2012</inceptionYear>
 
     <distributionManagement>
@@ -42,19 +42,19 @@
 
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.utils</artifactId>
+            <artifactId>utils</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.privilege</artifactId>
+            <artifactId>privilege</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
 
         <!-- Test -->
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQL.g4 b/soql/src/main/java/li/strolch/soql/antlr4/generated/SOQL.g4
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQL.g4
rename to soql/src/main/java/li/strolch/soql/antlr4/generated/SOQL.g4
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQL.tokens b/soql/src/main/java/li/strolch/soql/antlr4/generated/SOQL.tokens
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQL.tokens
rename to soql/src/main/java/li/strolch/soql/antlr4/generated/SOQL.tokens
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLBaseListener.java b/soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLBaseListener.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLBaseListener.java
rename to soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLBaseListener.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLBaseVisitor.java b/soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLBaseVisitor.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLBaseVisitor.java
rename to soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLBaseVisitor.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLLexer.java b/soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLLexer.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLLexer.java
rename to soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLLexer.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLLexer.tokens b/soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLLexer.tokens
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLLexer.tokens
rename to soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLLexer.tokens
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLListener.java b/soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLListener.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLListener.java
rename to soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLListener.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLParser.java b/soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLParser.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLParser.java
rename to soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLParser.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLVisitor.java b/soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLVisitor.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLVisitor.java
rename to soql/src/main/java/li/strolch/soql/antlr4/generated/SOQLVisitor.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/CompiledStatement.java b/soql/src/main/java/li/strolch/soql/core/CompiledStatement.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/CompiledStatement.java
rename to soql/src/main/java/li/strolch/soql/core/CompiledStatement.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/IndexPointer.java b/soql/src/main/java/li/strolch/soql/core/IndexPointer.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/IndexPointer.java
rename to soql/src/main/java/li/strolch/soql/core/IndexPointer.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/QueryProcessor.java b/soql/src/main/java/li/strolch/soql/core/QueryProcessor.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/QueryProcessor.java
rename to soql/src/main/java/li/strolch/soql/core/QueryProcessor.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/QueryRequest.java b/soql/src/main/java/li/strolch/soql/core/QueryRequest.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/QueryRequest.java
rename to soql/src/main/java/li/strolch/soql/core/QueryRequest.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/QueryResponse.java b/soql/src/main/java/li/strolch/soql/core/QueryResponse.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/QueryResponse.java
rename to soql/src/main/java/li/strolch/soql/core/QueryResponse.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/ResultSet.java b/soql/src/main/java/li/strolch/soql/core/ResultSet.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/ResultSet.java
rename to soql/src/main/java/li/strolch/soql/core/ResultSet.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/SOQLEvaluationException.java b/soql/src/main/java/li/strolch/soql/core/SOQLEvaluationException.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/SOQLEvaluationException.java
rename to soql/src/main/java/li/strolch/soql/core/SOQLEvaluationException.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/SOQLListener.java b/soql/src/main/java/li/strolch/soql/core/SOQLListener.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/SOQLListener.java
rename to soql/src/main/java/li/strolch/soql/core/SOQLListener.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/SOQLParseException.java b/soql/src/main/java/li/strolch/soql/core/SOQLParseException.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/SOQLParseException.java
rename to soql/src/main/java/li/strolch/soql/core/SOQLParseException.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/VerboseListener.java b/soql/src/main/java/li/strolch/soql/core/VerboseListener.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/VerboseListener.java
rename to soql/src/main/java/li/strolch/soql/core/VerboseListener.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/AbstractBooleanExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/AbstractBooleanExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/AbstractBooleanExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/AbstractBooleanExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/AbstractObjectExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/AbstractObjectExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/AbstractObjectExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/AbstractObjectExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/AndExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/AndExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/AndExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/AndExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ChainedMethodExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/ChainedMethodExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ChainedMethodExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/ChainedMethodExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ComparisonExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/ComparisonExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ComparisonExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/ComparisonExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ExpressionTerm.java b/soql/src/main/java/li/strolch/soql/core/expresssion/ExpressionTerm.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ExpressionTerm.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/ExpressionTerm.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/IBooleanExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/IBooleanExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/IBooleanExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/IBooleanExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/IExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/IExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/IExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/IExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/IObjectExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/IObjectExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/IObjectExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/IObjectExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/MethodArgumentDeclaration.java b/soql/src/main/java/li/strolch/soql/core/expresssion/MethodArgumentDeclaration.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/MethodArgumentDeclaration.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/MethodArgumentDeclaration.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/MethodExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/MethodExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/MethodExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/MethodExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ObjectDeclaration.java b/soql/src/main/java/li/strolch/soql/core/expresssion/ObjectDeclaration.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ObjectDeclaration.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/ObjectDeclaration.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/OrExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/OrExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/OrExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/OrExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ParameterReference.java b/soql/src/main/java/li/strolch/soql/core/expresssion/ParameterReference.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ParameterReference.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/ParameterReference.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/SelectClause.java b/soql/src/main/java/li/strolch/soql/core/expresssion/SelectClause.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/SelectClause.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/SelectClause.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/SelectExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/SelectExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/SelectExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/SelectExpression.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ValueDeclaration.java b/soql/src/main/java/li/strolch/soql/core/expresssion/ValueDeclaration.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/ValueDeclaration.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/ValueDeclaration.java
diff --git a/li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/WhereExpression.java b/soql/src/main/java/li/strolch/soql/core/expresssion/WhereExpression.java
similarity index 100%
rename from li.strolch.soql/src/main/java/li/strolch/soql/core/expresssion/WhereExpression.java
rename to soql/src/main/java/li/strolch/soql/core/expresssion/WhereExpression.java
diff --git a/li.strolch.soql/src/test/java/li/strolch/soql/core/BaseTest.java b/soql/src/test/java/li/strolch/soql/core/BaseTest.java
similarity index 100%
rename from li.strolch.soql/src/test/java/li/strolch/soql/core/BaseTest.java
rename to soql/src/test/java/li/strolch/soql/core/BaseTest.java
diff --git a/li.strolch.soql/src/test/java/li/strolch/soql/core/ComparisonExpressionTest.java b/soql/src/test/java/li/strolch/soql/core/ComparisonExpressionTest.java
similarity index 100%
rename from li.strolch.soql/src/test/java/li/strolch/soql/core/ComparisonExpressionTest.java
rename to soql/src/test/java/li/strolch/soql/core/ComparisonExpressionTest.java
diff --git a/li.strolch.soql/src/test/java/li/strolch/soql/core/DataStructureTest.java b/soql/src/test/java/li/strolch/soql/core/DataStructureTest.java
similarity index 100%
rename from li.strolch.soql/src/test/java/li/strolch/soql/core/DataStructureTest.java
rename to soql/src/test/java/li/strolch/soql/core/DataStructureTest.java
diff --git a/li.strolch.soql/src/test/java/li/strolch/soql/core/MethodExpressionTest.java b/soql/src/test/java/li/strolch/soql/core/MethodExpressionTest.java
similarity index 100%
rename from li.strolch.soql/src/test/java/li/strolch/soql/core/MethodExpressionTest.java
rename to soql/src/test/java/li/strolch/soql/core/MethodExpressionTest.java
diff --git a/li.strolch.soql/src/test/java/li/strolch/soql/core/QueryProcessorTest.java b/soql/src/test/java/li/strolch/soql/core/QueryProcessorTest.java
similarity index 100%
rename from li.strolch.soql/src/test/java/li/strolch/soql/core/QueryProcessorTest.java
rename to soql/src/test/java/li/strolch/soql/core/QueryProcessorTest.java
diff --git a/li.strolch.soql/src/test/java/li/strolch/soql/core/SerialisationTest.java b/soql/src/test/java/li/strolch/soql/core/SerialisationTest.java
similarity index 100%
rename from li.strolch.soql/src/test/java/li/strolch/soql/core/SerialisationTest.java
rename to soql/src/test/java/li/strolch/soql/core/SerialisationTest.java
diff --git a/li.strolch.soql/src/test/java/li/strolch/soql/core/StatementTest.java b/soql/src/test/java/li/strolch/soql/core/StatementTest.java
similarity index 100%
rename from li.strolch.soql/src/test/java/li/strolch/soql/core/StatementTest.java
rename to soql/src/test/java/li/strolch/soql/core/StatementTest.java
diff --git a/li.strolch.soql/.gitignore b/test-base/.gitignore
similarity index 100%
rename from li.strolch.soql/.gitignore
rename to test-base/.gitignore
diff --git a/li.strolch.service/LICENSE b/test-base/LICENSE
similarity index 100%
rename from li.strolch.service/LICENSE
rename to test-base/LICENSE
diff --git a/li.strolch.testbase/README.md b/test-base/README.md
similarity index 100%
rename from li.strolch.testbase/README.md
rename to test-base/README.md
diff --git a/li.strolch.testbase/pom.xml b/test-base/pom.xml
similarity index 86%
rename from li.strolch.testbase/pom.xml
rename to test-base/pom.xml
index b6a32fcee..118042daf 100644
--- a/li.strolch.testbase/pom.xml
+++ b/test-base/pom.xml
@@ -5,13 +5,13 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.testbase</artifactId>
-    <name>li.strolch.testbase</name>
+    <artifactId>test-base</artifactId>
+    <name>testbase</name>
     <description>runtime for Strolch</description>
     <inceptionYear>2011</inceptionYear>
 
@@ -33,11 +33,11 @@
         <!-- main -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
 
         <dependency>
diff --git a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/AbstractModelTest.java b/test-base/src/main/java/li/strolch/testbase/runtime/AbstractModelTest.java
similarity index 100%
rename from li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/AbstractModelTest.java
rename to test-base/src/main/java/li/strolch/testbase/runtime/AbstractModelTest.java
diff --git a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/ActivityModelTestRunner.java b/test-base/src/main/java/li/strolch/testbase/runtime/ActivityModelTestRunner.java
similarity index 100%
rename from li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/ActivityModelTestRunner.java
rename to test-base/src/main/java/li/strolch/testbase/runtime/ActivityModelTestRunner.java
diff --git a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/AuditModelTestRunner.java b/test-base/src/main/java/li/strolch/testbase/runtime/AuditModelTestRunner.java
similarity index 100%
rename from li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/AuditModelTestRunner.java
rename to test-base/src/main/java/li/strolch/testbase/runtime/AuditModelTestRunner.java
diff --git a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/LogMessagesTestRunner.java b/test-base/src/main/java/li/strolch/testbase/runtime/LogMessagesTestRunner.java
similarity index 100%
rename from li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/LogMessagesTestRunner.java
rename to test-base/src/main/java/li/strolch/testbase/runtime/LogMessagesTestRunner.java
diff --git a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/OrderModelTestRunner.java b/test-base/src/main/java/li/strolch/testbase/runtime/OrderModelTestRunner.java
similarity index 100%
rename from li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/OrderModelTestRunner.java
rename to test-base/src/main/java/li/strolch/testbase/runtime/OrderModelTestRunner.java
diff --git a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/ResourceModelTestRunner.java b/test-base/src/main/java/li/strolch/testbase/runtime/ResourceModelTestRunner.java
similarity index 100%
rename from li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/ResourceModelTestRunner.java
rename to test-base/src/main/java/li/strolch/testbase/runtime/ResourceModelTestRunner.java
diff --git a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/RuntimeMock.java b/test-base/src/main/java/li/strolch/testbase/runtime/RuntimeMock.java
similarity index 100%
rename from li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/RuntimeMock.java
rename to test-base/src/main/java/li/strolch/testbase/runtime/RuntimeMock.java
diff --git a/li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/VersioningTestRunner.java b/test-base/src/main/java/li/strolch/testbase/runtime/VersioningTestRunner.java
similarity index 100%
rename from li.strolch.testbase/src/main/java/li/strolch/testbase/runtime/VersioningTestRunner.java
rename to test-base/src/main/java/li/strolch/testbase/runtime/VersioningTestRunner.java
diff --git a/li.strolch.testbase/src/main/resources/li-strolch-testbase.properties b/test-base/src/main/resources/li-strolch-testbase.properties
similarity index 100%
rename from li.strolch.testbase/src/main/resources/li-strolch-testbase.properties
rename to test-base/src/main/resources/li-strolch-testbase.properties
diff --git a/li.strolch.performancetest/.gitignore b/test-performance/.gitignore
similarity index 100%
rename from li.strolch.performancetest/.gitignore
rename to test-performance/.gitignore
diff --git a/li.strolch.soql/LICENSE b/test-performance/LICENSE
similarity index 100%
rename from li.strolch.soql/LICENSE
rename to test-performance/LICENSE
diff --git a/li.strolch.performancetest/README.md b/test-performance/README.md
similarity index 100%
rename from li.strolch.performancetest/README.md
rename to test-performance/README.md
diff --git a/li.strolch.performancetest/pom.xml b/test-performance/pom.xml
similarity index 87%
rename from li.strolch.performancetest/pom.xml
rename to test-performance/pom.xml
index b399e061a..754d8a695 100644
--- a/li.strolch.performancetest/pom.xml
+++ b/test-performance/pom.xml
@@ -5,13 +5,13 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.performancetest</artifactId>
-    <name>li.strolch.performancetest</name>
+    <artifactId>test-performance</artifactId>
+    <name>performancetest</name>
     <description>Strolch project for running performance tests</description>
     <inceptionYear>2015</inceptionYear>
 
@@ -40,31 +40,31 @@
 
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.service</artifactId>
+            <artifactId>service</artifactId>
         </dependency>
 
         <!-- underlying DB -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.persistence.postgresql</artifactId>
+            <artifactId>persistence-postgresql</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.persistence.xml</artifactId>
+            <artifactId>persistence-xml</artifactId>
         </dependency>
 
         <!-- test -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
         </dependency>
 
         <dependency>
diff --git a/li.strolch.performancetest/src/assembly/bin.xml b/test-performance/src/assembly/bin.xml
similarity index 100%
rename from li.strolch.performancetest/src/assembly/bin.xml
rename to test-performance/src/assembly/bin.xml
diff --git a/li.strolch.performancetest/src/main/java/li/strolch/tutorialapp/postinitializer/PostInitializer.java b/test-performance/src/main/java/li/strolch/tutorialapp/postinitializer/PostInitializer.java
similarity index 100%
rename from li.strolch.performancetest/src/main/java/li/strolch/tutorialapp/postinitializer/PostInitializer.java
rename to test-performance/src/main/java/li/strolch/tutorialapp/postinitializer/PostInitializer.java
diff --git a/li.strolch.performancetest/src/main/resources/appVersion.properties b/test-performance/src/main/resources/appVersion.properties
similarity index 100%
rename from li.strolch.performancetest/src/main/resources/appVersion.properties
rename to test-performance/src/main/resources/appVersion.properties
diff --git a/li.strolch.performancetest/src/main/resources/logback.xml b/test-performance/src/main/resources/logback.xml
similarity index 100%
rename from li.strolch.performancetest/src/main/resources/logback.xml
rename to test-performance/src/main/resources/logback.xml
diff --git a/li.strolch.performancetest/src/main/scripts/startup.sh b/test-performance/src/main/scripts/startup.sh
similarity index 100%
rename from li.strolch.performancetest/src/main/scripts/startup.sh
rename to test-performance/src/main/scripts/startup.sh
diff --git a/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeConfig.xml b/test-performance/src/runtime_postgresql/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeConfig.xml
rename to test-performance/src/runtime_postgresql/config/PrivilegeConfig.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeRoles.xml b/test-performance/src/runtime_postgresql/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeRoles.xml
rename to test-performance/src/runtime_postgresql/config/PrivilegeRoles.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeUsers.xml b/test-performance/src/runtime_postgresql/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql/config/PrivilegeUsers.xml
rename to test-performance/src/runtime_postgresql/config/PrivilegeUsers.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql/config/StrolchConfiguration.xml b/test-performance/src/runtime_postgresql/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql/config/StrolchConfiguration.xml
rename to test-performance/src/runtime_postgresql/config/StrolchConfiguration.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeConfig.xml b/test-performance/src/runtime_postgresql_json/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeConfig.xml
rename to test-performance/src/runtime_postgresql_json/config/PrivilegeConfig.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeRoles.xml b/test-performance/src/runtime_postgresql_json/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeRoles.xml
rename to test-performance/src/runtime_postgresql_json/config/PrivilegeRoles.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeUsers.xml b/test-performance/src/runtime_postgresql_json/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql_json/config/PrivilegeUsers.xml
rename to test-performance/src/runtime_postgresql_json/config/PrivilegeUsers.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql_json/config/StrolchConfiguration.xml b/test-performance/src/runtime_postgresql_json/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql_json/config/StrolchConfiguration.xml
rename to test-performance/src/runtime_postgresql_json/config/StrolchConfiguration.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml b/test-performance/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml
rename to test-performance/src/runtime_postgresql_versioning/config/PrivilegeConfig.xml
diff --git a/li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeRoles.xml b/test-performance/src/runtime_postgresql_versioning/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.persistence.postgresql/src/test/resources/realmtest/config/PrivilegeRoles.xml
rename to test-performance/src/runtime_postgresql_versioning/config/PrivilegeRoles.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeUsers.xml b/test-performance/src/runtime_postgresql_versioning/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql_versioning/config/PrivilegeUsers.xml
rename to test-performance/src/runtime_postgresql_versioning/config/PrivilegeUsers.xml
diff --git a/li.strolch.performancetest/src/runtime_postgresql_versioning/config/StrolchConfiguration.xml b/test-performance/src/runtime_postgresql_versioning/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_postgresql_versioning/config/StrolchConfiguration.xml
rename to test-performance/src/runtime_postgresql_versioning/config/StrolchConfiguration.xml
diff --git a/li.strolch.performancetest/src/runtime_transient/config/PrivilegeConfig.xml b/test-performance/src/runtime_transient/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_transient/config/PrivilegeConfig.xml
rename to test-performance/src/runtime_transient/config/PrivilegeConfig.xml
diff --git a/li.strolch.performancetest/src/runtime_transient/config/PrivilegeRoles.xml b/test-performance/src/runtime_transient/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_transient/config/PrivilegeRoles.xml
rename to test-performance/src/runtime_transient/config/PrivilegeRoles.xml
diff --git a/li.strolch.performancetest/src/runtime_transient/config/PrivilegeUsers.xml b/test-performance/src/runtime_transient/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_transient/config/PrivilegeUsers.xml
rename to test-performance/src/runtime_transient/config/PrivilegeUsers.xml
diff --git a/li.strolch.performancetest/src/runtime_transient/config/StrolchConfiguration.xml b/test-performance/src/runtime_transient/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_transient/config/StrolchConfiguration.xml
rename to test-performance/src/runtime_transient/config/StrolchConfiguration.xml
diff --git a/li.strolch.performancetest/src/runtime_xml/config/PrivilegeConfig.xml b/test-performance/src/runtime_xml/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_xml/config/PrivilegeConfig.xml
rename to test-performance/src/runtime_xml/config/PrivilegeConfig.xml
diff --git a/li.strolch.performancetest/src/runtime_xml/config/PrivilegeRoles.xml b/test-performance/src/runtime_xml/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_xml/config/PrivilegeRoles.xml
rename to test-performance/src/runtime_xml/config/PrivilegeRoles.xml
diff --git a/li.strolch.performancetest/src/runtime_xml/config/PrivilegeUsers.xml b/test-performance/src/runtime_xml/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_xml/config/PrivilegeUsers.xml
rename to test-performance/src/runtime_xml/config/PrivilegeUsers.xml
diff --git a/li.strolch.performancetest/src/runtime_xml/config/StrolchConfiguration.xml b/test-performance/src/runtime_xml/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.performancetest/src/runtime_xml/config/StrolchConfiguration.xml
rename to test-performance/src/runtime_xml/config/StrolchConfiguration.xml
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformancePostgreSqlJsonTest.java b/test-performance/src/test/java/li/strolch/performance/PerformancePostgreSqlJsonTest.java
similarity index 100%
rename from li.strolch.performancetest/src/test/java/li/strolch/performance/PerformancePostgreSqlJsonTest.java
rename to test-performance/src/test/java/li/strolch/performance/PerformancePostgreSqlJsonTest.java
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformancePostgreSqlTest.java b/test-performance/src/test/java/li/strolch/performance/PerformancePostgreSqlTest.java
similarity index 100%
rename from li.strolch.performancetest/src/test/java/li/strolch/performance/PerformancePostgreSqlTest.java
rename to test-performance/src/test/java/li/strolch/performance/PerformancePostgreSqlTest.java
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformancePostgreVersioningSqlTest.java b/test-performance/src/test/java/li/strolch/performance/PerformancePostgreVersioningSqlTest.java
similarity index 100%
rename from li.strolch.performancetest/src/test/java/li/strolch/performance/PerformancePostgreVersioningSqlTest.java
rename to test-performance/src/test/java/li/strolch/performance/PerformancePostgreVersioningSqlTest.java
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTest.java b/test-performance/src/test/java/li/strolch/performance/PerformanceTest.java
similarity index 100%
rename from li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTest.java
rename to test-performance/src/test/java/li/strolch/performance/PerformanceTest.java
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTestArgument.java b/test-performance/src/test/java/li/strolch/performance/PerformanceTestArgument.java
similarity index 100%
rename from li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTestArgument.java
rename to test-performance/src/test/java/li/strolch/performance/PerformanceTestArgument.java
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTestResult.java b/test-performance/src/test/java/li/strolch/performance/PerformanceTestResult.java
similarity index 100%
rename from li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTestResult.java
rename to test-performance/src/test/java/li/strolch/performance/PerformanceTestResult.java
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTestService.java b/test-performance/src/test/java/li/strolch/performance/PerformanceTestService.java
similarity index 100%
rename from li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTestService.java
rename to test-performance/src/test/java/li/strolch/performance/PerformanceTestService.java
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTransientTest.java b/test-performance/src/test/java/li/strolch/performance/PerformanceTransientTest.java
similarity index 100%
rename from li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceTransientTest.java
rename to test-performance/src/test/java/li/strolch/performance/PerformanceTransientTest.java
diff --git a/li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceXmlTest.java b/test-performance/src/test/java/li/strolch/performance/PerformanceXmlTest.java
similarity index 100%
rename from li.strolch.performancetest/src/test/java/li/strolch/performance/PerformanceXmlTest.java
rename to test-performance/src/test/java/li/strolch/performance/PerformanceXmlTest.java
diff --git a/li.strolch.testbase/.gitignore b/utils/.gitignore
similarity index 100%
rename from li.strolch.testbase/.gitignore
rename to utils/.gitignore
diff --git a/li.strolch.testbase/LICENSE b/utils/LICENSE
similarity index 100%
rename from li.strolch.testbase/LICENSE
rename to utils/LICENSE
diff --git a/li.strolch.utils/README.md b/utils/README.md
similarity index 100%
rename from li.strolch.utils/README.md
rename to utils/README.md
diff --git a/li.strolch.utils/pom.xml b/utils/pom.xml
similarity index 93%
rename from li.strolch.utils/pom.xml
rename to utils/pom.xml
index 3bb7af818..38ed3d425 100644
--- a/li.strolch.utils/pom.xml
+++ b/utils/pom.xml
@@ -5,14 +5,14 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.utils</artifactId>
+    <artifactId>utils</artifactId>
     <packaging>jar</packaging>
-    <name>li.strolch.utils</name>
+    <name>utils</name>
     <description>These utils contain project independent helper classes and utilities for reuse</description>
     <inceptionYear>2011</inceptionYear>
 
diff --git a/li.strolch.utils/src/main/java/javanet/staxutils/Indentation.java b/utils/src/main/java/javanet/staxutils/Indentation.java
similarity index 100%
rename from li.strolch.utils/src/main/java/javanet/staxutils/Indentation.java
rename to utils/src/main/java/javanet/staxutils/Indentation.java
diff --git a/li.strolch.utils/src/main/java/javanet/staxutils/IndentingXMLStreamWriter.java b/utils/src/main/java/javanet/staxutils/IndentingXMLStreamWriter.java
similarity index 100%
rename from li.strolch.utils/src/main/java/javanet/staxutils/IndentingXMLStreamWriter.java
rename to utils/src/main/java/javanet/staxutils/IndentingXMLStreamWriter.java
diff --git a/li.strolch.utils/src/main/java/javanet/staxutils/helpers/StreamWriterDelegate.java b/utils/src/main/java/javanet/staxutils/helpers/StreamWriterDelegate.java
similarity index 100%
rename from li.strolch.utils/src/main/java/javanet/staxutils/helpers/StreamWriterDelegate.java
rename to utils/src/main/java/javanet/staxutils/helpers/StreamWriterDelegate.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/db/DbConnectionCheck.java b/utils/src/main/java/li/strolch/db/DbConnectionCheck.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/db/DbConnectionCheck.java
rename to utils/src/main/java/li/strolch/db/DbConnectionCheck.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/db/DbConstants.java b/utils/src/main/java/li/strolch/db/DbConstants.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/db/DbConstants.java
rename to utils/src/main/java/li/strolch/db/DbConstants.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/db/DbDataSourceBuilder.java b/utils/src/main/java/li/strolch/db/DbDataSourceBuilder.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/db/DbDataSourceBuilder.java
rename to utils/src/main/java/li/strolch/db/DbDataSourceBuilder.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/db/DbException.java b/utils/src/main/java/li/strolch/db/DbException.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/db/DbException.java
rename to utils/src/main/java/li/strolch/db/DbException.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/db/DbMigrationState.java b/utils/src/main/java/li/strolch/db/DbMigrationState.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/db/DbMigrationState.java
rename to utils/src/main/java/li/strolch/db/DbMigrationState.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/db/DbSchemaVersionCheck.java b/utils/src/main/java/li/strolch/db/DbSchemaVersionCheck.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/db/DbSchemaVersionCheck.java
rename to utils/src/main/java/li/strolch/db/DbSchemaVersionCheck.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/fileserver/FileClient.java b/utils/src/main/java/li/strolch/fileserver/FileClient.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/fileserver/FileClient.java
rename to utils/src/main/java/li/strolch/fileserver/FileClient.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/fileserver/FileClientUtil.java b/utils/src/main/java/li/strolch/fileserver/FileClientUtil.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/fileserver/FileClientUtil.java
rename to utils/src/main/java/li/strolch/fileserver/FileClientUtil.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/fileserver/FileDeletion.java b/utils/src/main/java/li/strolch/fileserver/FileDeletion.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/fileserver/FileDeletion.java
rename to utils/src/main/java/li/strolch/fileserver/FileDeletion.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/fileserver/FileHandler.java b/utils/src/main/java/li/strolch/fileserver/FileHandler.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/fileserver/FileHandler.java
rename to utils/src/main/java/li/strolch/fileserver/FileHandler.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/fileserver/FilePart.java b/utils/src/main/java/li/strolch/fileserver/FilePart.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/fileserver/FilePart.java
rename to utils/src/main/java/li/strolch/fileserver/FilePart.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/CheckedBiConsumer.java b/utils/src/main/java/li/strolch/utils/CheckedBiConsumer.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/CheckedBiConsumer.java
rename to utils/src/main/java/li/strolch/utils/CheckedBiConsumer.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/CheckedBiFunction.java b/utils/src/main/java/li/strolch/utils/CheckedBiFunction.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/CheckedBiFunction.java
rename to utils/src/main/java/li/strolch/utils/CheckedBiFunction.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/CheckedConsumer.java b/utils/src/main/java/li/strolch/utils/CheckedConsumer.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/CheckedConsumer.java
rename to utils/src/main/java/li/strolch/utils/CheckedConsumer.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/CheckedFunction.java b/utils/src/main/java/li/strolch/utils/CheckedFunction.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/CheckedFunction.java
rename to utils/src/main/java/li/strolch/utils/CheckedFunction.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/CheckedPredicate.java b/utils/src/main/java/li/strolch/utils/CheckedPredicate.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/CheckedPredicate.java
rename to utils/src/main/java/li/strolch/utils/CheckedPredicate.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/CheckedRunnable.java b/utils/src/main/java/li/strolch/utils/CheckedRunnable.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/CheckedRunnable.java
rename to utils/src/main/java/li/strolch/utils/CheckedRunnable.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/CheckedSupplier.java b/utils/src/main/java/li/strolch/utils/CheckedSupplier.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/CheckedSupplier.java
rename to utils/src/main/java/li/strolch/utils/CheckedSupplier.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/CodeGenerator.java b/utils/src/main/java/li/strolch/utils/CodeGenerator.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/CodeGenerator.java
rename to utils/src/main/java/li/strolch/utils/CodeGenerator.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/Crc.java b/utils/src/main/java/li/strolch/utils/Crc.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/Crc.java
rename to utils/src/main/java/li/strolch/utils/Crc.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/DataUnit.java b/utils/src/main/java/li/strolch/utils/DataUnit.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/DataUnit.java
rename to utils/src/main/java/li/strolch/utils/DataUnit.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/EmptyConsumer.java b/utils/src/main/java/li/strolch/utils/EmptyConsumer.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/EmptyConsumer.java
rename to utils/src/main/java/li/strolch/utils/EmptyConsumer.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/ExecutorPool.java b/utils/src/main/java/li/strolch/utils/ExecutorPool.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/ExecutorPool.java
rename to utils/src/main/java/li/strolch/utils/ExecutorPool.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/I18nMessage.java b/utils/src/main/java/li/strolch/utils/I18nMessage.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/I18nMessage.java
rename to utils/src/main/java/li/strolch/utils/I18nMessage.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/I18nMessageVisitor.java b/utils/src/main/java/li/strolch/utils/I18nMessageVisitor.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/I18nMessageVisitor.java
rename to utils/src/main/java/li/strolch/utils/I18nMessageVisitor.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/I18nUtils.java b/utils/src/main/java/li/strolch/utils/I18nUtils.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/I18nUtils.java
rename to utils/src/main/java/li/strolch/utils/I18nUtils.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/NamedThreadPoolFactory.java b/utils/src/main/java/li/strolch/utils/NamedThreadPoolFactory.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/NamedThreadPoolFactory.java
rename to utils/src/main/java/li/strolch/utils/NamedThreadPoolFactory.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/ObjectHelper.java b/utils/src/main/java/li/strolch/utils/ObjectHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/ObjectHelper.java
rename to utils/src/main/java/li/strolch/utils/ObjectHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/RemoveCRFilterWriter.java b/utils/src/main/java/li/strolch/utils/RemoveCRFilterWriter.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/RemoveCRFilterWriter.java
rename to utils/src/main/java/li/strolch/utils/RemoveCRFilterWriter.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/RoundRobinInt.java b/utils/src/main/java/li/strolch/utils/RoundRobinInt.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/RoundRobinInt.java
rename to utils/src/main/java/li/strolch/utils/RoundRobinInt.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/SimpleGs1.java b/utils/src/main/java/li/strolch/utils/SimpleGs1.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/SimpleGs1.java
rename to utils/src/main/java/li/strolch/utils/SimpleGs1.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/SmtpMailer.java b/utils/src/main/java/li/strolch/utils/SmtpMailer.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/SmtpMailer.java
rename to utils/src/main/java/li/strolch/utils/SmtpMailer.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/StringMatchMode.java b/utils/src/main/java/li/strolch/utils/StringMatchMode.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/StringMatchMode.java
rename to utils/src/main/java/li/strolch/utils/StringMatchMode.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/ThreadHelper.java b/utils/src/main/java/li/strolch/utils/ThreadHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/ThreadHelper.java
rename to utils/src/main/java/li/strolch/utils/ThreadHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/ThrowingConsumer.java b/utils/src/main/java/li/strolch/utils/ThrowingConsumer.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/ThrowingConsumer.java
rename to utils/src/main/java/li/strolch/utils/ThrowingConsumer.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/ThrowingFunction.java b/utils/src/main/java/li/strolch/utils/ThrowingFunction.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/ThrowingFunction.java
rename to utils/src/main/java/li/strolch/utils/ThrowingFunction.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/ThrowingPredicate.java b/utils/src/main/java/li/strolch/utils/ThrowingPredicate.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/ThrowingPredicate.java
rename to utils/src/main/java/li/strolch/utils/ThrowingPredicate.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/ThrowingSupplier.java b/utils/src/main/java/li/strolch/utils/ThrowingSupplier.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/ThrowingSupplier.java
rename to utils/src/main/java/li/strolch/utils/ThrowingSupplier.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/UTF8Control.java b/utils/src/main/java/li/strolch/utils/UTF8Control.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/UTF8Control.java
rename to utils/src/main/java/li/strolch/utils/UTF8Control.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/Version.java b/utils/src/main/java/li/strolch/utils/Version.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/Version.java
rename to utils/src/main/java/li/strolch/utils/Version.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/CollectionsHelper.java b/utils/src/main/java/li/strolch/utils/collections/CollectionsHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/CollectionsHelper.java
rename to utils/src/main/java/li/strolch/utils/collections/CollectionsHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/DateRange.java b/utils/src/main/java/li/strolch/utils/collections/DateRange.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/DateRange.java
rename to utils/src/main/java/li/strolch/utils/collections/DateRange.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/DefaultedHashMap.java b/utils/src/main/java/li/strolch/utils/collections/DefaultedHashMap.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/DefaultedHashMap.java
rename to utils/src/main/java/li/strolch/utils/collections/DefaultedHashMap.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/FixedSizeQueue.java b/utils/src/main/java/li/strolch/utils/collections/FixedSizeQueue.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/FixedSizeQueue.java
rename to utils/src/main/java/li/strolch/utils/collections/FixedSizeQueue.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfLists.java b/utils/src/main/java/li/strolch/utils/collections/MapOfLists.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfLists.java
rename to utils/src/main/java/li/strolch/utils/collections/MapOfLists.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfMaps.java b/utils/src/main/java/li/strolch/utils/collections/MapOfMaps.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfMaps.java
rename to utils/src/main/java/li/strolch/utils/collections/MapOfMaps.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfSets.java b/utils/src/main/java/li/strolch/utils/collections/MapOfSets.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfSets.java
rename to utils/src/main/java/li/strolch/utils/collections/MapOfSets.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/Paging.java b/utils/src/main/java/li/strolch/utils/collections/Paging.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/Paging.java
rename to utils/src/main/java/li/strolch/utils/collections/Paging.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/SynchronizedCollections.java b/utils/src/main/java/li/strolch/utils/collections/SynchronizedCollections.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/SynchronizedCollections.java
rename to utils/src/main/java/li/strolch/utils/collections/SynchronizedCollections.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/Tuple.java b/utils/src/main/java/li/strolch/utils/collections/Tuple.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/Tuple.java
rename to utils/src/main/java/li/strolch/utils/collections/Tuple.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/TypedTuple.java b/utils/src/main/java/li/strolch/utils/collections/TypedTuple.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/collections/TypedTuple.java
rename to utils/src/main/java/li/strolch/utils/collections/TypedTuple.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/communication/Packet.java b/utils/src/main/java/li/strolch/utils/communication/Packet.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/communication/Packet.java
rename to utils/src/main/java/li/strolch/utils/communication/Packet.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/communication/PacketObserver.java b/utils/src/main/java/li/strolch/utils/communication/PacketObserver.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/communication/PacketObserver.java
rename to utils/src/main/java/li/strolch/utils/communication/PacketObserver.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/communication/PacketState.java b/utils/src/main/java/li/strolch/utils/communication/PacketState.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/communication/PacketState.java
rename to utils/src/main/java/li/strolch/utils/communication/PacketState.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/dbc/DBC.java b/utils/src/main/java/li/strolch/utils/dbc/DBC.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/dbc/DBC.java
rename to utils/src/main/java/li/strolch/utils/dbc/DBC.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/exceptions/XmlException.java b/utils/src/main/java/li/strolch/utils/exceptions/XmlException.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/exceptions/XmlException.java
rename to utils/src/main/java/li/strolch/utils/exceptions/XmlException.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/AesCryptoHelper.java b/utils/src/main/java/li/strolch/utils/helper/AesCryptoHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/AesCryptoHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/AesCryptoHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/ArraysHelper.java b/utils/src/main/java/li/strolch/utils/helper/ArraysHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/ArraysHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/ArraysHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/AsciiHelper.java b/utils/src/main/java/li/strolch/utils/helper/AsciiHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/AsciiHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/AsciiHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/BaseEncoding.java b/utils/src/main/java/li/strolch/utils/helper/BaseEncoding.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/BaseEncoding.java
rename to utils/src/main/java/li/strolch/utils/helper/BaseEncoding.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/ByteHelper.java b/utils/src/main/java/li/strolch/utils/helper/ByteHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/ByteHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/ByteHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/ClassHelper.java b/utils/src/main/java/li/strolch/utils/helper/ClassHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/ClassHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/ClassHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/DateHelper.java b/utils/src/main/java/li/strolch/utils/helper/DateHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/DateHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/DateHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/DomUtil.java b/utils/src/main/java/li/strolch/utils/helper/DomUtil.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/DomUtil.java
rename to utils/src/main/java/li/strolch/utils/helper/DomUtil.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/ExceptionHelper.java b/utils/src/main/java/li/strolch/utils/helper/ExceptionHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/ExceptionHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/ExceptionHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/FileHelper.java b/utils/src/main/java/li/strolch/utils/helper/FileHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/FileHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/FileHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/MathHelper.java b/utils/src/main/java/li/strolch/utils/helper/MathHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/MathHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/MathHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/NetworkHelper.java b/utils/src/main/java/li/strolch/utils/helper/NetworkHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/NetworkHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/NetworkHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/ProcessHelper.java b/utils/src/main/java/li/strolch/utils/helper/ProcessHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/ProcessHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/ProcessHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/PropertiesHelper.java b/utils/src/main/java/li/strolch/utils/helper/PropertiesHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/PropertiesHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/PropertiesHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/StringHelper.java b/utils/src/main/java/li/strolch/utils/helper/StringHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/StringHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/StringHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/SystemHelper.java b/utils/src/main/java/li/strolch/utils/helper/SystemHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/SystemHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/SystemHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/TempFileOptions.java b/utils/src/main/java/li/strolch/utils/helper/TempFileOptions.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/TempFileOptions.java
rename to utils/src/main/java/li/strolch/utils/helper/TempFileOptions.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/TexHelper.java b/utils/src/main/java/li/strolch/utils/helper/TexHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/TexHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/TexHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/XmlDomSigner.java b/utils/src/main/java/li/strolch/utils/helper/XmlDomSigner.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/XmlDomSigner.java
rename to utils/src/main/java/li/strolch/utils/helper/XmlDomSigner.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/helper/XmlHelper.java b/utils/src/main/java/li/strolch/utils/helper/XmlHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/helper/XmlHelper.java
rename to utils/src/main/java/li/strolch/utils/helper/XmlHelper.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/io/FileProgressListener.java b/utils/src/main/java/li/strolch/utils/io/FileProgressListener.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/io/FileProgressListener.java
rename to utils/src/main/java/li/strolch/utils/io/FileProgressListener.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/io/FileStreamProgressWatcher.java b/utils/src/main/java/li/strolch/utils/io/FileStreamProgressWatcher.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/io/FileStreamProgressWatcher.java
rename to utils/src/main/java/li/strolch/utils/io/FileStreamProgressWatcher.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/io/LoggingFileProgressListener.java b/utils/src/main/java/li/strolch/utils/io/LoggingFileProgressListener.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/io/LoggingFileProgressListener.java
rename to utils/src/main/java/li/strolch/utils/io/LoggingFileProgressListener.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/io/ProgressableFileInputStream.java b/utils/src/main/java/li/strolch/utils/io/ProgressableFileInputStream.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/io/ProgressableFileInputStream.java
rename to utils/src/main/java/li/strolch/utils/io/ProgressableFileInputStream.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/iso8601/DateFormat.java b/utils/src/main/java/li/strolch/utils/iso8601/DateFormat.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/iso8601/DateFormat.java
rename to utils/src/main/java/li/strolch/utils/iso8601/DateFormat.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/iso8601/FormatFactory.java b/utils/src/main/java/li/strolch/utils/iso8601/FormatFactory.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/iso8601/FormatFactory.java
rename to utils/src/main/java/li/strolch/utils/iso8601/FormatFactory.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/iso8601/ISO8601.java b/utils/src/main/java/li/strolch/utils/iso8601/ISO8601.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/iso8601/ISO8601.java
rename to utils/src/main/java/li/strolch/utils/iso8601/ISO8601.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/iso8601/ISO8601FormatFactory.java b/utils/src/main/java/li/strolch/utils/iso8601/ISO8601FormatFactory.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/iso8601/ISO8601FormatFactory.java
rename to utils/src/main/java/li/strolch/utils/iso8601/ISO8601FormatFactory.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/iso8601/WorktimeFormat.java b/utils/src/main/java/li/strolch/utils/iso8601/WorktimeFormat.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/iso8601/WorktimeFormat.java
rename to utils/src/main/java/li/strolch/utils/iso8601/WorktimeFormat.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/objectfilter/ObjectCache.java b/utils/src/main/java/li/strolch/utils/objectfilter/ObjectCache.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/objectfilter/ObjectCache.java
rename to utils/src/main/java/li/strolch/utils/objectfilter/ObjectCache.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/objectfilter/ObjectFilter.java b/utils/src/main/java/li/strolch/utils/objectfilter/ObjectFilter.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/objectfilter/ObjectFilter.java
rename to utils/src/main/java/li/strolch/utils/objectfilter/ObjectFilter.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/objectfilter/Operation.java b/utils/src/main/java/li/strolch/utils/objectfilter/Operation.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/objectfilter/Operation.java
rename to utils/src/main/java/li/strolch/utils/objectfilter/Operation.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/time/Interval.java b/utils/src/main/java/li/strolch/utils/time/Interval.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/time/Interval.java
rename to utils/src/main/java/li/strolch/utils/time/Interval.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodDuration.java b/utils/src/main/java/li/strolch/utils/time/PeriodDuration.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodDuration.java
rename to utils/src/main/java/li/strolch/utils/time/PeriodDuration.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodDurationFormatter.java b/utils/src/main/java/li/strolch/utils/time/PeriodDurationFormatter.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodDurationFormatter.java
rename to utils/src/main/java/li/strolch/utils/time/PeriodDurationFormatter.java
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java b/utils/src/main/java/li/strolch/utils/time/PeriodHelper.java
similarity index 100%
rename from li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java
rename to utils/src/main/java/li/strolch/utils/time/PeriodHelper.java
diff --git a/li.strolch.utils/src/main/resources/strolch-utils.properties b/utils/src/main/resources/strolch-utils.properties
similarity index 100%
rename from li.strolch.utils/src/main/resources/strolch-utils.properties
rename to utils/src/main/resources/strolch-utils.properties
diff --git a/li.strolch.utils/src/main/resources/strolch-utils_de.properties b/utils/src/main/resources/strolch-utils_de.properties
similarity index 100%
rename from li.strolch.utils/src/main/resources/strolch-utils_de.properties
rename to utils/src/main/resources/strolch-utils_de.properties
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/CodeGeneratorTest.java b/utils/src/test/java/li/strolch/utils/CodeGeneratorTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/CodeGeneratorTest.java
rename to utils/src/test/java/li/strolch/utils/CodeGeneratorTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/Crc16Test.java b/utils/src/test/java/li/strolch/utils/Crc16Test.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/Crc16Test.java
rename to utils/src/test/java/li/strolch/utils/Crc16Test.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/RoundRobinIntTest.java b/utils/src/test/java/li/strolch/utils/RoundRobinIntTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/RoundRobinIntTest.java
rename to utils/src/test/java/li/strolch/utils/RoundRobinIntTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/StringMatchModeTest.java b/utils/src/test/java/li/strolch/utils/StringMatchModeTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/StringMatchModeTest.java
rename to utils/src/test/java/li/strolch/utils/StringMatchModeTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/VersionTest.java b/utils/src/test/java/li/strolch/utils/VersionTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/VersionTest.java
rename to utils/src/test/java/li/strolch/utils/VersionTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/collections/DateRangeTest.java b/utils/src/test/java/li/strolch/utils/collections/DateRangeTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/collections/DateRangeTest.java
rename to utils/src/test/java/li/strolch/utils/collections/DateRangeTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/collections/DefaultedHashMapTest.java b/utils/src/test/java/li/strolch/utils/collections/DefaultedHashMapTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/collections/DefaultedHashMapTest.java
rename to utils/src/test/java/li/strolch/utils/collections/DefaultedHashMapTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/collections/MapOfTest.java b/utils/src/test/java/li/strolch/utils/collections/MapOfTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/collections/MapOfTest.java
rename to utils/src/test/java/li/strolch/utils/collections/MapOfTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/collections/PagingTest.java b/utils/src/test/java/li/strolch/utils/collections/PagingTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/collections/PagingTest.java
rename to utils/src/test/java/li/strolch/utils/collections/PagingTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfListsTest.java b/utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfListsTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfListsTest.java
rename to utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfListsTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfMapsTest.java b/utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfMapsTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfMapsTest.java
rename to utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfMapsTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfSetsTest.java b/utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfSetsTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfSetsTest.java
rename to utils/src/test/java/li/strolch/utils/collections/SynchronizedMapOfSetsTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/dbc/DBCTest.java b/utils/src/test/java/li/strolch/utils/dbc/DBCTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/dbc/DBCTest.java
rename to utils/src/test/java/li/strolch/utils/dbc/DBCTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/AesCryptoHelperTest.java b/utils/src/test/java/li/strolch/utils/helper/AesCryptoHelperTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/AesCryptoHelperTest.java
rename to utils/src/test/java/li/strolch/utils/helper/AesCryptoHelperTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/BaseDecodingTest.java b/utils/src/test/java/li/strolch/utils/helper/BaseDecodingTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/BaseDecodingTest.java
rename to utils/src/test/java/li/strolch/utils/helper/BaseDecodingTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/BaseEncodingTest.java b/utils/src/test/java/li/strolch/utils/helper/BaseEncodingTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/BaseEncodingTest.java
rename to utils/src/test/java/li/strolch/utils/helper/BaseEncodingTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/DateHelperTest.java b/utils/src/test/java/li/strolch/utils/helper/DateHelperTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/DateHelperTest.java
rename to utils/src/test/java/li/strolch/utils/helper/DateHelperTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/ExceptionHelperTest.java b/utils/src/test/java/li/strolch/utils/helper/ExceptionHelperTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/ExceptionHelperTest.java
rename to utils/src/test/java/li/strolch/utils/helper/ExceptionHelperTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/FileHelperTest.java b/utils/src/test/java/li/strolch/utils/helper/FileHelperTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/FileHelperTest.java
rename to utils/src/test/java/li/strolch/utils/helper/FileHelperTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/GenerateReverseBaseEncodingAlphabets.java b/utils/src/test/java/li/strolch/utils/helper/GenerateReverseBaseEncodingAlphabets.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/GenerateReverseBaseEncodingAlphabets.java
rename to utils/src/test/java/li/strolch/utils/helper/GenerateReverseBaseEncodingAlphabets.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/ReplacePropertiesInTest.java b/utils/src/test/java/li/strolch/utils/helper/ReplacePropertiesInTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/ReplacePropertiesInTest.java
rename to utils/src/test/java/li/strolch/utils/helper/ReplacePropertiesInTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/TexHelperTest.java b/utils/src/test/java/li/strolch/utils/helper/TexHelperTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/TexHelperTest.java
rename to utils/src/test/java/li/strolch/utils/helper/TexHelperTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/helper/XmlSignHelperTest.java b/utils/src/test/java/li/strolch/utils/helper/XmlSignHelperTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/helper/XmlSignHelperTest.java
rename to utils/src/test/java/li/strolch/utils/helper/XmlSignHelperTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/objectfilter/ObjectFilterTest.java b/utils/src/test/java/li/strolch/utils/objectfilter/ObjectFilterTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/objectfilter/ObjectFilterTest.java
rename to utils/src/test/java/li/strolch/utils/objectfilter/ObjectFilterTest.java
diff --git a/li.strolch.utils/src/test/java/li/strolch/utils/time/PeriodHelperTest.java b/utils/src/test/java/li/strolch/utils/time/PeriodHelperTest.java
similarity index 100%
rename from li.strolch.utils/src/test/java/li/strolch/utils/time/PeriodHelperTest.java
rename to utils/src/test/java/li/strolch/utils/time/PeriodHelperTest.java
diff --git a/li.strolch.utils/src/test/resources/SignedXmlFile.xml b/utils/src/test/resources/SignedXmlFile.xml
similarity index 100%
rename from li.strolch.utils/src/test/resources/SignedXmlFile.xml
rename to utils/src/test/resources/SignedXmlFile.xml
diff --git a/li.strolch.utils/src/test/resources/SignedXmlFileWithNamespaces.xml b/utils/src/test/resources/SignedXmlFileWithNamespaces.xml
similarity index 100%
rename from li.strolch.utils/src/test/resources/SignedXmlFileWithNamespaces.xml
rename to utils/src/test/resources/SignedXmlFileWithNamespaces.xml
diff --git a/li.strolch.utils/src/test/resources/UtilsTest.properties b/utils/src/test/resources/UtilsTest.properties
similarity index 100%
rename from li.strolch.utils/src/test/resources/UtilsTest.properties
rename to utils/src/test/resources/UtilsTest.properties
diff --git a/li.strolch.utils/src/test/resources/crypto_test_image.ico b/utils/src/test/resources/crypto_test_image.ico
similarity index 100%
rename from li.strolch.utils/src/test/resources/crypto_test_image.ico
rename to utils/src/test/resources/crypto_test_image.ico
diff --git a/li.strolch.utils/src/test/resources/crypto_test_long.txt b/utils/src/test/resources/crypto_test_long.txt
similarity index 100%
rename from li.strolch.utils/src/test/resources/crypto_test_long.txt
rename to utils/src/test/resources/crypto_test_long.txt
diff --git a/li.strolch.utils/src/test/resources/crypto_test_middle.txt b/utils/src/test/resources/crypto_test_middle.txt
similarity index 100%
rename from li.strolch.utils/src/test/resources/crypto_test_middle.txt
rename to utils/src/test/resources/crypto_test_middle.txt
diff --git a/li.strolch.utils/src/test/resources/crypto_test_short.txt b/utils/src/test/resources/crypto_test_short.txt
similarity index 100%
rename from li.strolch.utils/src/test/resources/crypto_test_short.txt
rename to utils/src/test/resources/crypto_test_short.txt
diff --git a/li.strolch.service/src/test/resources/logback.xml b/utils/src/test/resources/logback.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/logback.xml
rename to utils/src/test/resources/logback.xml
diff --git a/li.strolch.utils/src/test/resources/test.jks b/utils/src/test/resources/test.jks
similarity index 100%
rename from li.strolch.utils/src/test/resources/test.jks
rename to utils/src/test/resources/test.jks
diff --git a/li.strolch.utils/src/test/resources/test_data.csv b/utils/src/test/resources/test_data.csv
similarity index 100%
rename from li.strolch.utils/src/test/resources/test_data.csv
rename to utils/src/test/resources/test_data.csv
diff --git a/li.strolch.utils/src/test/resources/tex.tpl b/utils/src/test/resources/tex.tpl
similarity index 100%
rename from li.strolch.utils/src/test/resources/tex.tpl
rename to utils/src/test/resources/tex.tpl
diff --git a/li.strolch.utils/.gitignore b/web-rest/.gitignore
similarity index 100%
rename from li.strolch.utils/.gitignore
rename to web-rest/.gitignore
diff --git a/li.strolch.utils/LICENSE b/web-rest/LICENSE
similarity index 100%
rename from li.strolch.utils/LICENSE
rename to web-rest/LICENSE
diff --git a/li.strolch.rest/README.md b/web-rest/README.md
similarity index 100%
rename from li.strolch.rest/README.md
rename to web-rest/README.md
diff --git a/li.strolch.rest/pom.xml b/web-rest/pom.xml
similarity index 92%
rename from li.strolch.rest/pom.xml
rename to web-rest/pom.xml
index c712d7892..799d84b6a 100644
--- a/li.strolch.rest/pom.xml
+++ b/web-rest/pom.xml
@@ -5,13 +5,13 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.rest</artifactId>
-    <name>li.strolch.rest</name>
+    <artifactId>web-rest</artifactId>
+    <name>web-rest</name>
     <description>Restful Web Service API for Strolch</description>
     <inceptionYear>2011</inceptionYear>
 
@@ -37,19 +37,19 @@
         <!-- main -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.service</artifactId>
+            <artifactId>service</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.soql</artifactId>
+            <artifactId>soql</artifactId>
         </dependency>
 
         <dependency>
@@ -106,7 +106,7 @@
         <!-- test -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/DefaultStrolchSessionHandler.java b/web-rest/src/main/java/li/strolch/rest/DefaultStrolchSessionHandler.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/DefaultStrolchSessionHandler.java
rename to web-rest/src/main/java/li/strolch/rest/DefaultStrolchSessionHandler.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/RestfulStrolchComponent.java b/web-rest/src/main/java/li/strolch/rest/RestfulStrolchComponent.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/RestfulStrolchComponent.java
rename to web-rest/src/main/java/li/strolch/rest/RestfulStrolchComponent.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/StrolchRestfulClasses.java b/web-rest/src/main/java/li/strolch/rest/StrolchRestfulClasses.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/StrolchRestfulClasses.java
rename to web-rest/src/main/java/li/strolch/rest/StrolchRestfulClasses.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/StrolchRestfulConstants.java b/web-rest/src/main/java/li/strolch/rest/StrolchRestfulConstants.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/StrolchRestfulConstants.java
rename to web-rest/src/main/java/li/strolch/rest/StrolchRestfulConstants.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/StrolchRestfulExceptionMapper.java b/web-rest/src/main/java/li/strolch/rest/StrolchRestfulExceptionMapper.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/StrolchRestfulExceptionMapper.java
rename to web-rest/src/main/java/li/strolch/rest/StrolchRestfulExceptionMapper.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/StrolchSessionHandler.java b/web-rest/src/main/java/li/strolch/rest/StrolchSessionHandler.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/StrolchSessionHandler.java
rename to web-rest/src/main/java/li/strolch/rest/StrolchSessionHandler.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuditsService.java b/web-rest/src/main/java/li/strolch/rest/endpoint/AuditsService.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuditsService.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/AuditsService.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java b/web-rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ControlResource.java b/web-rest/src/main/java/li/strolch/rest/endpoint/ControlResource.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ControlResource.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/ControlResource.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/EnumQuery.java b/web-rest/src/main/java/li/strolch/rest/endpoint/EnumQuery.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/EnumQuery.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/EnumQuery.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/I18nService.java b/web-rest/src/main/java/li/strolch/rest/endpoint/I18nService.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/I18nService.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/I18nService.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java b/web-rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ModelQuery.java b/web-rest/src/main/java/li/strolch/rest/endpoint/ModelQuery.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ModelQuery.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/ModelQuery.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/OperationsLogResource.java b/web-rest/src/main/java/li/strolch/rest/endpoint/OperationsLogResource.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/OperationsLogResource.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/OperationsLogResource.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegePoliciesService.java b/web-rest/src/main/java/li/strolch/rest/endpoint/PrivilegePoliciesService.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegePoliciesService.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/PrivilegePoliciesService.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeRolesService.java b/web-rest/src/main/java/li/strolch/rest/endpoint/PrivilegeRolesService.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeRolesService.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/PrivilegeRolesService.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java b/web-rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java b/web-rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/StrolchJobsResource.java b/web-rest/src/main/java/li/strolch/rest/endpoint/StrolchJobsResource.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/StrolchJobsResource.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/StrolchJobsResource.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/UserSessionsService.java b/web-rest/src/main/java/li/strolch/rest/endpoint/UserSessionsService.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/UserSessionsService.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/UserSessionsService.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/VersionQuery.java b/web-rest/src/main/java/li/strolch/rest/endpoint/VersionQuery.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/endpoint/VersionQuery.java
rename to web-rest/src/main/java/li/strolch/rest/endpoint/VersionQuery.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/filters/AccessControlResponseFilter.java b/web-rest/src/main/java/li/strolch/rest/filters/AccessControlResponseFilter.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/filters/AccessControlResponseFilter.java
rename to web-rest/src/main/java/li/strolch/rest/filters/AccessControlResponseFilter.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/filters/AuthenticationRequestFilter.java b/web-rest/src/main/java/li/strolch/rest/filters/AuthenticationRequestFilter.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/filters/AuthenticationRequestFilter.java
rename to web-rest/src/main/java/li/strolch/rest/filters/AuthenticationRequestFilter.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/filters/AuthenticationResponseFilter.java b/web-rest/src/main/java/li/strolch/rest/filters/AuthenticationResponseFilter.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/filters/AuthenticationResponseFilter.java
rename to web-rest/src/main/java/li/strolch/rest/filters/AuthenticationResponseFilter.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/filters/CharsetResponseFilter.java b/web-rest/src/main/java/li/strolch/rest/filters/CharsetResponseFilter.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/filters/CharsetResponseFilter.java
rename to web-rest/src/main/java/li/strolch/rest/filters/CharsetResponseFilter.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/filters/HttpCacheResponseFilter.java b/web-rest/src/main/java/li/strolch/rest/filters/HttpCacheResponseFilter.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/filters/HttpCacheResponseFilter.java
rename to web-rest/src/main/java/li/strolch/rest/filters/HttpCacheResponseFilter.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/helper/ResponseUtil.java b/web-rest/src/main/java/li/strolch/rest/helper/ResponseUtil.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/helper/ResponseUtil.java
rename to web-rest/src/main/java/li/strolch/rest/helper/ResponseUtil.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/helper/RestfulHelper.java b/web-rest/src/main/java/li/strolch/rest/helper/RestfulHelper.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/helper/RestfulHelper.java
rename to web-rest/src/main/java/li/strolch/rest/helper/RestfulHelper.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/model/AuditQueryData.java b/web-rest/src/main/java/li/strolch/rest/model/AuditQueryData.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/model/AuditQueryData.java
rename to web-rest/src/main/java/li/strolch/rest/model/AuditQueryData.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/model/QueryData.java b/web-rest/src/main/java/li/strolch/rest/model/QueryData.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/model/QueryData.java
rename to web-rest/src/main/java/li/strolch/rest/model/QueryData.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/model/ToJsonHelper.java b/web-rest/src/main/java/li/strolch/rest/model/ToJsonHelper.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/model/ToJsonHelper.java
rename to web-rest/src/main/java/li/strolch/rest/model/ToJsonHelper.java
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/model/UserSession.java b/web-rest/src/main/java/li/strolch/rest/model/UserSession.java
similarity index 100%
rename from li.strolch.rest/src/main/java/li/strolch/rest/model/UserSession.java
rename to web-rest/src/main/java/li/strolch/rest/model/UserSession.java
diff --git a/li.strolch.service/src/main/resources/componentVersion.properties b/web-rest/src/main/resources/componentVersion.properties
similarity index 100%
rename from li.strolch.service/src/main/resources/componentVersion.properties
rename to web-rest/src/main/resources/componentVersion.properties
diff --git a/li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/AbstractRestfulTest.java b/web-rest/src/test/java/li/strolch/rest/inspector/test/AbstractRestfulTest.java
similarity index 100%
rename from li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/AbstractRestfulTest.java
rename to web-rest/src/test/java/li/strolch/rest/inspector/test/AbstractRestfulTest.java
diff --git a/li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/AuthenticationTest.java b/web-rest/src/test/java/li/strolch/rest/inspector/test/AuthenticationTest.java
similarity index 100%
rename from li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/AuthenticationTest.java
rename to web-rest/src/test/java/li/strolch/rest/inspector/test/AuthenticationTest.java
diff --git a/li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java b/web-rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java
similarity index 100%
rename from li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java
rename to web-rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java
diff --git a/li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/VersionQueryTest.java b/web-rest/src/test/java/li/strolch/rest/inspector/test/VersionQueryTest.java
similarity index 100%
rename from li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/VersionQueryTest.java
rename to web-rest/src/test/java/li/strolch/rest/inspector/test/VersionQueryTest.java
diff --git a/li.strolch.utils/src/test/resources/logback.xml b/web-rest/src/test/resources/logback.xml
similarity index 100%
rename from li.strolch.utils/src/test/resources/logback.xml
rename to web-rest/src/test/resources/logback.xml
diff --git a/li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml b/web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
rename to web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeConfig.xml
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeRoles.xml b/web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeRoles.xml
similarity index 100%
rename from li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeRoles.xml
rename to web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeRoles.xml
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml b/web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml
similarity index 100%
rename from li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml
rename to web-rest/src/test/resources/withPrivilegeRuntime/config/PrivilegeUsers.xml
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml b/web-rest/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
similarity index 100%
rename from li.strolch.rest/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
rename to web-rest/src/test/resources/withPrivilegeRuntime/config/StrolchConfiguration.xml
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml b/web-rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml
similarity index 100%
rename from li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml
rename to web-rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml
diff --git a/li.strolch.service/src/test/resources/transienttest/data/Orders.xml b/web-rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/transienttest/data/Orders.xml
rename to web-rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml
diff --git a/li.strolch.service/src/test/resources/transienttest/data/Resources.xml b/web-rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml
similarity index 100%
rename from li.strolch.service/src/test/resources/transienttest/data/Resources.xml
rename to web-rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml
diff --git a/li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml b/web-rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml
similarity index 100%
rename from li.strolch.rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml
rename to web-rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml
diff --git a/li.strolch.websocket/.gitignore b/websocket/.gitignore
similarity index 100%
rename from li.strolch.websocket/.gitignore
rename to websocket/.gitignore
diff --git a/li.strolch.websocket/LICENSE b/websocket/LICENSE
similarity index 100%
rename from li.strolch.websocket/LICENSE
rename to websocket/LICENSE
diff --git a/li.strolch.websocket/README.md b/websocket/README.md
similarity index 100%
rename from li.strolch.websocket/README.md
rename to websocket/README.md
diff --git a/li.strolch.websocket/pom.xml b/websocket/pom.xml
similarity index 88%
rename from li.strolch.websocket/pom.xml
rename to websocket/pom.xml
index de1e2698f..061ed48b4 100644
--- a/li.strolch.websocket/pom.xml
+++ b/websocket/pom.xml
@@ -5,13 +5,13 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.websocket</artifactId>
-    <name>li.strolch.websocket</name>
+    <artifactId>websocket</artifactId>
+    <name>websocket</name>
     <description>WebSocket API for Strolch</description>
     <inceptionYear>2011</inceptionYear>
 
@@ -37,23 +37,23 @@
         <!-- main -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.model</artifactId>
+            <artifactId>model</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.agent</artifactId>
+            <artifactId>agent</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.service</artifactId>
+            <artifactId>service</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.soql</artifactId>
+            <artifactId>soql</artifactId>
         </dependency>
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.rest</artifactId>
+            <artifactId>web-rest</artifactId>
         </dependency>
 
         <!-- utils -->
@@ -83,7 +83,7 @@
         <!-- test -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketClient.java b/websocket/src/main/java/li/strolch/websocket/WebSocketClient.java
similarity index 100%
rename from li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketClient.java
rename to websocket/src/main/java/li/strolch/websocket/WebSocketClient.java
diff --git a/li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketEndpoint.java b/websocket/src/main/java/li/strolch/websocket/WebSocketEndpoint.java
similarity index 100%
rename from li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketEndpoint.java
rename to websocket/src/main/java/li/strolch/websocket/WebSocketEndpoint.java
diff --git a/li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketFilter.java b/websocket/src/main/java/li/strolch/websocket/WebSocketFilter.java
similarity index 100%
rename from li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketFilter.java
rename to websocket/src/main/java/li/strolch/websocket/WebSocketFilter.java
diff --git a/li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketObserverHandler.java b/websocket/src/main/java/li/strolch/websocket/WebSocketObserverHandler.java
similarity index 100%
rename from li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketObserverHandler.java
rename to websocket/src/main/java/li/strolch/websocket/WebSocketObserverHandler.java
diff --git a/li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketRemoteIp.java b/websocket/src/main/java/li/strolch/websocket/WebSocketRemoteIp.java
similarity index 100%
rename from li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketRemoteIp.java
rename to websocket/src/main/java/li/strolch/websocket/WebSocketRemoteIp.java
diff --git a/li.strolch.websocket/src/main/resources/componentVersion.properties b/websocket/src/main/resources/componentVersion.properties
similarity index 100%
rename from li.strolch.websocket/src/main/resources/componentVersion.properties
rename to websocket/src/main/resources/componentVersion.properties
diff --git a/li.strolch.xmlpers/.gitignore b/xmlpers/.gitignore
similarity index 100%
rename from li.strolch.xmlpers/.gitignore
rename to xmlpers/.gitignore
diff --git a/li.strolch.xmlpers/LICENSE b/xmlpers/LICENSE
similarity index 100%
rename from li.strolch.xmlpers/LICENSE
rename to xmlpers/LICENSE
diff --git a/li.strolch.xmlpers/README.md b/xmlpers/README.md
similarity index 100%
rename from li.strolch.xmlpers/README.md
rename to xmlpers/README.md
diff --git a/li.strolch.xmlpers/pom.xml b/xmlpers/pom.xml
similarity index 86%
rename from li.strolch.xmlpers/pom.xml
rename to xmlpers/pom.xml
index b08d4583a..6abffece7 100644
--- a/li.strolch.xmlpers/pom.xml
+++ b/xmlpers/pom.xml
@@ -5,14 +5,14 @@
 
     <parent>
         <groupId>li.strolch</groupId>
-        <artifactId>li.strolch</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <artifactId>strolch</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>li.strolch.xmlpers</artifactId>
+    <artifactId>xmlpers</artifactId>
     <packaging>jar</packaging>
-    <name>li.strolch.xmlpers</name>
+    <name>xmlpers</name>
     <inceptionYear>2011</inceptionYear>
 
     <distributionManagement>
@@ -36,13 +36,13 @@
 
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.utils</artifactId>
+            <artifactId>utils</artifactId>
         </dependency>
 
         <!-- test -->
         <dependency>
             <groupId>li.strolch</groupId>
-            <artifactId>li.strolch.testbase</artifactId>
+            <artifactId>test-base</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/DomParser.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/DomParser.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/DomParser.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/DomParser.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/FileDao.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/FileDao.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/FileDao.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/FileDao.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/FileIo.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/FileIo.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/FileIo.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/FileIo.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/IoMode.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/IoMode.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/IoMode.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/IoMode.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/IoOperation.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/IoOperation.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/IoOperation.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/IoOperation.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/MetadataDao.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/MetadataDao.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/MetadataDao.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/MetadataDao.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/ModificationResult.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/ModificationResult.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/ModificationResult.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/ModificationResult.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/ObjectDao.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/ObjectDao.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/ObjectDao.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/ObjectDao.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/ParserFactory.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/ParserFactory.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/ParserFactory.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/ParserFactory.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceConstants.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceConstants.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceConstants.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceConstants.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContext.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContext.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContext.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContext.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContextFactory.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContextFactory.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContextFactory.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContextFactory.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContextFactoryDelegator.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContextFactoryDelegator.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContextFactoryDelegator.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceContextFactoryDelegator.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceManager.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceManager.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceManager.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceManager.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceManagerLoader.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceManagerLoader.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceManagerLoader.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceManagerLoader.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceTransaction.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceTransaction.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceTransaction.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/PersistenceTransaction.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/SaxParser.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/SaxParser.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/SaxParser.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/SaxParser.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionCloseStrategy.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionCloseStrategy.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionCloseStrategy.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionCloseStrategy.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionResult.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionResult.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionResult.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionResult.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionState.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionState.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionState.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/TransactionState.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/XmlPersistenceException.java b/xmlpers/src/main/java/li/strolch/xmlpers/api/XmlPersistenceException.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/api/XmlPersistenceException.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/api/XmlPersistenceException.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/impl/DefaultPersistenceManager.java b/xmlpers/src/main/java/li/strolch/xmlpers/impl/DefaultPersistenceManager.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/impl/DefaultPersistenceManager.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/impl/DefaultPersistenceManager.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/impl/DefaultPersistenceTransaction.java b/xmlpers/src/main/java/li/strolch/xmlpers/impl/DefaultPersistenceTransaction.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/impl/DefaultPersistenceTransaction.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/impl/DefaultPersistenceTransaction.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/impl/PathBuilder.java b/xmlpers/src/main/java/li/strolch/xmlpers/impl/PathBuilder.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/impl/PathBuilder.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/impl/PathBuilder.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/IdOfSubTypeRef.java b/xmlpers/src/main/java/li/strolch/xmlpers/objref/IdOfSubTypeRef.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/IdOfSubTypeRef.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/objref/IdOfSubTypeRef.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/IdOfTypeRef.java b/xmlpers/src/main/java/li/strolch/xmlpers/objref/IdOfTypeRef.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/IdOfTypeRef.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/objref/IdOfTypeRef.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/LockableObject.java b/xmlpers/src/main/java/li/strolch/xmlpers/objref/LockableObject.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/LockableObject.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/objref/LockableObject.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/ObjectRef.java b/xmlpers/src/main/java/li/strolch/xmlpers/objref/ObjectRef.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/ObjectRef.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/objref/ObjectRef.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/ObjectReferenceCache.java b/xmlpers/src/main/java/li/strolch/xmlpers/objref/ObjectReferenceCache.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/ObjectReferenceCache.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/objref/ObjectReferenceCache.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/RefNameCreator.java b/xmlpers/src/main/java/li/strolch/xmlpers/objref/RefNameCreator.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/RefNameCreator.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/objref/RefNameCreator.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/RootRef.java b/xmlpers/src/main/java/li/strolch/xmlpers/objref/RootRef.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/RootRef.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/objref/RootRef.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/SubTypeRef.java b/xmlpers/src/main/java/li/strolch/xmlpers/objref/SubTypeRef.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/SubTypeRef.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/objref/SubTypeRef.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/TypeRef.java b/xmlpers/src/main/java/li/strolch/xmlpers/objref/TypeRef.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/objref/TypeRef.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/objref/TypeRef.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/util/AssertionUtil.java b/xmlpers/src/main/java/li/strolch/xmlpers/util/AssertionUtil.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/util/AssertionUtil.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/util/AssertionUtil.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/util/DomUtil.java b/xmlpers/src/main/java/li/strolch/xmlpers/util/DomUtil.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/util/DomUtil.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/util/DomUtil.java
diff --git a/li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/util/FilenameUtility.java b/xmlpers/src/main/java/li/strolch/xmlpers/util/FilenameUtility.java
similarity index 100%
rename from li.strolch.xmlpers/src/main/java/li/strolch/xmlpers/util/FilenameUtility.java
rename to xmlpers/src/main/java/li/strolch/xmlpers/util/FilenameUtility.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/AbstractPersistenceTest.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/AbstractPersistenceTest.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/AbstractPersistenceTest.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/AbstractPersistenceTest.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/FileDaoTest.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/FileDaoTest.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/FileDaoTest.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/FileDaoTest.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/LockingTest.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/LockingTest.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/LockingTest.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/LockingTest.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/ObjectDaoBookTest.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/ObjectDaoBookTest.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/ObjectDaoBookTest.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/ObjectDaoBookTest.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/ObjectDaoResourceTest.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/ObjectDaoResourceTest.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/ObjectDaoResourceTest.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/ObjectDaoResourceTest.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/TransactionResultTest.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/TransactionResultTest.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/TransactionResultTest.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/TransactionResultTest.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/XmlTestMain.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/XmlTestMain.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/XmlTestMain.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/XmlTestMain.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookContextFactory.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookContextFactory.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookContextFactory.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookContextFactory.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookDomParser.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookDomParser.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookDomParser.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookDomParser.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookParserFactory.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookParserFactory.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookParserFactory.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookParserFactory.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookSaxParser.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookSaxParser.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookSaxParser.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/impl/BookSaxParser.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelContextFactory.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelContextFactory.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelContextFactory.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelContextFactory.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelDomParser.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelDomParser.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelDomParser.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelDomParser.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelParserFactory.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelParserFactory.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelParserFactory.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelParserFactory.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelSaxParser.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelSaxParser.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelSaxParser.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/impl/MyModelSaxParser.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/TestConstants.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/impl/TestConstants.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/impl/TestConstants.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/impl/TestConstants.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/model/Book.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/model/Book.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/model/Book.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/model/Book.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/model/ModelBuilder.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/model/ModelBuilder.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/model/ModelBuilder.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/model/ModelBuilder.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/model/MyModel.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/model/MyModel.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/model/MyModel.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/model/MyModel.java
diff --git a/li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/model/MyParameter.java b/xmlpers/src/test/java/li/strolch/xmlpers/test/model/MyParameter.java
similarity index 100%
rename from li.strolch.xmlpers/src/test/java/li/strolch/xmlpers/test/model/MyParameter.java
rename to xmlpers/src/test/java/li/strolch/xmlpers/test/model/MyParameter.java
diff --git a/li.strolch.xmlpers/src/test/resources/logback.xml b/xmlpers/src/test/resources/logback.xml
similarity index 100%
rename from li.strolch.xmlpers/src/test/resources/logback.xml
rename to xmlpers/src/test/resources/logback.xml