diff --git a/src/main/java/li/strolch/persistence/mock/PersistenceHandlerMock.java b/src/main/java/li/strolch/persistence/mock/PersistenceHandlerMock.java
index 61b943160..c064a4891 100644
--- a/src/main/java/li/strolch/persistence/mock/PersistenceHandlerMock.java
+++ b/src/main/java/li/strolch/persistence/mock/PersistenceHandlerMock.java
@@ -3,8 +3,8 @@ package li.strolch.persistence.mock;
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.persistence.api.StrolchTransaction;
 import li.strolch.runtime.StrolchConstants;
-import li.strolch.runtime.agent.ComponentContainerImpl;
-import li.strolch.runtime.agent.StrolchComponent;
+import li.strolch.runtime.agent.api.StrolchComponent;
+import li.strolch.runtime.agent.impl.ComponentContainerImpl;
 
 public class PersistenceHandlerMock extends StrolchComponent implements PersistenceHandler {
 
diff --git a/src/main/java/li/strolch/runtime/agent/ComponentContainer.java b/src/main/java/li/strolch/runtime/agent/api/ComponentContainer.java
similarity index 96%
rename from src/main/java/li/strolch/runtime/agent/ComponentContainer.java
rename to src/main/java/li/strolch/runtime/agent/api/ComponentContainer.java
index 88ecb35de..b58fd6446 100644
--- a/src/main/java/li/strolch/runtime/agent/ComponentContainer.java
+++ b/src/main/java/li/strolch/runtime/agent/api/ComponentContainer.java
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.api;
+
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/ComponentState.java b/src/main/java/li/strolch/runtime/agent/api/ComponentState.java
similarity index 97%
rename from src/main/java/li/strolch/runtime/agent/ComponentState.java
rename to src/main/java/li/strolch/runtime/agent/api/ComponentState.java
index 12c96beb0..f066ceb41 100644
--- a/src/main/java/li/strolch/runtime/agent/ComponentState.java
+++ b/src/main/java/li/strolch/runtime/agent/api/ComponentState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.api;
 
 import java.text.MessageFormat;
 
diff --git a/src/main/java/li/strolch/runtime/agent/ElementMap.java b/src/main/java/li/strolch/runtime/agent/api/ElementMap.java
similarity index 97%
rename from src/main/java/li/strolch/runtime/agent/ElementMap.java
rename to src/main/java/li/strolch/runtime/agent/api/ElementMap.java
index 762c9d1de..39ad53a72 100644
--- a/src/main/java/li/strolch/runtime/agent/ElementMap.java
+++ b/src/main/java/li/strolch/runtime/agent/api/ElementMap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.api;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/main/java/li/strolch/runtime/agent/ElementMapHandler.java b/src/main/java/li/strolch/runtime/agent/api/ElementMapHandler.java
similarity index 95%
rename from src/main/java/li/strolch/runtime/agent/ElementMapHandler.java
rename to src/main/java/li/strolch/runtime/agent/api/ElementMapHandler.java
index 848d53788..e7c894103 100644
--- a/src/main/java/li/strolch/runtime/agent/ElementMapHandler.java
+++ b/src/main/java/li/strolch/runtime/agent/api/ElementMapHandler.java
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.api;
+
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/OrderMap.java b/src/main/java/li/strolch/runtime/agent/api/OrderMap.java
similarity index 95%
rename from src/main/java/li/strolch/runtime/agent/OrderMap.java
rename to src/main/java/li/strolch/runtime/agent/api/OrderMap.java
index c6bad5ea0..65f71262a 100644
--- a/src/main/java/li/strolch/runtime/agent/OrderMap.java
+++ b/src/main/java/li/strolch/runtime/agent/api/OrderMap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.api;
 
 import li.strolch.model.Order;
 
diff --git a/src/main/java/li/strolch/runtime/agent/PostInitializer.java b/src/main/java/li/strolch/runtime/agent/api/PostInitializer.java
similarity index 95%
rename from src/main/java/li/strolch/runtime/agent/PostInitializer.java
rename to src/main/java/li/strolch/runtime/agent/api/PostInitializer.java
index 314ae186a..9dfa64aab 100644
--- a/src/main/java/li/strolch/runtime/agent/PostInitializer.java
+++ b/src/main/java/li/strolch/runtime/agent/api/PostInitializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.api;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/ResourceMap.java b/src/main/java/li/strolch/runtime/agent/api/ResourceMap.java
similarity index 95%
rename from src/main/java/li/strolch/runtime/agent/ResourceMap.java
rename to src/main/java/li/strolch/runtime/agent/api/ResourceMap.java
index ffd6c763c..d1fc7bbb4 100644
--- a/src/main/java/li/strolch/runtime/agent/ResourceMap.java
+++ b/src/main/java/li/strolch/runtime/agent/api/ResourceMap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.api;
 
 import li.strolch.model.Resource;
 
diff --git a/src/main/java/li/strolch/runtime/agent/StrolchAgent.java b/src/main/java/li/strolch/runtime/agent/api/StrolchAgent.java
similarity index 94%
rename from src/main/java/li/strolch/runtime/agent/StrolchAgent.java
rename to src/main/java/li/strolch/runtime/agent/api/StrolchAgent.java
index 80e2395d7..27d1324ba 100644
--- a/src/main/java/li/strolch/runtime/agent/StrolchAgent.java
+++ b/src/main/java/li/strolch/runtime/agent/api/StrolchAgent.java
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.api;
 
 import java.io.File;
 import java.text.MessageFormat;
 
+import li.strolch.runtime.agent.impl.ComponentContainerImpl;
+import li.strolch.runtime.agent.impl.DataStoreMode;
+import li.strolch.runtime.agent.impl.ElementMapHandlerConfigurator;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.ConfigurationParser;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
diff --git a/src/main/java/li/strolch/runtime/agent/StrolchComponent.java b/src/main/java/li/strolch/runtime/agent/api/StrolchComponent.java
similarity index 95%
rename from src/main/java/li/strolch/runtime/agent/StrolchComponent.java
rename to src/main/java/li/strolch/runtime/agent/api/StrolchComponent.java
index 845e38676..8b81ee430 100644
--- a/src/main/java/li/strolch/runtime/agent/StrolchComponent.java
+++ b/src/main/java/li/strolch/runtime/agent/api/StrolchComponent.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.api;
 
 import java.text.MessageFormat;
 
+import li.strolch.runtime.agent.impl.ComponentContainerImpl;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/li/strolch/runtime/agent/AbstractElementMapHandler.java b/src/main/java/li/strolch/runtime/agent/impl/AbstractElementMapHandler.java
similarity index 89%
rename from src/main/java/li/strolch/runtime/agent/AbstractElementMapHandler.java
rename to src/main/java/li/strolch/runtime/agent/impl/AbstractElementMapHandler.java
index d35ee7598..89144451e 100644
--- a/src/main/java/li/strolch/runtime/agent/AbstractElementMapHandler.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/AbstractElementMapHandler.java
@@ -13,13 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.text.MessageFormat;
 import java.util.Map;
 
 import li.strolch.exception.StrolchException;
 import li.strolch.runtime.StrolchConstants;
+import li.strolch.runtime.agent.api.ElementMapHandler;
+import li.strolch.runtime.agent.api.OrderMap;
+import li.strolch.runtime.agent.api.ResourceMap;
+import li.strolch.runtime.agent.api.StrolchComponent;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/AbstractTransactionalElementMap.java b/src/main/java/li/strolch/runtime/agent/impl/AbstractTransactionalElementMap.java
similarity index 96%
rename from src/main/java/li/strolch/runtime/agent/AbstractTransactionalElementMap.java
rename to src/main/java/li/strolch/runtime/agent/impl/AbstractTransactionalElementMap.java
index b0839de06..aa4f314cf 100644
--- a/src/main/java/li/strolch/runtime/agent/AbstractTransactionalElementMap.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/AbstractTransactionalElementMap.java
@@ -1,4 +1,4 @@
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.util.List;
 import java.util.Set;
@@ -7,6 +7,7 @@ import li.strolch.model.StrolchElement;
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.persistence.api.StrolchDao;
 import li.strolch.persistence.api.StrolchTransaction;
+import li.strolch.runtime.agent.api.ElementMap;
 
 public abstract class AbstractTransactionalElementMap<T extends StrolchElement> implements ElementMap<T> {
 
diff --git a/src/main/java/li/strolch/runtime/agent/CachedElementMapHandler.java b/src/main/java/li/strolch/runtime/agent/impl/CachedElementMapHandler.java
similarity index 95%
rename from src/main/java/li/strolch/runtime/agent/CachedElementMapHandler.java
rename to src/main/java/li/strolch/runtime/agent/impl/CachedElementMapHandler.java
index 1a5b204ab..97d3747d5 100644
--- a/src/main/java/li/strolch/runtime/agent/CachedElementMapHandler.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/CachedElementMapHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.text.MessageFormat;
 import java.util.List;
@@ -25,6 +25,8 @@ import li.strolch.persistence.api.OrderDao;
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.persistence.api.ResourceDao;
 import li.strolch.persistence.api.StrolchTransaction;
+import li.strolch.runtime.agent.api.OrderMap;
+import li.strolch.runtime.agent.api.ResourceMap;
 import ch.eitchnet.utils.helper.StringHelper;
 
 /**
diff --git a/src/main/java/li/strolch/runtime/agent/CachedElementMapHandlerConfigurator.java b/src/main/java/li/strolch/runtime/agent/impl/CachedElementMapHandlerConfigurator.java
similarity index 92%
rename from src/main/java/li/strolch/runtime/agent/CachedElementMapHandlerConfigurator.java
rename to src/main/java/li/strolch/runtime/agent/impl/CachedElementMapHandlerConfigurator.java
index 0876233b5..fe68d7dc1 100644
--- a/src/main/java/li/strolch/runtime/agent/CachedElementMapHandlerConfigurator.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/CachedElementMapHandlerConfigurator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -21,6 +21,8 @@ import java.util.Map;
 import java.util.Set;
 
 import li.strolch.persistence.api.PersistenceHandler;
+import li.strolch.runtime.agent.api.ElementMapHandler;
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
 
diff --git a/src/main/java/li/strolch/runtime/agent/ComponentContainerImpl.java b/src/main/java/li/strolch/runtime/agent/impl/ComponentContainerImpl.java
similarity index 96%
rename from src/main/java/li/strolch/runtime/agent/ComponentContainerImpl.java
rename to src/main/java/li/strolch/runtime/agent/impl/ComponentContainerImpl.java
index 30f1747a6..0479a75c7 100644
--- a/src/main/java/li/strolch/runtime/agent/ComponentContainerImpl.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/ComponentContainerImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -22,6 +22,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import li.strolch.runtime.agent.api.ComponentContainer;
+import li.strolch.runtime.agent.api.ComponentState;
+import li.strolch.runtime.agent.api.ElementMapHandler;
+import li.strolch.runtime.agent.api.OrderMap;
+import li.strolch.runtime.agent.api.ResourceMap;
+import li.strolch.runtime.agent.api.StrolchComponent;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.StrolchConfiguration;
 import li.strolch.runtime.configuration.StrolchConfigurationException;
diff --git a/src/main/java/li/strolch/runtime/agent/ComponentController.java b/src/main/java/li/strolch/runtime/agent/impl/ComponentController.java
similarity index 97%
rename from src/main/java/li/strolch/runtime/agent/ComponentController.java
rename to src/main/java/li/strolch/runtime/agent/impl/ComponentController.java
index 71918af5a..a902947cd 100644
--- a/src/main/java/li/strolch/runtime/agent/ComponentController.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/ComponentController.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.text.MessageFormat;
 import java.util.HashSet;
 import java.util.Set;
 
+import li.strolch.runtime.agent.api.StrolchComponent;
 import li.strolch.runtime.configuration.StrolchConfigurationException;
 
 public class ComponentController {
diff --git a/src/main/java/li/strolch/runtime/agent/ComponentDependencyAnalyzer.java b/src/main/java/li/strolch/runtime/agent/impl/ComponentDependencyAnalyzer.java
similarity index 99%
rename from src/main/java/li/strolch/runtime/agent/ComponentDependencyAnalyzer.java
rename to src/main/java/li/strolch/runtime/agent/impl/ComponentDependencyAnalyzer.java
index 8e9c79eb3..77611dd8a 100644
--- a/src/main/java/li/strolch/runtime/agent/ComponentDependencyAnalyzer.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/ComponentDependencyAnalyzer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.text.MessageFormat;
 import java.util.HashSet;
diff --git a/src/main/java/li/strolch/runtime/agent/DataStoreMode.java b/src/main/java/li/strolch/runtime/agent/impl/DataStoreMode.java
similarity index 97%
rename from src/main/java/li/strolch/runtime/agent/DataStoreMode.java
rename to src/main/java/li/strolch/runtime/agent/impl/DataStoreMode.java
index a58847f70..71f220cc1 100644
--- a/src/main/java/li/strolch/runtime/agent/DataStoreMode.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/DataStoreMode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.text.MessageFormat;
 
diff --git a/src/main/java/li/strolch/runtime/agent/ElementMapHandlerConfigurator.java b/src/main/java/li/strolch/runtime/agent/impl/ElementMapHandlerConfigurator.java
similarity index 90%
rename from src/main/java/li/strolch/runtime/agent/ElementMapHandlerConfigurator.java
rename to src/main/java/li/strolch/runtime/agent/impl/ElementMapHandlerConfigurator.java
index 4cfc70083..943bfe982 100644
--- a/src/main/java/li/strolch/runtime/agent/ElementMapHandlerConfigurator.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/ElementMapHandlerConfigurator.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 
 /**
diff --git a/src/main/java/li/strolch/runtime/agent/EmptyElementMapHandler.java b/src/main/java/li/strolch/runtime/agent/impl/EmptyElementMapHandler.java
similarity index 96%
rename from src/main/java/li/strolch/runtime/agent/EmptyElementMapHandler.java
rename to src/main/java/li/strolch/runtime/agent/impl/EmptyElementMapHandler.java
index 28be6640a..138bf355b 100644
--- a/src/main/java/li/strolch/runtime/agent/EmptyElementMapHandler.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/EmptyElementMapHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/EmptyElementMapHandlerConfigurator.java b/src/main/java/li/strolch/runtime/agent/impl/EmptyElementMapHandlerConfigurator.java
similarity index 91%
rename from src/main/java/li/strolch/runtime/agent/EmptyElementMapHandlerConfigurator.java
rename to src/main/java/li/strolch/runtime/agent/impl/EmptyElementMapHandlerConfigurator.java
index 140bfa036..d06d69823 100644
--- a/src/main/java/li/strolch/runtime/agent/EmptyElementMapHandlerConfigurator.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/EmptyElementMapHandlerConfigurator.java
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import li.strolch.runtime.agent.api.ElementMapHandler;
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
 
diff --git a/src/main/java/li/strolch/runtime/agent/InMemoryElementListener.java b/src/main/java/li/strolch/runtime/agent/impl/InMemoryElementListener.java
similarity index 90%
rename from src/main/java/li/strolch/runtime/agent/InMemoryElementListener.java
rename to src/main/java/li/strolch/runtime/agent/impl/InMemoryElementListener.java
index 2224c8b01..20ae04392 100644
--- a/src/main/java/li/strolch/runtime/agent/InMemoryElementListener.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/InMemoryElementListener.java
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import li.strolch.model.Order;
 import li.strolch.model.Resource;
 import li.strolch.model.xml.StrolchElementListener;
+import li.strolch.runtime.agent.api.OrderMap;
+import li.strolch.runtime.agent.api.ResourceMap;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/InMemoryElementMap.java b/src/main/java/li/strolch/runtime/agent/impl/InMemoryElementMap.java
similarity index 98%
rename from src/main/java/li/strolch/runtime/agent/InMemoryElementMap.java
rename to src/main/java/li/strolch/runtime/agent/impl/InMemoryElementMap.java
index d46ca2579..76be2c912 100644
--- a/src/main/java/li/strolch/runtime/agent/InMemoryElementMap.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/InMemoryElementMap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.Set;
 
 import li.strolch.model.StrolchElement;
+import li.strolch.runtime.agent.api.ElementMap;
 import ch.eitchnet.utils.helper.StringHelper;
 
 /**
diff --git a/src/main/java/li/strolch/runtime/agent/InMemoryElementMapHandler.java b/src/main/java/li/strolch/runtime/agent/impl/InMemoryElementMapHandler.java
similarity index 95%
rename from src/main/java/li/strolch/runtime/agent/InMemoryElementMapHandler.java
rename to src/main/java/li/strolch/runtime/agent/impl/InMemoryElementMapHandler.java
index 3aa562cf8..672a9e7a4 100644
--- a/src/main/java/li/strolch/runtime/agent/InMemoryElementMapHandler.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/InMemoryElementMapHandler.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.util.HashMap;
 
 import li.strolch.runtime.StrolchConstants;
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
 
diff --git a/src/main/java/li/strolch/runtime/agent/InMemoryOrderMap.java b/src/main/java/li/strolch/runtime/agent/impl/InMemoryOrderMap.java
similarity index 90%
rename from src/main/java/li/strolch/runtime/agent/InMemoryOrderMap.java
rename to src/main/java/li/strolch/runtime/agent/impl/InMemoryOrderMap.java
index 571a2f4e6..2878718b9 100644
--- a/src/main/java/li/strolch/runtime/agent/InMemoryOrderMap.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/InMemoryOrderMap.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import li.strolch.model.Order;
+import li.strolch.runtime.agent.api.OrderMap;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/InMemoryResourceMap.java b/src/main/java/li/strolch/runtime/agent/impl/InMemoryResourceMap.java
similarity index 90%
rename from src/main/java/li/strolch/runtime/agent/InMemoryResourceMap.java
rename to src/main/java/li/strolch/runtime/agent/impl/InMemoryResourceMap.java
index 3fe095b21..bce6d69e0 100644
--- a/src/main/java/li/strolch/runtime/agent/InMemoryResourceMap.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/InMemoryResourceMap.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import li.strolch.model.Resource;
+import li.strolch.runtime.agent.api.ResourceMap;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/SimplePostInitializer.java b/src/main/java/li/strolch/runtime/agent/impl/SimplePostInitializer.java
similarity index 86%
rename from src/main/java/li/strolch/runtime/agent/SimplePostInitializer.java
rename to src/main/java/li/strolch/runtime/agent/impl/SimplePostInitializer.java
index cd249dac0..77d6381e5 100644
--- a/src/main/java/li/strolch/runtime/agent/SimplePostInitializer.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/SimplePostInitializer.java
@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
+
+import li.strolch.runtime.agent.api.PostInitializer;
+import li.strolch.runtime.agent.api.StrolchComponent;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/StrolchRealm.java b/src/main/java/li/strolch/runtime/agent/impl/StrolchRealm.java
similarity index 90%
rename from src/main/java/li/strolch/runtime/agent/StrolchRealm.java
rename to src/main/java/li/strolch/runtime/agent/impl/StrolchRealm.java
index 40eef9036..8a0fef906 100644
--- a/src/main/java/li/strolch/runtime/agent/StrolchRealm.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/StrolchRealm.java
@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
+
+import li.strolch.runtime.agent.api.OrderMap;
+import li.strolch.runtime.agent.api.ResourceMap;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/agent/TransactionalElementMapHandler.java b/src/main/java/li/strolch/runtime/agent/impl/TransactionalElementMapHandler.java
similarity index 94%
rename from src/main/java/li/strolch/runtime/agent/TransactionalElementMapHandler.java
rename to src/main/java/li/strolch/runtime/agent/impl/TransactionalElementMapHandler.java
index 1b106e40f..5236323e1 100644
--- a/src/main/java/li/strolch/runtime/agent/TransactionalElementMapHandler.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/TransactionalElementMapHandler.java
@@ -13,13 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.text.MessageFormat;
 import java.util.HashMap;
 
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.runtime.StrolchConstants;
+import li.strolch.runtime.agent.api.OrderMap;
+import li.strolch.runtime.agent.api.ResourceMap;
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
 import ch.eitchnet.utils.helper.StringHelper;
diff --git a/src/main/java/li/strolch/runtime/agent/TransactionalElementMapHandlerConfigurator.java b/src/main/java/li/strolch/runtime/agent/impl/TransactionalElementMapHandlerConfigurator.java
similarity index 92%
rename from src/main/java/li/strolch/runtime/agent/TransactionalElementMapHandlerConfigurator.java
rename to src/main/java/li/strolch/runtime/agent/impl/TransactionalElementMapHandlerConfigurator.java
index 8c248544d..643edaccf 100644
--- a/src/main/java/li/strolch/runtime/agent/TransactionalElementMapHandlerConfigurator.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/TransactionalElementMapHandlerConfigurator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -21,6 +21,8 @@ import java.util.Map;
 import java.util.Set;
 
 import li.strolch.persistence.api.PersistenceHandler;
+import li.strolch.runtime.agent.api.ElementMapHandler;
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
 
diff --git a/src/main/java/li/strolch/runtime/agent/TransactionalOrderMap.java b/src/main/java/li/strolch/runtime/agent/impl/TransactionalOrderMap.java
similarity index 85%
rename from src/main/java/li/strolch/runtime/agent/TransactionalOrderMap.java
rename to src/main/java/li/strolch/runtime/agent/impl/TransactionalOrderMap.java
index e0c6fa317..b23a1af03 100644
--- a/src/main/java/li/strolch/runtime/agent/TransactionalOrderMap.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/TransactionalOrderMap.java
@@ -1,9 +1,10 @@
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import li.strolch.model.Order;
 import li.strolch.persistence.api.OrderDao;
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.persistence.api.StrolchTransaction;
+import li.strolch.runtime.agent.api.OrderMap;
 
 public class TransactionalOrderMap extends AbstractTransactionalElementMap<Order> implements OrderMap {
 
diff --git a/src/main/java/li/strolch/runtime/agent/TransactionalResourceMap.java b/src/main/java/li/strolch/runtime/agent/impl/TransactionalResourceMap.java
similarity index 85%
rename from src/main/java/li/strolch/runtime/agent/TransactionalResourceMap.java
rename to src/main/java/li/strolch/runtime/agent/impl/TransactionalResourceMap.java
index a6b6a215b..67b4fb41b 100644
--- a/src/main/java/li/strolch/runtime/agent/TransactionalResourceMap.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/TransactionalResourceMap.java
@@ -1,9 +1,10 @@
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import li.strolch.model.Resource;
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.persistence.api.ResourceDao;
 import li.strolch.persistence.api.StrolchTransaction;
+import li.strolch.runtime.agent.api.ResourceMap;
 
 public class TransactionalResourceMap extends AbstractTransactionalElementMap<Resource> implements ResourceMap {
 
diff --git a/src/main/java/li/strolch/runtime/agent/TransientElementMapHandler.java b/src/main/java/li/strolch/runtime/agent/impl/TransientElementMapHandler.java
similarity index 94%
rename from src/main/java/li/strolch/runtime/agent/TransientElementMapHandler.java
rename to src/main/java/li/strolch/runtime/agent/impl/TransientElementMapHandler.java
index b41007285..8bb131580 100644
--- a/src/main/java/li/strolch/runtime/agent/TransientElementMapHandler.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/TransientElementMapHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.io.File;
 import java.text.MessageFormat;
@@ -23,6 +23,9 @@ import java.util.Map;
 import li.strolch.model.xml.XmlModelDefaultHandler.XmlModelStatistics;
 import li.strolch.model.xml.XmlModelFileHandler;
 import li.strolch.runtime.StrolchConstants;
+import li.strolch.runtime.agent.api.OrderMap;
+import li.strolch.runtime.agent.api.ResourceMap;
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
 import li.strolch.runtime.configuration.StrolchConfigurationException;
diff --git a/src/main/java/li/strolch/runtime/agent/TransientElementMapHandlerConfigurator.java b/src/main/java/li/strolch/runtime/agent/impl/TransientElementMapHandlerConfigurator.java
similarity index 91%
rename from src/main/java/li/strolch/runtime/agent/TransientElementMapHandlerConfigurator.java
rename to src/main/java/li/strolch/runtime/agent/impl/TransientElementMapHandlerConfigurator.java
index 83beebd71..7cb0107d9 100644
--- a/src/main/java/li/strolch/runtime/agent/TransientElementMapHandlerConfigurator.java
+++ b/src/main/java/li/strolch/runtime/agent/impl/TransientElementMapHandlerConfigurator.java
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.runtime.agent;
+package li.strolch.runtime.agent.impl;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import li.strolch.runtime.agent.api.ElementMapHandler;
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
 
diff --git a/src/main/java/li/strolch/runtime/main/MainStarter.java b/src/main/java/li/strolch/runtime/main/MainStarter.java
index 891716f51..29540eb61 100644
--- a/src/main/java/li/strolch/runtime/main/MainStarter.java
+++ b/src/main/java/li/strolch/runtime/main/MainStarter.java
@@ -19,7 +19,7 @@ import java.io.File;
 import java.text.MessageFormat;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import li.strolch.runtime.agent.StrolchAgent;
+import li.strolch.runtime.agent.api.StrolchAgent;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
diff --git a/src/main/java/li/strolch/runtime/observer/DefaultObserverHandler.java b/src/main/java/li/strolch/runtime/observer/DefaultObserverHandler.java
index 92e320201..08324c611 100644
--- a/src/main/java/li/strolch/runtime/observer/DefaultObserverHandler.java
+++ b/src/main/java/li/strolch/runtime/observer/DefaultObserverHandler.java
@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Map;
 
 import li.strolch.model.StrolchElement;
-import li.strolch.runtime.agent.ComponentContainerImpl;
-import li.strolch.runtime.agent.StrolchComponent;
+import li.strolch.runtime.agent.api.StrolchComponent;
+import li.strolch.runtime.agent.impl.ComponentContainerImpl;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 
 /**
diff --git a/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java b/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java
index 40ff02de4..8a034fe75 100644
--- a/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java
+++ b/src/main/java/li/strolch/runtime/privilege/DefaultStrolchPrivilegeHandler.java
@@ -20,8 +20,8 @@ import java.io.FileInputStream;
 import java.text.MessageFormat;
 import java.util.Map;
 
-import li.strolch.runtime.agent.ComponentContainerImpl;
-import li.strolch.runtime.agent.StrolchComponent;
+import li.strolch.runtime.agent.api.StrolchComponent;
+import li.strolch.runtime.agent.impl.ComponentContainerImpl;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
 import ch.eitchnet.privilege.base.PrivilegeException;
diff --git a/src/main/java/li/strolch/runtime/query/inmemory/InMemoryOrderQueryVisitor.java b/src/main/java/li/strolch/runtime/query/inmemory/InMemoryOrderQueryVisitor.java
index c38408c68..1f9bace3f 100644
--- a/src/main/java/li/strolch/runtime/query/inmemory/InMemoryOrderQueryVisitor.java
+++ b/src/main/java/li/strolch/runtime/query/inmemory/InMemoryOrderQueryVisitor.java
@@ -21,7 +21,7 @@ import li.strolch.model.query.OrderQuery;
 import li.strolch.model.query.OrderQueryVisitor;
 import li.strolch.model.query.StateSelection;
 import li.strolch.model.query.StrolchTypeNavigation;
-import li.strolch.runtime.agent.ComponentContainer;
+import li.strolch.runtime.agent.api.ComponentContainer;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/query/inmemory/InMemoryQueryVisitor.java b/src/main/java/li/strolch/runtime/query/inmemory/InMemoryQueryVisitor.java
index 61fa75999..d197fa988 100644
--- a/src/main/java/li/strolch/runtime/query/inmemory/InMemoryQueryVisitor.java
+++ b/src/main/java/li/strolch/runtime/query/inmemory/InMemoryQueryVisitor.java
@@ -34,7 +34,7 @@ import li.strolch.model.query.ParameterSelection.IntegerParameterSelection;
 import li.strolch.model.query.ParameterSelection.LongParameterSelection;
 import li.strolch.model.query.ParameterSelection.StringListParameterSelection;
 import li.strolch.model.query.ParameterSelection.StringParameterSelection;
-import li.strolch.runtime.agent.ComponentContainer;
+import li.strolch.runtime.agent.api.ComponentContainer;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/query/inmemory/InMemoryResourceQueryVisitor.java b/src/main/java/li/strolch/runtime/query/inmemory/InMemoryResourceQueryVisitor.java
index a691fef5d..d52de5828 100644
--- a/src/main/java/li/strolch/runtime/query/inmemory/InMemoryResourceQueryVisitor.java
+++ b/src/main/java/li/strolch/runtime/query/inmemory/InMemoryResourceQueryVisitor.java
@@ -22,7 +22,7 @@ import li.strolch.model.Resource;
 import li.strolch.model.query.ResourceQuery;
 import li.strolch.model.query.ResourceQueryVisitor;
 import li.strolch.model.query.StrolchTypeNavigation;
-import li.strolch.runtime.agent.ComponentContainer;
+import li.strolch.runtime.agent.api.ComponentContainer;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/query/inmemory/OrderTypeNavigator.java b/src/main/java/li/strolch/runtime/query/inmemory/OrderTypeNavigator.java
index 547653294..1e56d2af4 100644
--- a/src/main/java/li/strolch/runtime/query/inmemory/OrderTypeNavigator.java
+++ b/src/main/java/li/strolch/runtime/query/inmemory/OrderTypeNavigator.java
@@ -16,8 +16,8 @@
 package li.strolch.runtime.query.inmemory;
 
 import li.strolch.model.Order;
-import li.strolch.runtime.agent.ComponentContainer;
-import li.strolch.runtime.agent.ElementMap;
+import li.strolch.runtime.agent.api.ComponentContainer;
+import li.strolch.runtime.agent.api.ElementMap;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/query/inmemory/ResourceTypeNavigator.java b/src/main/java/li/strolch/runtime/query/inmemory/ResourceTypeNavigator.java
index 7ca04a414..4c31020be 100644
--- a/src/main/java/li/strolch/runtime/query/inmemory/ResourceTypeNavigator.java
+++ b/src/main/java/li/strolch/runtime/query/inmemory/ResourceTypeNavigator.java
@@ -16,8 +16,8 @@
 package li.strolch.runtime.query.inmemory;
 
 import li.strolch.model.Resource;
-import li.strolch.runtime.agent.ComponentContainer;
-import li.strolch.runtime.agent.ElementMap;
+import li.strolch.runtime.agent.api.ComponentContainer;
+import li.strolch.runtime.agent.api.ElementMap;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/runtime/query/inmemory/StrolchTypeNavigator.java b/src/main/java/li/strolch/runtime/query/inmemory/StrolchTypeNavigator.java
index dcfb60a9e..d0c9ffe68 100644
--- a/src/main/java/li/strolch/runtime/query/inmemory/StrolchTypeNavigator.java
+++ b/src/main/java/li/strolch/runtime/query/inmemory/StrolchTypeNavigator.java
@@ -18,7 +18,7 @@ package li.strolch.runtime.query.inmemory;
 import java.util.List;
 
 import li.strolch.model.StrolchElement;
-import li.strolch.runtime.agent.ElementMap;
+import li.strolch.runtime.agent.api.ElementMap;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/test/java/li/strolch/runtime/test/component/ComponentContainerTest.java b/src/test/java/li/strolch/runtime/test/component/ComponentContainerTest.java
index bc0e2fae8..9207e03e4 100644
--- a/src/test/java/li/strolch/runtime/test/component/ComponentContainerTest.java
+++ b/src/test/java/li/strolch/runtime/test/component/ComponentContainerTest.java
@@ -26,8 +26,8 @@ import li.strolch.model.Resource;
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.persistence.api.ResourceDao;
 import li.strolch.persistence.api.StrolchTransaction;
-import li.strolch.runtime.agent.ComponentContainer;
-import li.strolch.runtime.agent.StrolchAgent;
+import li.strolch.runtime.agent.api.ComponentContainer;
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.configuration.RuntimeConfiguration;
 import li.strolch.runtime.test.component.model.PersistenceHandlerTest;
 import li.strolch.runtime.test.component.model.ServiceHandlerTest;
diff --git a/src/test/java/li/strolch/runtime/test/component/ControllerDependencyTest.java b/src/test/java/li/strolch/runtime/test/component/ControllerDependencyTest.java
index 86f21b9eb..589b42de6 100644
--- a/src/test/java/li/strolch/runtime/test/component/ControllerDependencyTest.java
+++ b/src/test/java/li/strolch/runtime/test/component/ControllerDependencyTest.java
@@ -25,10 +25,10 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import li.strolch.runtime.agent.ComponentContainerImpl;
-import li.strolch.runtime.agent.ComponentController;
-import li.strolch.runtime.agent.ComponentDependencyAnalyzer;
-import li.strolch.runtime.agent.StrolchComponent;
+import li.strolch.runtime.agent.api.StrolchComponent;
+import li.strolch.runtime.agent.impl.ComponentContainerImpl;
+import li.strolch.runtime.agent.impl.ComponentController;
+import li.strolch.runtime.agent.impl.ComponentDependencyAnalyzer;
 import li.strolch.runtime.configuration.ConfigurationParser;
 import li.strolch.runtime.configuration.StrolchConfiguration;
 import li.strolch.runtime.configuration.StrolchConfigurationException;
diff --git a/src/test/java/li/strolch/runtime/test/component/model/PersistenceHandlerTestImpl.java b/src/test/java/li/strolch/runtime/test/component/model/PersistenceHandlerTestImpl.java
index 86a94c101..3746748ef 100644
--- a/src/test/java/li/strolch/runtime/test/component/model/PersistenceHandlerTestImpl.java
+++ b/src/test/java/li/strolch/runtime/test/component/model/PersistenceHandlerTestImpl.java
@@ -16,8 +16,8 @@
 package li.strolch.runtime.test.component.model;
 
 import li.strolch.model.Resource;
-import li.strolch.runtime.agent.ComponentContainerImpl;
-import li.strolch.runtime.agent.StrolchComponent;
+import li.strolch.runtime.agent.api.StrolchComponent;
+import li.strolch.runtime.agent.impl.ComponentContainerImpl;
 
 public class PersistenceHandlerTestImpl extends StrolchComponent implements PersistenceHandlerTest {
 
diff --git a/src/test/java/li/strolch/runtime/test/component/model/PostInitializerTestImpl.java b/src/test/java/li/strolch/runtime/test/component/model/PostInitializerTestImpl.java
index 7e23fdd3a..215cf93d8 100644
--- a/src/test/java/li/strolch/runtime/test/component/model/PostInitializerTestImpl.java
+++ b/src/test/java/li/strolch/runtime/test/component/model/PostInitializerTestImpl.java
@@ -15,8 +15,8 @@
  */
 package li.strolch.runtime.test.component.model;
 
-import li.strolch.runtime.agent.ComponentContainerImpl;
-import li.strolch.runtime.agent.StrolchComponent;
+import li.strolch.runtime.agent.api.StrolchComponent;
+import li.strolch.runtime.agent.impl.ComponentContainerImpl;
 
 public class PostInitializerTestImpl extends StrolchComponent implements PostInitializerTest {
 
diff --git a/src/test/java/li/strolch/runtime/test/component/model/ServiceHandlerTestImpl.java b/src/test/java/li/strolch/runtime/test/component/model/ServiceHandlerTestImpl.java
index d6d3eae6f..a902ad974 100644
--- a/src/test/java/li/strolch/runtime/test/component/model/ServiceHandlerTestImpl.java
+++ b/src/test/java/li/strolch/runtime/test/component/model/ServiceHandlerTestImpl.java
@@ -15,8 +15,8 @@
  */
 package li.strolch.runtime.test.component.model;
 
-import li.strolch.runtime.agent.ComponentContainerImpl;
-import li.strolch.runtime.agent.StrolchComponent;
+import li.strolch.runtime.agent.api.StrolchComponent;
+import li.strolch.runtime.agent.impl.ComponentContainerImpl;
 
 public class ServiceHandlerTestImpl extends StrolchComponent implements ServiceHandlerTest {
 
diff --git a/src/test/java/li/strolch/runtime/test/query/inmemory/QueryTest.java b/src/test/java/li/strolch/runtime/test/query/inmemory/QueryTest.java
index 2a1a5d831..1bf6532a2 100644
--- a/src/test/java/li/strolch/runtime/test/query/inmemory/QueryTest.java
+++ b/src/test/java/li/strolch/runtime/test/query/inmemory/QueryTest.java
@@ -33,7 +33,7 @@ import li.strolch.model.query.ParameterSelection;
 import li.strolch.model.query.ResourceQuery;
 import li.strolch.model.query.Selection;
 import li.strolch.model.query.StrolchTypeNavigation;
-import li.strolch.runtime.agent.StrolchAgent;
+import li.strolch.runtime.agent.api.StrolchAgent;
 import li.strolch.runtime.query.inmemory.InMemoryOrderQueryVisitor;
 import li.strolch.runtime.query.inmemory.InMemoryQuery;
 import li.strolch.runtime.query.inmemory.InMemoryResourceQueryVisitor;