diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueIT.java
index d3091b99..8cdd6d5a 100644
--- a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueIT.java
+++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueIT.java
@@ -26,7 +26,7 @@
  */
 package org.alfresco.transform.aio;
 
-import org.alfresco.transform.base.AbstractQueueIT;
+import org.alfresco.transform.base.messaging.AbstractQueueIT;
 import org.alfresco.transform.client.model.TransformRequest;
 
 import java.util.UUID;
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
index 14eba807..013c6e85 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
@@ -28,6 +28,7 @@ package org.alfresco.transform.base;
 
 import org.alfresco.transform.base.logging.LogEntry;
 import org.alfresco.transform.base.probes.ProbeTransform;
+import org.alfresco.transform.base.transform.TransformHandler;
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;
 import org.alfresco.transform.common.TransformException;
@@ -98,8 +99,7 @@ public class TransformController
     private List<TransformEngine> transformEngines;
     @Autowired
     private TransformServiceRegistry transformRegistry;
-    @Autowired
-    TransformHandler transformHandler;
+    @Autowired TransformHandler transformHandler;
     @Autowired
     private String coreVersion;
 
@@ -204,7 +204,7 @@ public class TransformController
             @RequestParam(value = CONFIG_VERSION, defaultValue = CONFIG_VERSION_DEFAULT) int configVersion)
     {
         logger.info("GET Transform Config version: " + configVersion);
-        TransformConfig transformConfig = ((TransformRegistryImpl) transformRegistry).getTransformConfig();
+        TransformConfig transformConfig = ((TransformRegistry) transformRegistry).getTransformConfig();
         transformConfig = setOrClearCoreVersion(transformConfig, configVersion);
         return new ResponseEntity<>(transformConfig, OK);
     }
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformRegistryImpl.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformRegistry.java
similarity index 94%
rename from engines/base/src/main/java/org/alfresco/transform/base/TransformRegistryImpl.java
rename to engines/base/src/main/java/org/alfresco/transform/base/TransformRegistry.java
index 97b793d7..60f5598f 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformRegistryImpl.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformRegistry.java
@@ -39,12 +39,9 @@ import java.util.List;
 
 import static org.alfresco.transform.config.CoreVersionDecorator.setCoreVersionOnSingleStepTransformers;
 
-/**
- * Used by clients to work out if a transformation is supported based on the engine_config.json.
- */
-public class TransformRegistryImpl extends AbstractTransformRegistry
+public class TransformRegistry extends AbstractTransformRegistry
 {
-    private static final Logger log = LoggerFactory.getLogger(TransformRegistryImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(TransformRegistry.class);
 
     @Autowired(required = false)
     private List<TransformEngine> transformEngines;
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/config/WebApplicationConfig.java b/engines/base/src/main/java/org/alfresco/transform/base/config/WebApplicationConfig.java
index 2781c579..7aeab997 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/config/WebApplicationConfig.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/config/WebApplicationConfig.java
@@ -26,13 +26,12 @@
  */
 package org.alfresco.transform.base.config;
 
-import org.alfresco.transform.base.TransformInterceptor;
-import org.alfresco.transform.base.TransformRegistryImpl;
+import org.alfresco.transform.base.html.TransformInterceptor;
+import org.alfresco.transform.base.TransformRegistry;
 import org.alfresco.transform.base.clients.AlfrescoSharedFileStoreClient;
 import org.alfresco.transform.common.TransformerDebug;
 import org.alfresco.transform.messages.TransformRequestValidator;
 import org.alfresco.transform.registry.TransformServiceRegistry;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -89,7 +88,7 @@ public class WebApplicationConfig implements WebMvcConfigurer
     @Bean
     public TransformServiceRegistry transformRegistry()
     {
-        return new TransformRegistryImpl();
+        return new TransformRegistry();
     }
 
     @Bean
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java b/engines/base/src/main/java/org/alfresco/transform/base/html/TransformInterceptor.java
similarity index 97%
rename from engines/base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java
rename to engines/base/src/main/java/org/alfresco/transform/base/html/TransformInterceptor.java
index 2529d96c..0c1a546d 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/html/TransformInterceptor.java
@@ -24,7 +24,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.html;
 
 import static org.alfresco.transform.base.fs.FileManager.SOURCE_FILE;
 import static org.alfresco.transform.base.fs.FileManager.TARGET_FILE;
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/QueueTransformService.java
similarity index 96%
rename from engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java
rename to engines/base/src/main/java/org/alfresco/transform/base/messaging/QueueTransformService.java
index 93753fbb..9c296ff5 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/messaging/QueueTransformService.java
@@ -24,10 +24,9 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.messaging;
 
-import org.alfresco.transform.base.messaging.TransformMessageConverter;
-import org.alfresco.transform.base.messaging.TransformReplySender;
+import org.alfresco.transform.base.transform.TransformHandler;
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;
 import org.alfresco.transform.common.TransformException;
@@ -36,7 +35,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.jms.support.converter.MessageConversionException;
 import org.springframework.stereotype.Component;
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java b/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java
index 70b3af7d..bff18096 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/probes/ProbeTransform.java
@@ -26,7 +26,7 @@
  */
 package org.alfresco.transform.base.probes;
 
-import org.alfresco.transform.base.TransformHandler;
+import org.alfresco.transform.base.transform.TransformHandler;
 import org.alfresco.transform.base.logging.LogEntry;
 import org.alfresco.transform.common.TransformException;
 import org.slf4j.Logger;
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformHandler.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java
similarity index 99%
rename from engines/base/src/main/java/org/alfresco/transform/base/TransformHandler.java
rename to engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java
index 681f40ed..ba841405 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformHandler.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformHandler.java
@@ -24,8 +24,10 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.transform;
 
+import org.alfresco.transform.base.CustomTransformer;
+import org.alfresco.transform.base.TransformEngine;
 import org.alfresco.transform.base.clients.AlfrescoSharedFileStoreClient;
 import org.alfresco.transform.base.messaging.TransformReplySender;
 import org.alfresco.transform.base.model.FileRefResponse;
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformManagerImpl.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformManagerImpl.java
similarity index 98%
rename from engines/base/src/main/java/org/alfresco/transform/base/TransformManagerImpl.java
rename to engines/base/src/main/java/org/alfresco/transform/base/transform/TransformManagerImpl.java
index 4e64f3ac..23f731e1 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformManagerImpl.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformManagerImpl.java
@@ -24,8 +24,9 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.transform;
 
+import org.alfresco.transform.base.TransformManager;
 import org.alfresco.transform.base.fs.FileManager;
 import org.alfresco.transform.base.util.OutputStreamLengthRecorder;
 import org.slf4j.Logger;
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformProcess.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformProcess.java
similarity index 97%
rename from engines/base/src/main/java/org/alfresco/transform/base/TransformProcess.java
rename to engines/base/src/main/java/org/alfresco/transform/base/transform/TransformProcess.java
index c4bd0304..dbfb3c5a 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformProcess.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformProcess.java
@@ -24,8 +24,10 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.transform;
 
+import org.alfresco.transform.base.CustomTransformer;
+import org.alfresco.transform.base.TransformController;
 import org.alfresco.transform.base.logging.LogEntry;
 import org.alfresco.transform.client.model.TransformRequest;
 import org.alfresco.transform.common.TransformException;
@@ -36,7 +38,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.jms.Destination;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
-import java.io.OutputStream;
 import java.util.Map;
 
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformStreamHandler.java b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformStreamHandler.java
similarity index 95%
rename from engines/base/src/main/java/org/alfresco/transform/base/TransformStreamHandler.java
rename to engines/base/src/main/java/org/alfresco/transform/base/transform/TransformStreamHandler.java
index c8c0ce4a..e6e4bf98 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformStreamHandler.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/transform/TransformStreamHandler.java
@@ -24,7 +24,10 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.transform;
+
+import org.alfresco.transform.base.CustomTransformer;
+import org.alfresco.transform.base.TransformManager;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/AbstractBaseTest.java b/engines/base/src/test/java/org/alfresco/transform/base/AbstractBaseTest.java
index 247a3e97..ea8fd24f 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/AbstractBaseTest.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/AbstractBaseTest.java
@@ -33,6 +33,7 @@ import org.alfresco.transform.base.executors.RuntimeExec;
 import org.alfresco.transform.base.model.FileRefEntity;
 import org.alfresco.transform.base.model.FileRefResponse;
 import org.alfresco.transform.base.probes.ProbeTransform;
+import org.alfresco.transform.base.transform.TransformHandler;
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;
 import org.alfresco.transform.registry.TransformServiceRegistry;
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java
index 6d4d0a16..18faf9a5 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java
@@ -39,6 +39,8 @@ import org.alfresco.transform.base.fakes.FakeTransformerPdf2Png;
 import org.alfresco.transform.base.fakes.FakeTransformerTxT2Pdf;
 import org.alfresco.transform.base.model.FileRefEntity;
 import org.alfresco.transform.base.model.FileRefResponse;
+import org.alfresco.transform.base.transform.TransformHandler;
+import org.alfresco.transform.base.transform.TransformHandlerTest;
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;
 import org.alfresco.transform.config.TransformConfig;
@@ -104,7 +106,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
- * Tests the endpoints of the TransformController. Testing of transforms is limit as in that is covered by
+ * Tests the endpoints of the TransformController. Testing of transforms is limited as in that is covered by
  * {@link TransformHandlerTest}.
  *
  * Also see {@link TransformControllerAllInOneTest}.
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/RestTest.java b/engines/base/src/test/java/org/alfresco/transform/base/http/RestTest.java
similarity index 94%
rename from engines/base/src/test/java/org/alfresco/transform/base/RestTest.java
rename to engines/base/src/test/java/org/alfresco/transform/base/http/RestTest.java
index 93dd9c0c..fd5115de 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/RestTest.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/http/RestTest.java
@@ -24,11 +24,12 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.http;
 
 import org.alfresco.transform.base.fakes.FakeTransformEngineWithTwoCustomTransformers;
 import org.alfresco.transform.base.fakes.FakeTransformerPdf2Png;
 import org.alfresco.transform.base.fakes.FakeTransformerTxT2Pdf;
+import org.alfresco.transform.base.transform.TransformHandlerTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -51,9 +52,7 @@ import static org.springframework.http.HttpMethod.POST;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA;
 
 /**
- * Very basic requests to the TransformController using http. No longer extended in t-engines as all http interaction
- * is now done by the base. Also see {@link TransformControllerTest} and {@link TransformHandlerTest} for more extensive
- * tests.
+ * Very basic requests to the TransformController using http.
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
     classes={org.alfresco.transform.base.Application.class})
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueIT.java b/engines/base/src/test/java/org/alfresco/transform/base/messaging/AbstractQueueIT.java
similarity index 98%
rename from engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueIT.java
rename to engines/base/src/test/java/org/alfresco/transform/base/messaging/AbstractQueueIT.java
index c33ff88b..3696e90e 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueIT.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/messaging/AbstractQueueIT.java
@@ -24,7 +24,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.messaging;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/QueueTransformServiceTest.java b/engines/base/src/test/java/org/alfresco/transform/base/messaging/QueueTransformServiceTest.java
similarity index 95%
rename from engines/base/src/test/java/org/alfresco/transform/base/QueueTransformServiceTest.java
rename to engines/base/src/test/java/org/alfresco/transform/base/messaging/QueueTransformServiceTest.java
index fc260165..be31d970 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/QueueTransformServiceTest.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/messaging/QueueTransformServiceTest.java
@@ -25,10 +25,9 @@
  * #L%
  */
 
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.messaging;
 
-import org.alfresco.transform.base.messaging.TransformMessageConverter;
-import org.alfresco.transform.base.messaging.TransformReplySender;
+import org.alfresco.transform.base.transform.TransformHandler;
 import org.alfresco.transform.client.model.TransformReply;
 import org.alfresco.transform.client.model.TransformRequest;
 import org.apache.activemq.command.ActiveMQObjectMessage;
@@ -38,8 +37,6 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.jms.support.converter.MessageConversionException;
 
 import javax.jms.Destination;
@@ -47,13 +44,11 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 
 import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.CREATED;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/AbstractMetadataExtractsIT.java b/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java
similarity index 99%
rename from engines/base/src/test/java/org/alfresco/transform/base/AbstractMetadataExtractsIT.java
rename to engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java
index 1ba30730..819cc23c 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/AbstractMetadataExtractsIT.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java
@@ -24,7 +24,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.metadata;
 
 import static java.text.MessageFormat.format;
 import static org.alfresco.transform.base.clients.HttpClient.sendTRequest;
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/TransformHandlerTest.java b/engines/base/src/test/java/org/alfresco/transform/base/transform/TransformHandlerTest.java
similarity index 81%
rename from engines/base/src/test/java/org/alfresco/transform/base/TransformHandlerTest.java
rename to engines/base/src/test/java/org/alfresco/transform/base/transform/TransformHandlerTest.java
index 3ee38d8d..7fb15ab5 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/TransformHandlerTest.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/transform/TransformHandlerTest.java
@@ -24,32 +24,15 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.transform;
 
-import org.alfresco.transform.client.model.TransformReply;
-import org.alfresco.transform.client.model.TransformRequest;
-import org.junit.jupiter.api.Test;
+import org.alfresco.transform.base.transform.TransformHandler;
+import org.alfresco.transform.base.transform.TransformProcess;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
-import java.io.File;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL;
-import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-import static org.springframework.http.HttpHeaders.ACCEPT;
-import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
  * Tests {@link TransformHandler} and {@link TransformProcess}.
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/TransformStreamHandlerTest.java b/engines/base/src/test/java/org/alfresco/transform/base/transform/TransformStreamHandlerTest.java
similarity index 99%
rename from engines/base/src/test/java/org/alfresco/transform/base/TransformStreamHandlerTest.java
rename to engines/base/src/test/java/org/alfresco/transform/base/transform/TransformStreamHandlerTest.java
index e2f184ba..67130e85 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/TransformStreamHandlerTest.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/transform/TransformStreamHandlerTest.java
@@ -24,8 +24,9 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.transform.base;
+package org.alfresco.transform.base.transform;
 
+import org.alfresco.transform.base.CustomTransformer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
diff --git a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueIT.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueIT.java
index 2d57b99f..5681aa8c 100644
--- a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueIT.java
+++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueIT.java
@@ -32,7 +32,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG;
 import java.util.UUID;
 
 import org.alfresco.transform.client.model.TransformRequest;
-import org.alfresco.transform.base.AbstractQueueIT;
+import org.alfresco.transform.base.messaging.AbstractQueueIT;
 
 /**
  * @author Lucian Tuca
diff --git a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueIT.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueIT.java
index 4f3b25c6..b8d89fac 100644
--- a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueIT.java
+++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueIT.java
@@ -31,7 +31,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCES
 import java.util.UUID;
 
 import org.alfresco.transform.client.model.TransformRequest;
-import org.alfresco.transform.base.AbstractQueueIT;
+import org.alfresco.transform.base.messaging.AbstractQueueIT;
 
 /**
  * @author Lucian Tuca
diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java
index 9b19a305..2414c558 100644
--- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java
+++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java
@@ -31,7 +31,7 @@ import static org.alfresco.transform.base.clients.FileInfo.testFile;
 
 import java.util.stream.Stream;
 
-import org.alfresco.transform.base.AbstractMetadataExtractsIT;
+import org.alfresco.transform.base.metadata.AbstractMetadataExtractsIT;
 import org.alfresco.transform.base.clients.FileInfo;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueIT.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueIT.java
index cee169c9..ebcbf983 100644
--- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueIT.java
+++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueIT.java
@@ -32,7 +32,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN;
 import java.util.UUID;
 
 import org.alfresco.transform.client.model.TransformRequest;
-import org.alfresco.transform.base.AbstractQueueIT;
+import org.alfresco.transform.base.messaging.AbstractQueueIT;
 
 public class MiscQueueIT extends AbstractQueueIT
 {
diff --git a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueIT.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueIT.java
index a30a33ac..5658d35e 100644
--- a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueIT.java
+++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueIT.java
@@ -32,7 +32,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF;
 import java.util.UUID;
 
 import org.alfresco.transform.client.model.TransformRequest;
-import org.alfresco.transform.base.AbstractQueueIT;
+import org.alfresco.transform.base.messaging.AbstractQueueIT;
 
 /**
  * @author Lucian Tuca
diff --git a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaMetadataExtractsIT.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaMetadataExtractsIT.java
index c3b1164a..427d8bc2 100644
--- a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaMetadataExtractsIT.java
+++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaMetadataExtractsIT.java
@@ -74,7 +74,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_NEF;
 
 import java.util.stream.Stream;
 
-import org.alfresco.transform.base.AbstractMetadataExtractsIT;
+import org.alfresco.transform.base.metadata.AbstractMetadataExtractsIT;
 import org.alfresco.transform.base.clients.FileInfo;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
diff --git a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueIT.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueIT.java
index 5700d431..34887f63 100644
--- a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueIT.java
+++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueIT.java
@@ -32,7 +32,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN;
 import java.util.UUID;
 
 import org.alfresco.transform.client.model.TransformRequest;
-import org.alfresco.transform.base.AbstractQueueIT;
+import org.alfresco.transform.base.messaging.AbstractQueueIT;
 
 /**
  * @author Lucian Tuca