Index: trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java
===================================================================
--- trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java	(revision 1392)
+++ trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java	(revision 1561)
@@ -40,8 +40,8 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
-import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange;
-import de.ugoe.cs.autoquest.httpmonitor.exchange.Method;
 import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPEventType;
 import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPTarget;
+import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange;
+import de.ugoe.cs.autoquest.plugin.http.logdata.Method;
 import de.ugoe.cs.util.console.TextConsole;
 
Index: trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorTest.java
===================================================================
--- trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorTest.java	(revision 1392)
+++ trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitorTest.java	(revision 1561)
@@ -40,7 +40,4 @@
 import de.ugoe.cs.autoquest.eventcore.Event;
 import de.ugoe.cs.autoquest.http.HTTPTestUtils;
-import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange;
-import de.ugoe.cs.autoquest.httpmonitor.exchange.ObjectFactory;
-import de.ugoe.cs.autoquest.httpmonitor.exchange.Session;
 import de.ugoe.cs.autoquest.httpmonitor.proxy.HttpMonitoringProxy;
 import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser;
@@ -48,4 +45,7 @@
 import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPEventType;
 import de.ugoe.cs.autoquest.plugin.http.eventcore.HTTPTarget;
+import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange;
+import de.ugoe.cs.autoquest.plugin.http.logdata.ObjectFactory;
+import de.ugoe.cs.autoquest.plugin.http.logdata.Session;
 import dummyservice.DummyService;
 import dummyservice.DummyServicePortType;
Index: trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitoringProxyTest.java
===================================================================
--- trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitoringProxyTest.java	(revision 1392)
+++ trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/HttpMonitoringProxyTest.java	(revision 1561)
@@ -45,8 +45,8 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
-import de.ugoe.cs.autoquest.httpmonitor.exchange.HttpExchange;
-import de.ugoe.cs.autoquest.httpmonitor.exchange.Method;
 import de.ugoe.cs.autoquest.httpmonitor.proxy.HttpMonitoringProxy;
 import de.ugoe.cs.autoquest.plugin.http.HTTPLogParser;
+import de.ugoe.cs.autoquest.plugin.http.logdata.HttpExchange;
+import de.ugoe.cs.autoquest.plugin.http.logdata.Method;
 import dummyservice.DummyService;
 import dummyservice.DummyServicePortType;