diff --git a/README.adoc b/README.adoc
index a9fbe8c0..18ecb155 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,5 +1,5 @@
 
-= agrirouter-api-java
+= agrirouter-sdk-java
 :imagesdir: assets/images
 :toc:
 :toc-title:
@@ -21,14 +21,14 @@ of IT solutions. We also provide professional IT consulting services and trainin
 the whole project during the development in the field of test management and are currently responsible for the development
 support of the platform.
 
-We are active maintainers of the API and are using the API for internal testing purposes as well. Therefore we have a
+We are active maintainers of the SDK and are using the SDK for internal testing purposes as well. Therefore we have a
 high interest in a stable and usable interface to connect to the agrirouter.
 
 Feel free to get in touch by visiting our https://www.lmis.de[website] or contacting us via GitHub.
 
 == The current project you're looking at
 
-This project contains the API for the communication with the agrirouter. Everything you need for the onboarding process, secure communication and much more.
+This project contains the SDK for the communication with the agrirouter. Everything you need for the onboarding process, secure communication and much more.
 
 == Releases
 
@@ -42,11 +42,15 @@ The `api` module contains interfaces, common helper classes and DTOs as well as
 
 === `impl` Module
 
-The `impl` module contains the implementation of the given API defined by the `api` module.
+The `impl` module contains the implementation of the given SDK defined by the `api` module.
 
 === `convenience` Module
 
-The `convenience` module contains common implementations for different problems which are not located within the API. Those could be capability setting, MQTT client creation or other common problems that are normally not part of the API.
+The `convenience` module contains common implementations for different problems which are not located within the SDK. Those could be capability setting, MQTT client creation or other common problems that are normally not part of the SDK.
+
+=== `test` Module
+
+The `test` module contains integration tests not only for the SDK, but also for different scenarios.
 
 === Integration
 
@@ -55,8 +59,8 @@ We are supporting JDK 8 and later, releases are build using a JDK 8 to have comp
 
 == Certificates for the communication
 
-We do not longer maintain the certificates within the API.
-Maintaining them in the API would mean, that we have to release the API with every change of the certificate.
+We do not longer maintain the certificates within the SDK.
+Maintaining them in the SDK would mean, that we have to release the SDK with every change of the certificate.
 Therefore feel free to add the root certificates to a Java Key Store add reference it within your application.
 
 === Adding a certificate to the JKS
diff --git a/agrirouter-api-java-api/pom.xml b/agrirouter-sdk-java-api/pom.xml
similarity index 96%
rename from agrirouter-api-java-api/pom.xml
rename to agrirouter-sdk-java-api/pom.xml
index 1faf659f..9c043186 100644
--- a/agrirouter-api-java-api/pom.xml
+++ b/agrirouter-sdk-java-api/pom.xml
@@ -4,11 +4,11 @@
 
     <parent>
         <groupId>com.agrirouter.api</groupId>
-        <artifactId>agrirouter-api-java</artifactId>
+        <artifactId>agrirouter-sdk-java</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <name>AGRIROUTER API JAVA - API</name>
-    <artifactId>agrirouter-api-java-api</artifactId>
+    <name>AGRIROUTER SDK JAVA - API</name>
+    <artifactId>agrirouter-sdk-java-api</artifactId>
 
     <dependencies>
         <dependency>
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/cancellation/CancellationToken.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/cancellation/CancellationToken.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/cancellation/CancellationToken.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/cancellation/CancellationToken.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/cancellation/DefaultCancellationToken.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/cancellation/DefaultCancellationToken.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/cancellation/DefaultCancellationToken.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/cancellation/DefaultCancellationToken.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/env/Environment.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/env/Environment.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/env/Environment.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/env/Environment.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/env/Production.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/env/Production.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/env/Production.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/env/Production.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/env/QA.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/env/QA.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/env/QA.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/env/QA.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CertificationTypeNotSupportedException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CertificationTypeNotSupportedException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CertificationTypeNotSupportedException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CertificationTypeNotSupportedException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateDynamicKeyStoreException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateDynamicKeyStoreException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateDynamicKeyStoreException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateDynamicKeyStoreException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateMqttClientException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateMqttClientException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateMqttClientException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateMqttClientException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateMqttOptionException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateMqttOptionException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateMqttOptionException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateMqttOptionException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreatePrivateKeyException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreatePrivateKeyException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreatePrivateKeyException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreatePrivateKeyException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreatePublicKeyException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreatePublicKeyException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreatePublicKeyException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreatePublicKeyException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateSignatureException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateSignatureException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateSignatureException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotCreateSignatureException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodeHexException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodeHexException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodeHexException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodeHexException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodeMessageException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodeMessageException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodeMessageException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodeMessageException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodePushNotificationException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodePushNotificationException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodePushNotificationException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotDecodePushNotificationException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotEncodeMessageException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotEncodeMessageException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotEncodeMessageException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotEncodeMessageException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotFetchCookiesException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotFetchCookiesException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotFetchCookiesException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotFetchCookiesException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotFindTimeZoneException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotFindTimeZoneException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotFindTimeZoneException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotFindTimeZoneException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotGetRegistrationCodeException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotGetRegistrationCodeException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotGetRegistrationCodeException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotGetRegistrationCodeException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotOffboardVirtualCommunicationUnitException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotOffboardVirtualCommunicationUnitException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotOffboardVirtualCommunicationUnitException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotOffboardVirtualCommunicationUnitException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotOnboardVirtualCommunicationUnitException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotOnboardVirtualCommunicationUnitException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotOnboardVirtualCommunicationUnitException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotOnboardVirtualCommunicationUnitException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotSendMqttMessageException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotSendMqttMessageException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotSendMqttMessageException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotSendMqttMessageException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotVerifySecuredOnboardingRequestException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotVerifySecuredOnboardingRequestException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotVerifySecuredOnboardingRequestException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotVerifySecuredOnboardingRequestException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotVerifySignatureException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotVerifySignatureException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotVerifySignatureException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/CouldNotVerifySignatureException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/ForbiddenRequestException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/ForbiddenRequestException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/ForbiddenRequestException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/ForbiddenRequestException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/IllegalParameterDefinitionException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/IllegalParameterDefinitionException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/IllegalParameterDefinitionException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/IllegalParameterDefinitionException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidHttpStatusException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidHttpStatusException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidHttpStatusException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidHttpStatusException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidSignatureException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidSignatureException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidSignatureException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidSignatureException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidUrlForRequestException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidUrlForRequestException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidUrlForRequestException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/InvalidUrlForRequestException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/OnboardingException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/OnboardingException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/OnboardingException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/OnboardingException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/RevokingException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/RevokingException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/RevokingException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/RevokingException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/UnauthorizedRequestException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/UnauthorizedRequestException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/UnauthorizedRequestException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/UnauthorizedRequestException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/UnexpectedHttpStatusException.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/UnexpectedHttpStatusException.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/exception/UnexpectedHttpStatusException.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/exception/UnexpectedHttpStatusException.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/LoggingEnabledService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/LoggingEnabledService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/LoggingEnabledService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/LoggingEnabledService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/ParameterValidation.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/RequestLogging.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/RequestLogging.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/RequestLogging.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/RequestLogging.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/RevokingService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/RevokingService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/RevokingService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/RevokingService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/SendMessageService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/DecodeMessageService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/DecodeMessageService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/DecodeMessageService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/DecodeMessageService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/DecodePushNotificationService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/DecodePushNotificationService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/DecodePushNotificationService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/DecodePushNotificationService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/EncodeMessageService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/EncodeMessageService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/EncodeMessageService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/EncodeMessageService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/MessageDecoder.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/MessageDecoder.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/MessageDecoder.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/encoding/MessageDecoder.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOffboardingService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOffboardingService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOffboardingService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOffboardingService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOnboardingService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOnboardingService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOnboardingService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/CloudOnboardingService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/DeleteMessageService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/DeleteMessageService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/DeleteMessageService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/DeleteMessageService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/FetchMessageService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/FetchMessageService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/FetchMessageService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/FetchMessageService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/ListEndpointsService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/ListEndpointsService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/ListEndpointsService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/ListEndpointsService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageConfirmationService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageConfirmationService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageConfirmationService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageConfirmationService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageHeaderQueryService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageHeaderQueryService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageHeaderQueryService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageHeaderQueryService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageQueryService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageQueryService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageQueryService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessageQueryService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/MessagingService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetCapabilityService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetCapabilityService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetCapabilityService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetCapabilityService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetSubscriptionService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetSubscriptionService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetSubscriptionService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/http/SetSubscriptionService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOffboardingService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOffboardingService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOffboardingService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOffboardingService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOnboardingService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOnboardingService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOnboardingService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/CloudOnboardingService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/DeleteMessageService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/DeleteMessageService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/DeleteMessageService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/DeleteMessageService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/ListEndpointsService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/ListEndpointsService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/ListEndpointsService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/ListEndpointsService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageConfirmationService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageConfirmationService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageConfirmationService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageConfirmationService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageHeaderQueryService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageHeaderQueryService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageHeaderQueryService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageHeaderQueryService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageQueryService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageQueryService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageQueryService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessageQueryService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/MessagingService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetCapabilityService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetCapabilityService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetCapabilityService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetCapabilityService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetSubscriptionService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetSubscriptionService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetSubscriptionService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/messaging/mqtt/SetSubscriptionService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/OnboardingService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/OnboardingService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/OnboardingService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/OnboardingService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/secured/AuthorizationRequestService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/secured/AuthorizationRequestService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/secured/AuthorizationRequestService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/secured/AuthorizationRequestService.java
diff --git a/agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/secured/OnboardingService.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/secured/OnboardingService.java
similarity index 100%
rename from agrirouter-api-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/secured/OnboardingService.java
rename to agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/onboard/secured/OnboardingService.java
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/DecodeMessageResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/DecodeMessageResponse.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/DecodeMessageResponse.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/DecodeMessageResponse.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/EncodedMessage.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/EncodedMessage.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/EncodedMessage.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/EncodedMessage.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/inner/Header.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/inner/Header.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/inner/Header.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/inner/Header.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/inner/Message.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/inner/Message.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/inner/Message.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/encoding/inner/Message.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/FetchMessageResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/FetchMessageResponse.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/FetchMessageResponse.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/FetchMessageResponse.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/MessageConfirmationRequest.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/MessageConfirmationRequest.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/MessageConfirmationRequest.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/MessageConfirmationRequest.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/SendMessageRequest.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/SendMessageRequest.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/SendMessageRequest.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/SendMessageRequest.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/inner/Message.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/inner/Message.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/inner/Message.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/messaging/inner/Message.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingError.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingError.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingError.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingError.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingRequest.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingRequest.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingRequest.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingRequest.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingResponse.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingResponse.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/OnboardingResponse.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/RouterDevice.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/RouterDevice.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/RouterDevice.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/RouterDevice.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/inner/Authentication.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/inner/Authentication.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/inner/Authentication.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/inner/Authentication.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/inner/ConnectionCriteria.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/inner/ConnectionCriteria.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/inner/ConnectionCriteria.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/onboard/inner/ConnectionCriteria.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/RegistrationCodeRequest.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/RegistrationCodeRequest.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/RegistrationCodeRequest.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/RegistrationCodeRequest.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/RegistrationCodeResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/RegistrationCodeResponse.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/RegistrationCodeResponse.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/RegistrationCodeResponse.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/secured/AuthorizationResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/secured/AuthorizationResponse.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/secured/AuthorizationResponse.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/secured/AuthorizationResponse.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/secured/AuthorizationResponseToken.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/secured/AuthorizationResponseToken.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/secured/AuthorizationResponseToken.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/registrationrequest/secured/AuthorizationResponseToken.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/revoke/RevokeRequest.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/revoke/RevokeRequest.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/revoke/RevokeRequest.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/revoke/RevokeRequest.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/revoke/RevokingError.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/revoke/RevokingError.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/revoke/RevokingError.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/revoke/RevokingError.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/CertificationType.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/CertificationType.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/CertificationType.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/CertificationType.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/RevokeResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/RevokeResponse.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/RevokeResponse.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/RevokeResponse.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/SecuredOnboardingResponseType.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/SecuredOnboardingResponseType.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/SecuredOnboardingResponseType.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/SecuredOnboardingResponseType.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/TechnicalMessageType.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/TechnicalMessageType.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/TechnicalMessageType.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/TechnicalMessageType.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/AsyncMessageSendingResult.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/AsyncMessageSendingResult.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/AsyncMessageSendingResult.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/AsyncMessageSendingResult.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/HttpAsyncMessageSendingResult.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/HttpAsyncMessageSendingResult.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/HttpAsyncMessageSendingResult.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/HttpAsyncMessageSendingResult.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResponse.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResponse.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResponse.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResult.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResult.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResult.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MessageSendingResult.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MqttAsyncMessageSendingResult.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MqttAsyncMessageSendingResult.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MqttAsyncMessageSendingResult.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/messaging/MqttAsyncMessageSendingResult.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/DeleteMessageParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageQueryParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/DynamicAttributesStorage.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/DynamicAttributesStorage.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/DynamicAttributesStorage.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/DynamicAttributesStorage.kt
diff --git a/agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/util/TimestampUtil.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/util/TimestampUtil.kt
similarity index 100%
rename from agrirouter-api-java-api/src/main/kotlin/com/dke/data/agrirouter/api/util/TimestampUtil.kt
rename to agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/util/TimestampUtil.kt
diff --git a/agrirouter-api-java-convenience/pom.xml b/agrirouter-sdk-java-convenience/pom.xml
similarity index 76%
rename from agrirouter-api-java-convenience/pom.xml
rename to agrirouter-sdk-java-convenience/pom.xml
index 42b473c1..d1b341de 100644
--- a/agrirouter-api-java-convenience/pom.xml
+++ b/agrirouter-sdk-java-convenience/pom.xml
@@ -4,20 +4,20 @@
 
     <parent>
         <groupId>com.agrirouter.api</groupId>
-        <artifactId>agrirouter-api-java</artifactId>
+        <artifactId>agrirouter-sdk-java</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <name>AGRIROUTER API JAVA - CONVENIENCE</name>
-    <artifactId>agrirouter-api-java-convenience</artifactId>
+    <name>AGRIROUTER SDK JAVA - CONVENIENCE</name>
+    <artifactId>agrirouter-sdk-java-convenience</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-api</artifactId>
+            <artifactId>agrirouter-sdk-java-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-impl</artifactId>
+            <artifactId>agrirouter-sdk-java-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.paho</groupId>
diff --git a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/decode/DecodeCloudOnboardingResponsesService.java b/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/decode/DecodeCloudOnboardingResponsesService.java
similarity index 100%
rename from agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/decode/DecodeCloudOnboardingResponsesService.java
rename to agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/decode/DecodeCloudOnboardingResponsesService.java
diff --git a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttClientService.java b/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttClientService.java
similarity index 100%
rename from agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttClientService.java
rename to agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttClientService.java
diff --git a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttOptionService.java b/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttOptionService.java
similarity index 100%
rename from agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttOptionService.java
rename to agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/client/MqttOptionService.java
diff --git a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/service/messaging/ListEndpointsFunctionsService.java b/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/service/messaging/ListEndpointsFunctionsService.java
similarity index 100%
rename from agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/service/messaging/ListEndpointsFunctionsService.java
rename to agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/mqtt/service/messaging/ListEndpointsFunctionsService.java
diff --git a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/ListEndpointsFunctionsService.java b/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/ListEndpointsFunctionsService.java
similarity index 100%
rename from agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/ListEndpointsFunctionsService.java
rename to agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/ListEndpointsFunctionsService.java
diff --git a/agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/MessageConfirmationFunctionsService.java b/agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/MessageConfirmationFunctionsService.java
similarity index 100%
rename from agrirouter-api-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/MessageConfirmationFunctionsService.java
rename to agrirouter-sdk-java-convenience/src/main/java/com/dke/data/agrirouter/convenience/rest/service/messaging/MessageConfirmationFunctionsService.java
diff --git a/agrirouter-api-java-impl/pom.xml b/agrirouter-sdk-java-impl/pom.xml
similarity index 91%
rename from agrirouter-api-java-impl/pom.xml
rename to agrirouter-sdk-java-impl/pom.xml
index c6cbf5ff..86a1dec1 100644
--- a/agrirouter-api-java-impl/pom.xml
+++ b/agrirouter-sdk-java-impl/pom.xml
@@ -5,11 +5,11 @@
 
     <parent>
         <groupId>com.agrirouter.api</groupId>
-        <artifactId>agrirouter-api-java</artifactId>
+        <artifactId>agrirouter-sdk-java</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <name>AGRIROUTER API JAVA - IMPL</name>
-    <artifactId>agrirouter-api-java-impl</artifactId>
+    <name>AGRIROUTER SDK JAVA - IMPL</name>
+    <artifactId>agrirouter-sdk-java-impl</artifactId>
 
     <dependencies>
         <dependency>
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-api</artifactId>
+            <artifactId>agrirouter-sdk-java-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/EnvironmentalService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/EnvironmentalService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/EnvironmentalService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/EnvironmentalService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/NonEnvironmentalService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/NonEnvironmentalService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/NonEnvironmentalService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/NonEnvironmentalService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/SignatureService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/SignatureService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/SignatureService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/SignatureService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/MessageIdService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/MessageIdService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/MessageIdService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/MessageIdService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/StateIdService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/StateIdService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/StateIdService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/StateIdService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/UtcTimeService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/UtcTimeService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/UtcTimeService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/UtcTimeService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/signing/SecurityKeyCreationService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/signing/SecurityKeyCreationService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/signing/SecurityKeyCreationService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/signing/SecurityKeyCreationService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/ssl/KeyStoreCreationService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/ssl/KeyStoreCreationService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/ssl/KeyStoreCreationService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/common/ssl/KeyStoreCreationService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/gson/MessageTypeAdapter.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/gson/MessageTypeAdapter.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/gson/MessageTypeAdapter.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/gson/MessageTypeAdapter.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageEncoder.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageEncoder.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageEncoder.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageEncoder.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MqttService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MqttService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MqttService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MqttService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/SequenceNumberService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/SequenceNumberService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/SequenceNumberService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/SequenceNumberService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodeMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodeMessageServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodeMessageServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodeMessageServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodePushNotificationServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodePushNotificationServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodePushNotificationServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodePushNotificationServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/MessageQueryHelperService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOffboardingServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/CloudOnboardingServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/DeleteMessageServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/ListEndpointsServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageConfirmationServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageHeaderQueryServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/MessageQueryServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SendMessageServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetCapabilityServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/mqtt/SetSubscriptionServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOffboardingServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/CloudOnboardingServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/DeleteMessageServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/FetchMessageServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/ListEndpointsServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageConfirmationServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageFetcher.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageHeaderQueryServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageQueryServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/MessageSender.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SendMessageServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetCapabilityServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/rest/SetSubscriptionServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/AbstractOnboardingService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/AbstractOnboardingService.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/AbstractOnboardingService.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/AbstractOnboardingService.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/AuthorizationRequestServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java
diff --git a/agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/validation/ResponseValidator.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/validation/ResponseValidator.java
similarity index 100%
rename from agrirouter-api-java-impl/src/main/java/com/dke/data/agrirouter/impl/validation/ResponseValidator.java
rename to agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/validation/ResponseValidator.java
diff --git a/agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/common/signing/PrivateKeyCreationServiceTest.java b/agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/common/signing/PrivateKeyCreationServiceTest.java
similarity index 100%
rename from agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/common/signing/PrivateKeyCreationServiceTest.java
rename to agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/common/signing/PrivateKeyCreationServiceTest.java
diff --git a/agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/common/ssl/KeyStoreCreationServiceTest.java b/agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/common/ssl/KeyStoreCreationServiceTest.java
similarity index 100%
rename from agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/common/ssl/KeyStoreCreationServiceTest.java
rename to agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/common/ssl/KeyStoreCreationServiceTest.java
diff --git a/agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/SequenceNumberServiceTest.java b/agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/SequenceNumberServiceTest.java
similarity index 100%
rename from agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/SequenceNumberServiceTest.java
rename to agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/SequenceNumberServiceTest.java
diff --git a/agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodeMessageServiceImplTest.java b/agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodeMessageServiceImplTest.java
similarity index 100%
rename from agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodeMessageServiceImplTest.java
rename to agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodeMessageServiceImplTest.java
diff --git a/agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodePushNotificationServiceImplTest.java b/agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodePushNotificationServiceImplTest.java
similarity index 100%
rename from agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodePushNotificationServiceImplTest.java
rename to agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/DecodePushNotificationServiceImplTest.java
diff --git a/agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImplTest.java b/agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImplTest.java
similarity index 100%
rename from agrirouter-api-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImplTest.java
rename to agrirouter-sdk-java-impl/src/test/java/com/dke/data/agrirouter/impl/messaging/encoding/EncodeMessageServiceImplTest.java
diff --git a/agrirouter-api-tests/onboarding-responses/farming-software-deactivated.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json
similarity index 100%
rename from agrirouter-api-tests/onboarding-responses/farming-software-deactivated.json
rename to agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json
diff --git a/agrirouter-api-tests/onboarding-responses/farming-software-removed.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-removed.json
similarity index 100%
rename from agrirouter-api-tests/onboarding-responses/farming-software-removed.json
rename to agrirouter-sdk-java-tests/onboarding-responses/farming-software-removed.json
diff --git a/agrirouter-api-tests/onboarding-responses/farming-software.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software.json
similarity index 100%
rename from agrirouter-api-tests/onboarding-responses/farming-software.json
rename to agrirouter-sdk-java-tests/onboarding-responses/farming-software.json
diff --git a/agrirouter-api-tests/onboarding-responses/telemetry-platform-deactivated.json b/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-deactivated.json
similarity index 100%
rename from agrirouter-api-tests/onboarding-responses/telemetry-platform-deactivated.json
rename to agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-deactivated.json
diff --git a/agrirouter-api-tests/onboarding-responses/telemetry-platform-removed.json b/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-removed.json
similarity index 100%
rename from agrirouter-api-tests/onboarding-responses/telemetry-platform-removed.json
rename to agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-removed.json
diff --git a/agrirouter-api-tests/onboarding-responses/telemetry-platform.json b/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform.json
similarity index 100%
rename from agrirouter-api-tests/onboarding-responses/telemetry-platform.json
rename to agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform.json
diff --git a/agrirouter-api-tests/pom.xml b/agrirouter-sdk-java-tests/pom.xml
similarity index 82%
rename from agrirouter-api-tests/pom.xml
rename to agrirouter-sdk-java-tests/pom.xml
index cdcce731..37a38234 100644
--- a/agrirouter-api-tests/pom.xml
+++ b/agrirouter-sdk-java-tests/pom.xml
@@ -3,26 +3,26 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>agrirouter-api-java</artifactId>
+        <artifactId>agrirouter-sdk-java</artifactId>
         <groupId>com.agrirouter.api</groupId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <name>AGRIROUTER API JAVA - TESTS</name>
+    <name>AGRIROUTER SDK JAVA - TESTS</name>
     <artifactId>agrirouter-api-tests</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-api</artifactId>
+            <artifactId>agrirouter-sdk-java-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-impl</artifactId>
+            <artifactId>agrirouter-sdk-java-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>com.agrirouter.api</groupId>
-            <artifactId>agrirouter-api-java-convenience</artifactId>
+            <artifactId>agrirouter-sdk-java-convenience</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/Assertions.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/Assertions.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/Assertions.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/Assertions.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/fixture/TelemetryPlatformFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/TelemetryPlatformFixture.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/fixture/TelemetryPlatformFixture.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/TelemetryPlatformFixture.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CancellationTokenPollingTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CancellationTokenPollingTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CancellationTokenPollingTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CancellationTokenPollingTest.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOffboardingServiceTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOffboardingServiceTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOffboardingServiceTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOffboardingServiceTest.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOnboardingServiceTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOnboardingServiceTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOnboardingServiceTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/CloudOnboardingServiceTest.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/HealthCheckForEndpointsByPollingTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/HealthCheckForEndpointsByPollingTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/HealthCheckForEndpointsByPollingTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/HealthCheckForEndpointsByPollingTest.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetCapabilityServiceTest.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetSubscriptionServiceTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetSubscriptionServiceTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetSubscriptionServiceTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SetSubscriptionServiceTest.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/AuthorizationRequestServiceTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/AuthorizationRequestServiceTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/AuthorizationRequestServiceTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/AuthorizationRequestServiceTest.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/OnboardingWithErrorMessageTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/OnboardingWithErrorMessageTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/OnboardingWithErrorMessageTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/OnboardingWithErrorMessageTest.java
diff --git a/agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/SecuredOnboardingServiceTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/SecuredOnboardingServiceTest.java
similarity index 100%
rename from agrirouter-api-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/SecuredOnboardingServiceTest.java
rename to agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/onboarding/SecuredOnboardingServiceTest.java
diff --git a/pom.xml b/pom.xml
index 27659504..05ea02bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.agrirouter.api</groupId>
-    <artifactId>agrirouter-api-java</artifactId>
+    <artifactId>agrirouter-sdk-java</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>AGRIROUTER API JAVA</name>
-    <url>https://github.com/DKE-Data/agrirouter-api-java</url>
+    <name>AGRIROUTER SDK JAVA</name>
+    <url>https://github.com/DKE-Data/agrirouter-sdk-java</url>
     <licenses>
         <license>
             <name>Apache License Version 2.0</name>
@@ -25,17 +25,17 @@
     </developers>
 
     <scm>
-        <connection>scm:git:git:github.com/DKE-Data/agrirouter-api-java.git</connection>
-        <developerConnection>scm:git:git@github.com:DKE-Data/agrirouter-api-java.git
+        <connection>scm:git:git:github.com/DKE-Data/agrirouter-sdk-java.git</connection>
+        <developerConnection>scm:git:git@github.com:DKE-Data/agrirouter-sdk-java.git
         </developerConnection>
-        <url>https://github.com/DKE-Data/agrirouter-api-java</url>
+        <url>https://github.com/DKE-Data/agrirouter-sdk-java</url>
     </scm>
 
     <distributionManagement>
         <repository>
             <id>github</id>
             <name>GitHub DKE-Data Apache Maven Packages</name>
-            <url>https://maven.pkg.github.com/DKE-Data/agrirouter-api-java</url>
+            <url>https://maven.pkg.github.com/DKE-Data/agrirouter-sdk-java</url>
         </repository>
     </distributionManagement>
 
@@ -58,10 +58,10 @@
     </repositories>
 
     <modules>
-        <module>agrirouter-api-java-api</module>
-        <module>agrirouter-api-java-impl</module>
-        <module>agrirouter-api-java-convenience</module>
-        <module>agrirouter-api-tests</module>
+        <module>agrirouter-sdk-java-api</module>
+        <module>agrirouter-sdk-java-impl</module>
+        <module>agrirouter-sdk-java-convenience</module>
+        <module>agrirouter-sdk-java-tests</module>
     </modules>
 
     <properties>
@@ -108,17 +108,17 @@
             <!-- INTERNAL -->
             <dependency>
                 <groupId>com.agrirouter.api</groupId>
-                <artifactId>agrirouter-api-java-api</artifactId>
+                <artifactId>agrirouter-sdk-java-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.agrirouter.api</groupId>
-                <artifactId>agrirouter-api-java-impl</artifactId>
+                <artifactId>agrirouter-sdk-java-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.agrirouter.api</groupId>
-                <artifactId>agrirouter-api-java-convenience</artifactId>
+                <artifactId>agrirouter-sdk-java-convenience</artifactId>
                 <version>${project.version}</version>
             </dependency>