diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/ActionSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ActionSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/ActionSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ActionSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ActivityQuery.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ActivityQuery.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQueryVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ActivityQueryVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ActivityQueryVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ActivityQueryVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ActivitySelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ActivitySelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ActivitySelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ActivitySelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ActivitySelectionVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ActivitySelectionVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ActivitySelectionVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ActivitySelectionVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ActivityStateSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ActivityStateSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ActivityStateSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ActivityStateSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/AndSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/AndSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/AndSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/AndSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/AnySelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/AnySelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/AnySelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/AnySelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/AuditQuery.java b/li.strolch.agent/src/main/java/li/strolch/model/query/AuditQuery.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/AuditQuery.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/AuditQuery.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/AuditQueryVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/AuditQueryVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/AuditQueryVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/AuditQueryVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/AuditSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/AuditSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/AuditSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/AuditSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/BooleanSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/BooleanSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/BooleanSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/BooleanSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/DateSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/DateSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/DateSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/DateSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/ElementSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ElementSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/ElementSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ElementSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/IdSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/IdSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/IdSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/IdSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/audit/IdentitySelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/IdentitySelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/audit/IdentitySelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/IdentitySelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/NameSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/NameSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/NameSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/NameSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/Navigation.java b/li.strolch.agent/src/main/java/li/strolch/model/query/Navigation.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/Navigation.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/Navigation.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/NotSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/NotSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/NotSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/NotSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/OrSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/OrSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/OrSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/OrSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java b/li.strolch.agent/src/main/java/li/strolch/model/query/OrderQuery.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/OrderQuery.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/OrderQueryVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/OrderQueryVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/OrderQueryVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/OrderQueryVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/OrderSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/OrderSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/OrderSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/OrderSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/OrderSelectionVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/OrderSelectionVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/OrderSelectionVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/OrderSelectionVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/OrderStateSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/OrderStateSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/OrderStateSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/OrderStateSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ParameterBagSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ParameterBagSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ParameterBagSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ParameterBagSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ParameterSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ParameterSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ParameterSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ParameterSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ParameterSelectionVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ParameterSelectionVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ParameterSelectionVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ParameterSelectionVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/QueryVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/QueryVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/QueryVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/QueryVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ResourceQuery.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ResourceQuery.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQueryVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ResourceQueryVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ResourceQueryVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ResourceQueryVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/Selection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/Selection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/Selection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/Selection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/StringSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/StringSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/StringSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/StringSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementQuery.java b/li.strolch.agent/src/main/java/li/strolch/model/query/StrolchElementQuery.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementQuery.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/StrolchElementQuery.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementSelection.java b/li.strolch.agent/src/main/java/li/strolch/model/query/StrolchElementSelection.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementSelection.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/StrolchElementSelection.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementSelectionVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/StrolchElementSelectionVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/StrolchElementSelectionVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/StrolchElementSelectionVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/StrolchQuery.java b/li.strolch.agent/src/main/java/li/strolch/model/query/StrolchQuery.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/StrolchQuery.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/StrolchQuery.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/StrolchRootElementSelectionVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/StrolchRootElementSelectionVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/StrolchRootElementSelectionVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/StrolchRootElementSelectionVisitor.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/StrolchTypeNavigation.java b/li.strolch.agent/src/main/java/li/strolch/model/query/StrolchTypeNavigation.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/StrolchTypeNavigation.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/StrolchTypeNavigation.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ordering/ByIdComparator.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ordering/ByIdComparator.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ordering/ByIdComparator.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ordering/ByIdComparator.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ordering/ByNameComparator.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ordering/ByNameComparator.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ordering/ByNameComparator.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ordering/ByNameComparator.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ordering/ByParamComparator.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ordering/ByParamComparator.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ordering/ByParamComparator.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ordering/ByParamComparator.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ordering/OrderById.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ordering/OrderById.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ordering/OrderById.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ordering/OrderById.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ordering/OrderByName.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ordering/OrderByName.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ordering/OrderByName.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ordering/OrderByName.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ordering/OrderByParameter.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ordering/OrderByParameter.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ordering/OrderByParameter.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ordering/OrderByParameter.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ordering/StrolchQueryOrdering.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ordering/StrolchQueryOrdering.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ordering/StrolchQueryOrdering.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ordering/StrolchQueryOrdering.java
diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ordering/StrolchQueryOrderingVisitor.java b/li.strolch.agent/src/main/java/li/strolch/model/query/ordering/StrolchQueryOrderingVisitor.java
similarity index 100%
rename from li.strolch.model/src/main/java/li/strolch/model/query/ordering/StrolchQueryOrderingVisitor.java
rename to li.strolch.agent/src/main/java/li/strolch/model/query/ordering/StrolchQueryOrderingVisitor.java