diff --git a/example/config/StrolchConfiguration.xml b/example/config/StrolchConfiguration.xml
index a1997fc..4283c78 100644
--- a/example/config/StrolchConfiguration.xml
+++ b/example/config/StrolchConfiguration.xml
@@ -92,8 +92,8 @@
 
         <Component>
             <name>SessionHandler</name>
-            <api>li.strolch.rest.StrolchSessionHandler</api>
-            <impl>li.strolch.rest.DefaultStrolchSessionHandler</impl>
+            <api>li.strolch.runtime.sessions.StrolchSessionHandler</api>
+            <impl>li.strolch.runtime.sessions.DefaultStrolchSessionHandler</impl>
             <depends>PrivilegeHandler</depends>
             <Properties>
                 <session.ttl.minutes>30</session.ttl.minutes>
diff --git a/plc-core/src/test/resources/test-runtime/config/StrolchConfiguration.xml b/plc-core/src/test/resources/test-runtime/config/StrolchConfiguration.xml
index 825865f..ace8520 100644
--- a/plc-core/src/test/resources/test-runtime/config/StrolchConfiguration.xml
+++ b/plc-core/src/test/resources/test-runtime/config/StrolchConfiguration.xml
@@ -52,8 +52,8 @@
 
         <Component>
             <name>SessionHandler</name>
-            <api>li.strolch.rest.StrolchSessionHandler</api>
-            <impl>li.strolch.rest.DefaultStrolchSessionHandler</impl>
+            <api>li.strolch.runtime.sessions.StrolchSessionHandler</api>
+            <impl>li.strolch.runtime.sessions.DefaultStrolchSessionHandler</impl>
             <depends>PrivilegeHandler</depends>
             <Properties>
                 <session.ttl.minutes>30</session.ttl.minutes>
diff --git a/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwServerHandler.java b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwServerHandler.java
index 522da36..830e21b 100644
--- a/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwServerHandler.java
+++ b/plc-gw-server/src/main/java/li/strolch/plc/gw/server/PlcGwServerHandler.java
@@ -34,7 +34,7 @@ import li.strolch.privilege.base.PrivilegeException;
 import li.strolch.privilege.model.Certificate;
 import li.strolch.privilege.model.Usage;
 import li.strolch.privilege.model.UserRep;
-import li.strolch.rest.StrolchSessionHandler;
+import li.strolch.runtime.sessions.StrolchSessionHandler;
 import li.strolch.runtime.configuration.ComponentConfiguration;
 import li.strolch.runtime.privilege.PrivilegedRunnable;
 import li.strolch.runtime.privilege.PrivilegedRunnableWithResult;