5 files changed, 11 insertions, 12 deletions
diff --git a/src/test/java/at/gv/egiz/moazs/ConfigProfileGeneratorTest.java b/src/test/java/at/gv/egiz/moazs/ConfigProfileGeneratorTest.java
index 3157447..ff981a9 100644
--- a/src/test/java/at/gv/egiz/moazs/ConfigProfileGeneratorTest.java
+++ b/src/test/java/at/gv/egiz/moazs/ConfigProfileGeneratorTest.java
@@ -1,6 +1,6 @@
 package at.gv.egiz.moazs;
 
-import at.gv.egiz.moazs.mzs.MzsValidator;
+import at.gv.egiz.moazs.scheme.MzsDeliveryRequestValidator;
 import at.gv.egiz.moazs.preprocess.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,7 +25,7 @@ public class ConfigProfileGeneratorTest {
     private ConfigUtil util;
 
     @Mock
-    private MzsValidator validator;
+    private MzsDeliveryRequestValidator validator;
 
     @Mock
     private SpringPropertiesFacade properties;
diff --git a/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java b/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
index 424dce1..3bc0d3b 100644
--- a/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
+++ b/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
@@ -1,6 +1,6 @@
 package at.gv.egiz.moazs;
 
-import at.gv.egiz.moazs.mzs.MzsValidator;
+import at.gv.egiz.moazs.scheme.MzsDeliveryRequestValidator;
 import at.gv.egiz.moazs.preprocess.ConfigUtil;
 import at.gv.egiz.moazs.preprocess.DeliveryRequestAugmenter;
 import at.gv.zustellung.app2mzs.xsd.ConfigType;
@@ -29,7 +29,7 @@ public class DeliveryRequestAugmenterTest {
     private ConfigUtil configUtil;
 
     @Mock
-    private MzsValidator validator;
+    private MzsDeliveryRequestValidator validator;
 
     @Before
     public void setupMock() {
diff --git a/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java b/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
index bb9633e..70e300c 100644
--- a/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
+++ b/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
@@ -1,6 +1,6 @@
 package at.gv.egiz.moazs;
 
-import at.gv.egiz.moazs.msg.ClientFactory;
+import at.gv.egiz.moazs.util.ClientFactory;
 import at.gv.egiz.moazs.scheme.Marshaller;
 import at.gv.zustellung.app2mzs.xsd.ClientType;
 import at.gv.zustellung.app2mzs.xsd.KeyStoreType;
diff --git a/src/test/java/at/gv/egiz/moazs/SameThreadDeliveryPipelineTest.java b/src/test/java/at/gv/egiz/moazs/SingleThreadedDeliveryPipelineTest.java
index 74e6157..c08d567 100644
--- a/src/test/java/at/gv/egiz/moazs/SameThreadDeliveryPipelineTest.java
+++ b/src/test/java/at/gv/egiz/moazs/SingleThreadedDeliveryPipelineTest.java
@@ -1,12 +1,12 @@
 package at.gv.egiz.moazs;
 
-import at.gv.egiz.moazs.msg.ClientFactory;
+import at.gv.egiz.moazs.util.ClientFactory;
 import at.gv.egiz.moazs.pipeline.DeliveryPipeline;
-import at.gv.egiz.moazs.pipeline.SameThreadDeliveryPipeline;
+import at.gv.egiz.moazs.pipeline.SingleThreadedDeliveryPipeline;
 import at.gv.egiz.moazs.repository.DeliveryRepository;
 import at.gv.egiz.moazs.repository.InMemoryDeliveryRepository;
 import at.gv.egiz.moazs.scheme.Mzs2MsgConverter;
-import at.gv.egiz.moazs.tnvz.TnvzHelper;
+import at.gv.egiz.moazs.scheme.TnvzHelper;
 import at.gv.egiz.moazs.verify.MoaSPSSSignatureVerifier;
 import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
 import at.gv.zustellung.msg.xsd.App2ZusePort;
@@ -18,7 +18,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static at.gv.egiz.moazs.MoaZSException.moaZSException;
@@ -35,7 +34,7 @@ import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
-public class SameThreadDeliveryPipelineTest {
+public class SingleThreadedDeliveryPipelineTest {
 
     private DeliveryRepository repository = new InMemoryDeliveryRepository();
 
@@ -62,7 +61,7 @@ public class SameThreadDeliveryPipelineTest {
 
     @Before
     public void setup() {
-        pipeline = new SameThreadDeliveryPipeline(repository, tnvzHelper, converter, clientFactory, verifier);
+        pipeline = new SingleThreadedDeliveryPipeline(repository, tnvzHelper, converter, clientFactory, verifier);
     }
 
     @Test
diff --git a/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java b/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
index 4425297..66873d4 100644
--- a/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
+++ b/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
@@ -2,7 +2,7 @@ package at.gv.egiz.moazs;
 
 
 import at.gv.egiz.moazs.scheme.Mzs2MsgConverter;
-import at.gv.egiz.moazs.tnvz.TnvzHelper;
+import at.gv.egiz.moazs.scheme.TnvzHelper;
 import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
 import at.gv.zustellung.app2mzs.xsd.persondata.IdentificationType;
 import at.gv.zustellung.tnvz.xsd.MimeTypeList;