diff --git a/manager/src/main/java/org/openremote/manager/custom/telematics/TelematicsDeviceProcessor.java b/manager/src/main/java/org/openremote/manager/custom/telematics/TelematicsDeviceProcessor.java
new file mode 100644
index 0000000..692689c
--- /dev/null
+++ b/manager/src/main/java/org/openremote/manager/custom/telematics/TelematicsDeviceProcessor.java
@@ -0,0 +1,9 @@
+package org.openremote.manager.custom.telematics;
+
+/*
+* Interface to be implemented by all handlers for device-specific payload parsing of Telematics equipment.
+*
+*
+* */
+public interface TelematicsDeviceProcessor {
+}
diff --git a/manager/src/main/java/org/openremote/manager/custom/teltonika/TeltonikaMQTTHandler.java b/manager/src/main/java/org/openremote/manager/custom/telematics/processors/teltonika/TeltonikaMQTTHandler.java
similarity index 99%
rename from manager/src/main/java/org/openremote/manager/custom/teltonika/TeltonikaMQTTHandler.java
rename to manager/src/main/java/org/openremote/manager/custom/telematics/processors/teltonika/TeltonikaMQTTHandler.java
index 74e9d1a..e553825 100644
--- a/manager/src/main/java/org/openremote/manager/custom/teltonika/TeltonikaMQTTHandler.java
+++ b/manager/src/main/java/org/openremote/manager/custom/telematics/processors/teltonika/TeltonikaMQTTHandler.java
@@ -1,4 +1,4 @@
-package org.openremote.manager.custom.teltonika;
+package org.openremote.manager.custom.telematics.processors.teltonika;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -10,7 +10,7 @@
 import org.openremote.container.util.UniqueIdentifierGenerator;
 import org.openremote.manager.asset.AssetProcessingService;
 import org.openremote.manager.asset.AssetStorageService;
-import org.openremote.manager.custom.teltonika.helpers.TeltonikaAttributeProcessingHelper;
+import org.openremote.manager.custom.telematics.processors.teltonika.helpers.TeltonikaAttributeProcessingHelper;
 import org.openremote.manager.datapoint.AssetDatapointService;
 import org.openremote.manager.mqtt.MQTTHandler;
 import org.openremote.manager.mqtt.Topic;
@@ -35,7 +35,6 @@
 import java.nio.file.Paths;
 import java.sql.Timestamp;
 import java.text.MessageFormat;
-import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/manager/src/main/java/org/openremote/manager/custom/teltonika/helpers/TeltonikaAttributeProcessingHelper.java b/manager/src/main/java/org/openremote/manager/custom/telematics/processors/teltonika/helpers/TeltonikaAttributeProcessingHelper.java
similarity index 99%
rename from manager/src/main/java/org/openremote/manager/custom/teltonika/helpers/TeltonikaAttributeProcessingHelper.java
rename to manager/src/main/java/org/openremote/manager/custom/telematics/processors/teltonika/helpers/TeltonikaAttributeProcessingHelper.java
index c97b970..54a77b6 100644
--- a/manager/src/main/java/org/openremote/manager/custom/teltonika/helpers/TeltonikaAttributeProcessingHelper.java
+++ b/manager/src/main/java/org/openremote/manager/custom/telematics/processors/teltonika/helpers/TeltonikaAttributeProcessingHelper.java
@@ -1,4 +1,4 @@
-package org.openremote.manager.custom.teltonika.helpers;
+package org.openremote.manager.custom.telematics.processors.teltonika.helpers;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/manager/src/main/resources/META-INF/services/org.openremote.manager.mqtt.MQTTHandler b/manager/src/main/resources/META-INF/services/org.openremote.manager.mqtt.MQTTHandler
index efbe5c1..c24ebbf 100644
--- a/manager/src/main/resources/META-INF/services/org.openremote.manager.mqtt.MQTTHandler
+++ b/manager/src/main/resources/META-INF/services/org.openremote.manager.mqtt.MQTTHandler
@@ -1 +1 @@
-org.openremote.manager.custom.teltonika.TeltonikaMQTTHandler
+org.openremote.manager.custom.telematics.processors.teltonika.TeltonikaMQTTHandler
diff --git a/test/src/test/groovy/org/openremote/test/custom/TeltonikaMQTTProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/custom/TeltonikaMQTTProtocolTest.groovy
index 59b1d0d..71b0458 100644
--- a/test/src/test/groovy/org/openremote/test/custom/TeltonikaMQTTProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/custom/TeltonikaMQTTProtocolTest.groovy
@@ -10,7 +10,7 @@ import org.openremote.manager.asset.AssetProcessingService
 import org.openremote.manager.asset.AssetStorageService
 import org.openremote.manager.event.ClientEventService
 import org.openremote.manager.mqtt.MQTTBrokerService
-import org.openremote.manager.custom.teltonika.TeltonikaMQTTHandler
+import org.openremote.manager.custom.telematics.processors.teltonika.TeltonikaMQTTHandler
 import org.openremote.manager.setup.SetupService
 import org.openremote.manager.setup.custom.CustomKeycloakSetup
 import org.openremote.model.Constants