diff --git a/.gitignore b/.gitignore
index 3e3ab76f8a..7167917896 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ bin/
 **/*.pem
 **/*.srl
 !**/src/**/*.der
+!**/certificates/*.pem
diff --git a/leshan-bsserver-demo/logback-config.xml b/leshan-demo-bsserver/logback-config.xml
similarity index 100%
rename from leshan-bsserver-demo/logback-config.xml
rename to leshan-demo-bsserver/logback-config.xml
diff --git a/leshan-bsserver-demo/pom.xml b/leshan-demo-bsserver/pom.xml
similarity index 100%
rename from leshan-bsserver-demo/pom.xml
rename to leshan-demo-bsserver/pom.xml
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/JSONFileBootstrapStore.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/JSONFileBootstrapStore.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/JSONFileBootstrapStore.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/JSONFileBootstrapStore.java
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/LeshanBootstrapServerDemo.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/LeshanBootstrapServerDemo.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/LeshanBootstrapServerDemo.java
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/cli/LeshanBsServerDemoCLI.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/cli/LeshanBsServerDemoCLI.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/cli/LeshanBsServerDemoCLI.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/cli/LeshanBsServerDemoCLI.java
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/ByteArraySerializer.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/ByteArraySerializer.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/ByteArraySerializer.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/ByteArraySerializer.java
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/EnumSetBindingModeDeserializer.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetBindingModeDeserializer.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/EnumSetBindingModeDeserializer.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetBindingModeDeserializer.java
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/EnumSetDeserializer.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetDeserializer.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/EnumSetDeserializer.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetDeserializer.java
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/EnumSetSerializer.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetSerializer.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/json/EnumSetSerializer.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/json/EnumSetSerializer.java
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/servlet/BootstrapServlet.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/BootstrapServlet.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/servlet/BootstrapServlet.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/BootstrapServlet.java
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/servlet/EventServlet.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/EventServlet.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/servlet/EventServlet.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/EventServlet.java
diff --git a/leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/servlet/ServerServlet.java b/leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/ServerServlet.java
similarity index 100%
rename from leshan-bsserver-demo/src/main/java/org/eclipse/leshan/server/bootstrap/demo/servlet/ServerServlet.java
rename to leshan-demo-bsserver/src/main/java/org/eclipse/leshan/demo/bsserver/servlet/ServerServlet.java
diff --git a/leshan-bsserver-demo/src/main/resources/credentials/server_cert.der b/leshan-demo-bsserver/src/main/resources/credentials/server_cert.der
similarity index 100%
rename from leshan-bsserver-demo/src/main/resources/credentials/server_cert.der
rename to leshan-demo-bsserver/src/main/resources/credentials/server_cert.der
diff --git a/leshan-bsserver-demo/src/main/resources/credentials/server_privkey.der b/leshan-demo-bsserver/src/main/resources/credentials/server_privkey.der
similarity index 100%
rename from leshan-bsserver-demo/src/main/resources/credentials/server_privkey.der
rename to leshan-demo-bsserver/src/main/resources/credentials/server_privkey.der
diff --git a/leshan-bsserver-demo/src/main/resources/webapp/index.html b/leshan-demo-bsserver/src/main/resources/webapp/index.html
similarity index 100%
rename from leshan-bsserver-demo/src/main/resources/webapp/index.html
rename to leshan-demo-bsserver/src/main/resources/webapp/index.html
diff --git a/leshan-bsserver-demo/webapp/.gitignore b/leshan-demo-bsserver/webapp/.gitignore
similarity index 100%
rename from leshan-bsserver-demo/webapp/.gitignore
rename to leshan-demo-bsserver/webapp/.gitignore
diff --git a/leshan-bsserver-demo/webapp/README.md b/leshan-demo-bsserver/webapp/README.md
similarity index 100%
rename from leshan-bsserver-demo/webapp/README.md
rename to leshan-demo-bsserver/webapp/README.md
diff --git a/leshan-bsserver-demo/webapp/index.html b/leshan-demo-bsserver/webapp/index.html
similarity index 100%
rename from leshan-bsserver-demo/webapp/index.html
rename to leshan-demo-bsserver/webapp/index.html
diff --git a/leshan-bsserver-demo/webapp/jsconfig.json b/leshan-demo-bsserver/webapp/jsconfig.json
similarity index 100%
rename from leshan-bsserver-demo/webapp/jsconfig.json
rename to leshan-demo-bsserver/webapp/jsconfig.json
diff --git a/leshan-bsserver-demo/webapp/package.json b/leshan-demo-bsserver/webapp/package.json
similarity index 100%
rename from leshan-bsserver-demo/webapp/package.json
rename to leshan-demo-bsserver/webapp/package.json
diff --git a/leshan-bsserver-demo/webapp/public/favicon.png b/leshan-demo-bsserver/webapp/public/favicon.png
similarity index 100%
rename from leshan-bsserver-demo/webapp/public/favicon.png
rename to leshan-demo-bsserver/webapp/public/favicon.png
diff --git a/leshan-bsserver-demo/webapp/src/App.vue b/leshan-demo-bsserver/webapp/src/App.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/App.vue
rename to leshan-demo-bsserver/webapp/src/App.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/bsconfig/PskInput.vue b/leshan-demo-bsserver/webapp/src/components/bsconfig/PskInput.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/bsconfig/PskInput.vue
rename to leshan-demo-bsserver/webapp/src/components/bsconfig/PskInput.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/bsconfig/RpkInput.vue b/leshan-demo-bsserver/webapp/src/components/bsconfig/RpkInput.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/bsconfig/RpkInput.vue
rename to leshan-demo-bsserver/webapp/src/components/bsconfig/RpkInput.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/bsconfig/SecurityInput.vue b/leshan-demo-bsserver/webapp/src/components/bsconfig/SecurityInput.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/bsconfig/SecurityInput.vue
rename to leshan-demo-bsserver/webapp/src/components/bsconfig/SecurityInput.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/bsconfig/ServerInput.vue b/leshan-demo-bsserver/webapp/src/components/bsconfig/ServerInput.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/bsconfig/ServerInput.vue
rename to leshan-demo-bsserver/webapp/src/components/bsconfig/ServerInput.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/bsconfig/X509Input.vue b/leshan-demo-bsserver/webapp/src/components/bsconfig/X509Input.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/bsconfig/X509Input.vue
rename to leshan-demo-bsserver/webapp/src/components/bsconfig/X509Input.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/wizard/BootstrapServerStep.vue b/leshan-demo-bsserver/webapp/src/components/wizard/BootstrapServerStep.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/wizard/BootstrapServerStep.vue
rename to leshan-demo-bsserver/webapp/src/components/wizard/BootstrapServerStep.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/wizard/ClientConfigDialog.vue b/leshan-demo-bsserver/webapp/src/components/wizard/ClientConfigDialog.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/wizard/ClientConfigDialog.vue
rename to leshan-demo-bsserver/webapp/src/components/wizard/ClientConfigDialog.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/wizard/DeleteStep.vue b/leshan-demo-bsserver/webapp/src/components/wizard/DeleteStep.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/wizard/DeleteStep.vue
rename to leshan-demo-bsserver/webapp/src/components/wizard/DeleteStep.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/wizard/EndpointStep.vue b/leshan-demo-bsserver/webapp/src/components/wizard/EndpointStep.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/wizard/EndpointStep.vue
rename to leshan-demo-bsserver/webapp/src/components/wizard/EndpointStep.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/wizard/SecurityStep.vue b/leshan-demo-bsserver/webapp/src/components/wizard/SecurityStep.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/wizard/SecurityStep.vue
rename to leshan-demo-bsserver/webapp/src/components/wizard/SecurityStep.vue
diff --git a/leshan-bsserver-demo/webapp/src/components/wizard/ServerStep.vue b/leshan-demo-bsserver/webapp/src/components/wizard/ServerStep.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/components/wizard/ServerStep.vue
rename to leshan-demo-bsserver/webapp/src/components/wizard/ServerStep.vue
diff --git a/leshan-bsserver-demo/webapp/src/js/bsconfigutil.js b/leshan-demo-bsserver/webapp/src/js/bsconfigutil.js
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/js/bsconfigutil.js
rename to leshan-demo-bsserver/webapp/src/js/bsconfigutil.js
diff --git a/leshan-bsserver-demo/webapp/src/main.js b/leshan-demo-bsserver/webapp/src/main.js
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/main.js
rename to leshan-demo-bsserver/webapp/src/main.js
diff --git a/leshan-bsserver-demo/webapp/src/plugins/icons.js b/leshan-demo-bsserver/webapp/src/plugins/icons.js
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/plugins/icons.js
rename to leshan-demo-bsserver/webapp/src/plugins/icons.js
diff --git a/leshan-bsserver-demo/webapp/src/router/index.js b/leshan-demo-bsserver/webapp/src/router/index.js
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/router/index.js
rename to leshan-demo-bsserver/webapp/src/router/index.js
diff --git a/leshan-bsserver-demo/webapp/src/views/Bootstrap.vue b/leshan-demo-bsserver/webapp/src/views/Bootstrap.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/views/Bootstrap.vue
rename to leshan-demo-bsserver/webapp/src/views/Bootstrap.vue
diff --git a/leshan-bsserver-demo/webapp/src/views/Client.vue b/leshan-demo-bsserver/webapp/src/views/Client.vue
similarity index 100%
rename from leshan-bsserver-demo/webapp/src/views/Client.vue
rename to leshan-demo-bsserver/webapp/src/views/Client.vue
diff --git a/leshan-bsserver-demo/webapp/vite.config.js b/leshan-demo-bsserver/webapp/vite.config.js
similarity index 100%
rename from leshan-bsserver-demo/webapp/vite.config.js
rename to leshan-demo-bsserver/webapp/vite.config.js
diff --git a/leshan-bsserver-demo/webapp/yarn.lock b/leshan-demo-bsserver/webapp/yarn.lock
similarity index 100%
rename from leshan-bsserver-demo/webapp/yarn.lock
rename to leshan-demo-bsserver/webapp/yarn.lock
diff --git a/leshan-client-demo/logback-config.xml b/leshan-demo-client/logback-config.xml
similarity index 100%
rename from leshan-client-demo/logback-config.xml
rename to leshan-demo-client/logback-config.xml
diff --git a/leshan-client-demo/pom.xml b/leshan-demo-client/pom.xml
similarity index 100%
rename from leshan-client-demo/pom.xml
rename to leshan-demo-client/pom.xml
diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/DtlsSessionLogger.java b/leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/DtlsSessionLogger.java
similarity index 100%
rename from leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/DtlsSessionLogger.java
rename to leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/DtlsSessionLogger.java
diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/LeshanClientDemo.java b/leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/LeshanClientDemo.java
similarity index 100%
rename from leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/LeshanClientDemo.java
rename to leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/LeshanClientDemo.java
diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/MyDevice.java b/leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/MyDevice.java
similarity index 100%
rename from leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/MyDevice.java
rename to leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/MyDevice.java
diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/MyLocation.java b/leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/MyLocation.java
similarity index 100%
rename from leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/MyLocation.java
rename to leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/MyLocation.java
diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/RandomTemperatureSensor.java b/leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/RandomTemperatureSensor.java
similarity index 100%
rename from leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/RandomTemperatureSensor.java
rename to leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/RandomTemperatureSensor.java
diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/cli/IdentitySection.java b/leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/cli/IdentitySection.java
similarity index 100%
rename from leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/cli/IdentitySection.java
rename to leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/cli/IdentitySection.java
diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/cli/LeshanClientDemoCLI.java b/leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/cli/LeshanClientDemoCLI.java
similarity index 100%
rename from leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/cli/LeshanClientDemoCLI.java
rename to leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/cli/LeshanClientDemoCLI.java
diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/cli/OscoreSection.java b/leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/cli/OscoreSection.java
similarity index 100%
rename from leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/cli/OscoreSection.java
rename to leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/cli/OscoreSection.java
diff --git a/leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/cli/interactive/InteractiveCommands.java b/leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/cli/interactive/InteractiveCommands.java
similarity index 100%
rename from leshan-client-demo/src/main/java/org/eclipse/leshan/client/demo/cli/interactive/InteractiveCommands.java
rename to leshan-demo-client/src/main/java/org/eclipse/leshan/demo/client/cli/interactive/InteractiveCommands.java
diff --git a/leshan-server-demo/.gitignore b/leshan-demo-server/.gitignore
similarity index 100%
rename from leshan-server-demo/.gitignore
rename to leshan-demo-server/.gitignore
diff --git a/leshan-server-demo/logback-config.xml b/leshan-demo-server/logback-config.xml
similarity index 100%
rename from leshan-server-demo/logback-config.xml
rename to leshan-demo-server/logback-config.xml
diff --git a/leshan-server-demo/pom.xml b/leshan-demo-server/pom.xml
similarity index 100%
rename from leshan-server-demo/pom.xml
rename to leshan-demo-server/pom.xml
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/LeshanServerDemo.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/LeshanServerDemo.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/LeshanServerDemo.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/cli/LeshanServerDemoCLI.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/cli/LeshanServerDemoCLI.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/cli/LeshanServerDemoCLI.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/cli/LeshanServerDemoCLI.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/DdfDownloader.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/model/DdfDownloader.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/DdfDownloader.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/model/DdfDownloader.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/FileLister.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/model/FileLister.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/FileLister.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/model/FileLister.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/ObjectModelSerDes.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/model/ObjectModelSerDes.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/ObjectModelSerDes.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/model/ObjectModelSerDes.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/ResourceModelSerDes.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/model/ResourceModelSerDes.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/model/ResourceModelSerDes.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/model/ResourceModelSerDes.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/ClientServlet.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/ClientServlet.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/ClientServlet.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/ClientServlet.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/EventServlet.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/EventServlet.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/EventServlet.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/EventServlet.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/ObjectSpecServlet.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/ObjectSpecServlet.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/ObjectSpecServlet.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/ObjectSpecServlet.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/ServerServlet.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/ServerServlet.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/ServerServlet.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/ServerServlet.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLinkSerializer.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonLinkSerializer.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLinkSerializer.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonLinkSerializer.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLwM2mNodeDeserializer.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonLwM2mNodeDeserializer.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLwM2mNodeDeserializer.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonLwM2mNodeDeserializer.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLwM2mNodeSerializer.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonLwM2mNodeSerializer.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLwM2mNodeSerializer.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonLwM2mNodeSerializer.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonRegistrationSerializer.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonRegistrationSerializer.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonRegistrationSerializer.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonRegistrationSerializer.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonRegistrationUpdateSerializer.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonRegistrationUpdateSerializer.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonRegistrationUpdateSerializer.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonRegistrationUpdateSerializer.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonResponseSerializer.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonResponseSerializer.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonResponseSerializer.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonResponseSerializer.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonSecurityDeserializer.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonSecurityDeserializer.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonSecurityDeserializer.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonSecurityDeserializer.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonVersionSerializer.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonVersionSerializer.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonVersionSerializer.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/json/JacksonVersionSerializer.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessage.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/log/CoapMessage.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessage.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/log/CoapMessage.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessageListener.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/log/CoapMessageListener.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessageListener.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/log/CoapMessageListener.java
diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessageTracer.java b/leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/log/CoapMessageTracer.java
similarity index 100%
rename from leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/log/CoapMessageTracer.java
rename to leshan-demo-server/src/main/java/org/eclipse/leshan/demo/server/servlet/log/CoapMessageTracer.java
diff --git a/leshan-server-demo/src/main/resources/credentials/server_cert.der b/leshan-demo-server/src/main/resources/credentials/server_cert.der
similarity index 100%
rename from leshan-server-demo/src/main/resources/credentials/server_cert.der
rename to leshan-demo-server/src/main/resources/credentials/server_cert.der
diff --git a/leshan-server-demo/src/main/resources/credentials/server_privkey.der b/leshan-demo-server/src/main/resources/credentials/server_privkey.der
similarity index 100%
rename from leshan-server-demo/src/main/resources/credentials/server_privkey.der
rename to leshan-demo-server/src/main/resources/credentials/server_privkey.der
diff --git a/leshan-server-demo/src/main/resources/webapp/index.html b/leshan-demo-server/src/main/resources/webapp/index.html
similarity index 100%
rename from leshan-server-demo/src/main/resources/webapp/index.html
rename to leshan-demo-server/src/main/resources/webapp/index.html
diff --git a/leshan-server-demo/webapp/.gitignore b/leshan-demo-server/webapp/.gitignore
similarity index 100%
rename from leshan-server-demo/webapp/.gitignore
rename to leshan-demo-server/webapp/.gitignore
diff --git a/leshan-server-demo/webapp/README.md b/leshan-demo-server/webapp/README.md
similarity index 100%
rename from leshan-server-demo/webapp/README.md
rename to leshan-demo-server/webapp/README.md
diff --git a/leshan-server-demo/webapp/index.html b/leshan-demo-server/webapp/index.html
similarity index 100%
rename from leshan-server-demo/webapp/index.html
rename to leshan-demo-server/webapp/index.html
diff --git a/leshan-server-demo/webapp/jsconfig.json b/leshan-demo-server/webapp/jsconfig.json
similarity index 100%
rename from leshan-server-demo/webapp/jsconfig.json
rename to leshan-demo-server/webapp/jsconfig.json
diff --git a/leshan-server-demo/webapp/package.json b/leshan-demo-server/webapp/package.json
similarity index 100%
rename from leshan-server-demo/webapp/package.json
rename to leshan-demo-server/webapp/package.json
diff --git a/leshan-server-demo/webapp/public/favicon.png b/leshan-demo-server/webapp/public/favicon.png
similarity index 100%
rename from leshan-server-demo/webapp/public/favicon.png
rename to leshan-demo-server/webapp/public/favicon.png
diff --git a/leshan-server-demo/webapp/src/App.vue b/leshan-demo-server/webapp/src/App.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/App.vue
rename to leshan-demo-server/webapp/src/App.vue
diff --git a/leshan-server-demo/webapp/src/components/ClientInfo.vue b/leshan-demo-server/webapp/src/components/ClientInfo.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/ClientInfo.vue
rename to leshan-demo-server/webapp/src/components/ClientInfo.vue
diff --git a/leshan-server-demo/webapp/src/components/ClientSetting.vue b/leshan-demo-server/webapp/src/components/ClientSetting.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/ClientSetting.vue
rename to leshan-demo-server/webapp/src/components/ClientSetting.vue
diff --git a/leshan-server-demo/webapp/src/components/RequestButton.vue b/leshan-demo-server/webapp/src/components/RequestButton.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/RequestButton.vue
rename to leshan-demo-server/webapp/src/components/RequestButton.vue
diff --git a/leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectControl.vue b/leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectControl.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectControl.vue
rename to leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectControl.vue
diff --git a/leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectDialog.vue b/leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectDialog.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectDialog.vue
rename to leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectDialog.vue
diff --git a/leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectIcons.vue b/leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectIcons.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectIcons.vue
rename to leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectIcons.vue
diff --git a/leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectWriteDialog.vue b/leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectWriteDialog.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectWriteDialog.vue
rename to leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectWriteDialog.vue
diff --git a/leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectsSelector.vue b/leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectsSelector.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/compositeOperation/CompositeObjectsSelector.vue
rename to leshan-demo-server/webapp/src/components/compositeOperation/CompositeObjectsSelector.vue
diff --git a/leshan-server-demo/webapp/src/components/compositeOperation/CompositeOperationSettingMenu.vue b/leshan-demo-server/webapp/src/components/compositeOperation/CompositeOperationSettingMenu.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/compositeOperation/CompositeOperationSettingMenu.vue
rename to leshan-demo-server/webapp/src/components/compositeOperation/CompositeOperationSettingMenu.vue
diff --git a/leshan-server-demo/webapp/src/components/instance/InstanceControl.vue b/leshan-demo-server/webapp/src/components/instance/InstanceControl.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/instance/InstanceControl.vue
rename to leshan-demo-server/webapp/src/components/instance/InstanceControl.vue
diff --git a/leshan-server-demo/webapp/src/components/instance/InstanceCreateDialog.vue b/leshan-demo-server/webapp/src/components/instance/InstanceCreateDialog.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/instance/InstanceCreateDialog.vue
rename to leshan-demo-server/webapp/src/components/instance/InstanceCreateDialog.vue
diff --git a/leshan-server-demo/webapp/src/components/instance/InstanceView.vue b/leshan-demo-server/webapp/src/components/instance/InstanceView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/instance/InstanceView.vue
rename to leshan-demo-server/webapp/src/components/instance/InstanceView.vue
diff --git a/leshan-server-demo/webapp/src/components/instance/InstanceWriteDialog.vue b/leshan-demo-server/webapp/src/components/instance/InstanceWriteDialog.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/instance/InstanceWriteDialog.vue
rename to leshan-demo-server/webapp/src/components/instance/InstanceWriteDialog.vue
diff --git a/leshan-server-demo/webapp/src/components/object/ObjectControl.vue b/leshan-demo-server/webapp/src/components/object/ObjectControl.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/object/ObjectControl.vue
rename to leshan-demo-server/webapp/src/components/object/ObjectControl.vue
diff --git a/leshan-server-demo/webapp/src/components/object/ObjectIcon.vue b/leshan-demo-server/webapp/src/components/object/ObjectIcon.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/object/ObjectIcon.vue
rename to leshan-demo-server/webapp/src/components/object/ObjectIcon.vue
diff --git a/leshan-server-demo/webapp/src/components/object/ObjectSelector.vue b/leshan-demo-server/webapp/src/components/object/ObjectSelector.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/object/ObjectSelector.vue
rename to leshan-demo-server/webapp/src/components/object/ObjectSelector.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/ResourceControl.vue b/leshan-demo-server/webapp/src/components/resources/ResourceControl.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/ResourceControl.vue
rename to leshan-demo-server/webapp/src/components/resources/ResourceControl.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/ResourceInstanceControl.vue b/leshan-demo-server/webapp/src/components/resources/ResourceInstanceControl.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/ResourceInstanceControl.vue
rename to leshan-demo-server/webapp/src/components/resources/ResourceInstanceControl.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/ResourceInstanceWriteDialog.vue b/leshan-demo-server/webapp/src/components/resources/ResourceInstanceWriteDialog.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/ResourceInstanceWriteDialog.vue
rename to leshan-demo-server/webapp/src/components/resources/ResourceInstanceWriteDialog.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/ResourceWriteDialog.vue b/leshan-demo-server/webapp/src/components/resources/ResourceWriteDialog.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/ResourceWriteDialog.vue
rename to leshan-demo-server/webapp/src/components/resources/ResourceWriteDialog.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/input/LabelledResourceInput.vue b/leshan-demo-server/webapp/src/components/resources/input/LabelledResourceInput.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/input/LabelledResourceInput.vue
rename to leshan-demo-server/webapp/src/components/resources/input/LabelledResourceInput.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/input/LabelledResourceInstanceInput.vue b/leshan-demo-server/webapp/src/components/resources/input/LabelledResourceInstanceInput.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/input/LabelledResourceInstanceInput.vue
rename to leshan-demo-server/webapp/src/components/resources/input/LabelledResourceInstanceInput.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/input/MultiInstanceResourceInput.vue b/leshan-demo-server/webapp/src/components/resources/input/MultiInstanceResourceInput.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/input/MultiInstanceResourceInput.vue
rename to leshan-demo-server/webapp/src/components/resources/input/MultiInstanceResourceInput.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/input/ResourceInput.vue b/leshan-demo-server/webapp/src/components/resources/input/ResourceInput.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/input/ResourceInput.vue
rename to leshan-demo-server/webapp/src/components/resources/input/ResourceInput.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/view/MultiInstancesResourceView.vue b/leshan-demo-server/webapp/src/components/resources/view/MultiInstancesResourceView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/view/MultiInstancesResourceView.vue
rename to leshan-demo-server/webapp/src/components/resources/view/MultiInstancesResourceView.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/view/ResourceDefinitionView.vue b/leshan-demo-server/webapp/src/components/resources/view/ResourceDefinitionView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/view/ResourceDefinitionView.vue
rename to leshan-demo-server/webapp/src/components/resources/view/ResourceDefinitionView.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/view/ResourceExpansionPanel.vue b/leshan-demo-server/webapp/src/components/resources/view/ResourceExpansionPanel.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/view/ResourceExpansionPanel.vue
rename to leshan-demo-server/webapp/src/components/resources/view/ResourceExpansionPanel.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/view/ResourceInstanceExpansionPanel.vue b/leshan-demo-server/webapp/src/components/resources/view/ResourceInstanceExpansionPanel.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/view/ResourceInstanceExpansionPanel.vue
rename to leshan-demo-server/webapp/src/components/resources/view/ResourceInstanceExpansionPanel.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/view/ResourceInstanceView.vue b/leshan-demo-server/webapp/src/components/resources/view/ResourceInstanceView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/view/ResourceInstanceView.vue
rename to leshan-demo-server/webapp/src/components/resources/view/ResourceInstanceView.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/view/ResourceView.vue b/leshan-demo-server/webapp/src/components/resources/view/ResourceView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/view/ResourceView.vue
rename to leshan-demo-server/webapp/src/components/resources/view/ResourceView.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/view/SimpleResourceInstanceView.vue b/leshan-demo-server/webapp/src/components/resources/view/SimpleResourceInstanceView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/view/SimpleResourceInstanceView.vue
rename to leshan-demo-server/webapp/src/components/resources/view/SimpleResourceInstanceView.vue
diff --git a/leshan-server-demo/webapp/src/components/resources/view/SimpleResourceView.vue b/leshan-demo-server/webapp/src/components/resources/view/SimpleResourceView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/resources/view/SimpleResourceView.vue
rename to leshan-demo-server/webapp/src/components/resources/view/SimpleResourceView.vue
diff --git a/leshan-server-demo/webapp/src/components/values/input/BooleanValueInput.vue b/leshan-demo-server/webapp/src/components/values/input/BooleanValueInput.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/values/input/BooleanValueInput.vue
rename to leshan-demo-server/webapp/src/components/values/input/BooleanValueInput.vue
diff --git a/leshan-server-demo/webapp/src/components/values/input/DateTimeValueInput.vue b/leshan-demo-server/webapp/src/components/values/input/DateTimeValueInput.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/values/input/DateTimeValueInput.vue
rename to leshan-demo-server/webapp/src/components/values/input/DateTimeValueInput.vue
diff --git a/leshan-server-demo/webapp/src/components/values/input/ObjLinkValueInput.vue b/leshan-demo-server/webapp/src/components/values/input/ObjLinkValueInput.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/values/input/ObjLinkValueInput.vue
rename to leshan-demo-server/webapp/src/components/values/input/ObjLinkValueInput.vue
diff --git a/leshan-server-demo/webapp/src/components/values/input/OpaqueValueInput.vue b/leshan-demo-server/webapp/src/components/values/input/OpaqueValueInput.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/values/input/OpaqueValueInput.vue
rename to leshan-demo-server/webapp/src/components/values/input/OpaqueValueInput.vue
diff --git a/leshan-server-demo/webapp/src/components/values/input/SingleValueInput.vue b/leshan-demo-server/webapp/src/components/values/input/SingleValueInput.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/components/values/input/SingleValueInput.vue
rename to leshan-demo-server/webapp/src/components/values/input/SingleValueInput.vue
diff --git a/leshan-server-demo/webapp/src/js/lwm2mpath.js b/leshan-demo-server/webapp/src/js/lwm2mpath.js
similarity index 100%
rename from leshan-server-demo/webapp/src/js/lwm2mpath.js
rename to leshan-demo-server/webapp/src/js/lwm2mpath.js
diff --git a/leshan-server-demo/webapp/src/js/restutils.js b/leshan-demo-server/webapp/src/js/restutils.js
similarity index 100%
rename from leshan-server-demo/webapp/src/js/restutils.js
rename to leshan-demo-server/webapp/src/js/restutils.js
diff --git a/leshan-server-demo/webapp/src/js/utils.js b/leshan-demo-server/webapp/src/js/utils.js
similarity index 100%
rename from leshan-server-demo/webapp/src/js/utils.js
rename to leshan-demo-server/webapp/src/js/utils.js
diff --git a/leshan-server-demo/webapp/src/js/valueutils.js b/leshan-demo-server/webapp/src/js/valueutils.js
similarity index 100%
rename from leshan-server-demo/webapp/src/js/valueutils.js
rename to leshan-demo-server/webapp/src/js/valueutils.js
diff --git a/leshan-server-demo/webapp/src/main.js b/leshan-demo-server/webapp/src/main.js
similarity index 100%
rename from leshan-server-demo/webapp/src/main.js
rename to leshan-demo-server/webapp/src/main.js
diff --git a/leshan-server-demo/webapp/src/plugins/icons.js b/leshan-demo-server/webapp/src/plugins/icons.js
similarity index 100%
rename from leshan-server-demo/webapp/src/plugins/icons.js
rename to leshan-demo-server/webapp/src/plugins/icons.js
diff --git a/leshan-server-demo/webapp/src/plugins/store.js b/leshan-demo-server/webapp/src/plugins/store.js
similarity index 100%
rename from leshan-server-demo/webapp/src/plugins/store.js
rename to leshan-demo-server/webapp/src/plugins/store.js
diff --git a/leshan-server-demo/webapp/src/router/index.js b/leshan-demo-server/webapp/src/router/index.js
similarity index 100%
rename from leshan-server-demo/webapp/src/router/index.js
rename to leshan-demo-server/webapp/src/router/index.js
diff --git a/leshan-server-demo/webapp/src/views/Client.vue b/leshan-demo-server/webapp/src/views/Client.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/views/Client.vue
rename to leshan-demo-server/webapp/src/views/Client.vue
diff --git a/leshan-server-demo/webapp/src/views/Clients.vue b/leshan-demo-server/webapp/src/views/Clients.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/views/Clients.vue
rename to leshan-demo-server/webapp/src/views/Clients.vue
diff --git a/leshan-server-demo/webapp/src/views/CompositeObjectView.vue b/leshan-demo-server/webapp/src/views/CompositeObjectView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/views/CompositeObjectView.vue
rename to leshan-demo-server/webapp/src/views/CompositeObjectView.vue
diff --git a/leshan-server-demo/webapp/src/views/CompositeOperationView.vue b/leshan-demo-server/webapp/src/views/CompositeOperationView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/views/CompositeOperationView.vue
rename to leshan-demo-server/webapp/src/views/CompositeOperationView.vue
diff --git a/leshan-server-demo/webapp/src/views/ObjectView.vue b/leshan-demo-server/webapp/src/views/ObjectView.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/views/ObjectView.vue
rename to leshan-demo-server/webapp/src/views/ObjectView.vue
diff --git a/leshan-server-demo/webapp/src/views/Security.vue b/leshan-demo-server/webapp/src/views/Security.vue
similarity index 100%
rename from leshan-server-demo/webapp/src/views/Security.vue
rename to leshan-demo-server/webapp/src/views/Security.vue
diff --git a/leshan-server-demo/webapp/vite.config.js b/leshan-demo-server/webapp/vite.config.js
similarity index 100%
rename from leshan-server-demo/webapp/vite.config.js
rename to leshan-demo-server/webapp/vite.config.js
diff --git a/leshan-server-demo/webapp/yarn.lock b/leshan-demo-server/webapp/yarn.lock
similarity index 100%
rename from leshan-server-demo/webapp/yarn.lock
rename to leshan-demo-server/webapp/yarn.lock
diff --git a/leshan-server-core-demo/pom.xml b/leshan-demo-servers-shared/pom.xml
similarity index 100%
rename from leshan-server-core-demo/pom.xml
rename to leshan-demo-servers-shared/pom.xml
diff --git a/leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/cli/DtlsSection.java b/leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/cli/DtlsSection.java
similarity index 100%
rename from leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/cli/DtlsSection.java
rename to leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/cli/DtlsSection.java
diff --git a/leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/cli/GeneralSection.java b/leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/cli/GeneralSection.java
similarity index 100%
rename from leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/cli/GeneralSection.java
rename to leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/cli/GeneralSection.java
diff --git a/leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/cli/IdentitySection.java b/leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/cli/IdentitySection.java
similarity index 100%
rename from leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/cli/IdentitySection.java
rename to leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/cli/IdentitySection.java
diff --git a/leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/cli/converters/ServerCIDConverter.java b/leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/cli/converters/ServerCIDConverter.java
similarity index 100%
rename from leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/cli/converters/ServerCIDConverter.java
rename to leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/cli/converters/ServerCIDConverter.java
diff --git a/leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/JacksonSecurityDeserializer.java b/leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/JacksonSecurityDeserializer.java
similarity index 100%
rename from leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/JacksonSecurityDeserializer.java
rename to leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/JacksonSecurityDeserializer.java
diff --git a/leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/JacksonSecuritySerializer.java b/leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/JacksonSecuritySerializer.java
similarity index 100%
rename from leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/JacksonSecuritySerializer.java
rename to leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/JacksonSecuritySerializer.java
diff --git a/leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/PublicKeySerDes.java b/leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/PublicKeySerDes.java
similarity index 100%
rename from leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/PublicKeySerDes.java
rename to leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/PublicKeySerDes.java
diff --git a/leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/X509CertificateSerDes.java b/leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/X509CertificateSerDes.java
similarity index 100%
rename from leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/X509CertificateSerDes.java
rename to leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/X509CertificateSerDes.java
diff --git a/leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/servlet/SecurityServlet.java b/leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/servlet/SecurityServlet.java
similarity index 100%
rename from leshan-server-core-demo/src/main/java/org/eclipse/leshan/server/core/demo/json/servlet/SecurityServlet.java
rename to leshan-demo-servers-shared/src/main/java/org/eclipse/leshan/demo/servers/json/servlet/SecurityServlet.java
diff --git a/leshan-server-core-demo/webapp/jsconfig.json b/leshan-demo-servers-shared/webapp/jsconfig.json
similarity index 100%
rename from leshan-server-core-demo/webapp/jsconfig.json
rename to leshan-demo-servers-shared/webapp/jsconfig.json
diff --git a/leshan-server-core-demo/webapp/src/assets/image/logo.png b/leshan-demo-servers-shared/webapp/src/assets/image/logo.png
similarity index 100%
rename from leshan-server-core-demo/webapp/src/assets/image/logo.png
rename to leshan-demo-servers-shared/webapp/src/assets/image/logo.png
diff --git a/leshan-server-core-demo/webapp/src/assets/image/multicolor-leshan.png b/leshan-demo-servers-shared/webapp/src/assets/image/multicolor-leshan.png
similarity index 100%
rename from leshan-server-core-demo/webapp/src/assets/image/multicolor-leshan.png
rename to leshan-demo-servers-shared/webapp/src/assets/image/multicolor-leshan.png
diff --git a/leshan-server-core-demo/webapp/src/components/LeshanNavBar.vue b/leshan-demo-servers-shared/webapp/src/components/LeshanNavBar.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/LeshanNavBar.vue
rename to leshan-demo-servers-shared/webapp/src/components/LeshanNavBar.vue
diff --git a/leshan-server-core-demo/webapp/src/components/path/PathsInput.vue b/leshan-demo-servers-shared/webapp/src/components/path/PathsInput.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/path/PathsInput.vue
rename to leshan-demo-servers-shared/webapp/src/components/path/PathsInput.vue
diff --git a/leshan-server-core-demo/webapp/src/components/security/OscoreInput.vue b/leshan-demo-servers-shared/webapp/src/components/security/OscoreInput.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/security/OscoreInput.vue
rename to leshan-demo-servers-shared/webapp/src/components/security/OscoreInput.vue
diff --git a/leshan-server-core-demo/webapp/src/components/security/PskInput.vue b/leshan-demo-servers-shared/webapp/src/components/security/PskInput.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/security/PskInput.vue
rename to leshan-demo-servers-shared/webapp/src/components/security/PskInput.vue
diff --git a/leshan-server-core-demo/webapp/src/components/security/RpkInput.vue b/leshan-demo-servers-shared/webapp/src/components/security/RpkInput.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/security/RpkInput.vue
rename to leshan-demo-servers-shared/webapp/src/components/security/RpkInput.vue
diff --git a/leshan-server-core-demo/webapp/src/components/security/SecurityInfoChip.vue b/leshan-demo-servers-shared/webapp/src/components/security/SecurityInfoChip.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/security/SecurityInfoChip.vue
rename to leshan-demo-servers-shared/webapp/src/components/security/SecurityInfoChip.vue
diff --git a/leshan-server-core-demo/webapp/src/components/security/SecurityInfoDialog.vue b/leshan-demo-servers-shared/webapp/src/components/security/SecurityInfoDialog.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/security/SecurityInfoDialog.vue
rename to leshan-demo-servers-shared/webapp/src/components/security/SecurityInfoDialog.vue
diff --git a/leshan-server-core-demo/webapp/src/components/security/SecurityInfoInput.vue b/leshan-demo-servers-shared/webapp/src/components/security/SecurityInfoInput.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/security/SecurityInfoInput.vue
rename to leshan-demo-servers-shared/webapp/src/components/security/SecurityInfoInput.vue
diff --git a/leshan-server-core-demo/webapp/src/components/security/TlsInput.vue b/leshan-demo-servers-shared/webapp/src/components/security/TlsInput.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/security/TlsInput.vue
rename to leshan-demo-servers-shared/webapp/src/components/security/TlsInput.vue
diff --git a/leshan-server-core-demo/webapp/src/components/security/X509Input.vue b/leshan-demo-servers-shared/webapp/src/components/security/X509Input.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/components/security/X509Input.vue
rename to leshan-demo-servers-shared/webapp/src/components/security/X509Input.vue
diff --git a/leshan-server-core-demo/webapp/src/js/byteutils.js b/leshan-demo-servers-shared/webapp/src/js/byteutils.js
similarity index 100%
rename from leshan-server-core-demo/webapp/src/js/byteutils.js
rename to leshan-demo-servers-shared/webapp/src/js/byteutils.js
diff --git a/leshan-server-core-demo/webapp/src/js/securityutils.js b/leshan-demo-servers-shared/webapp/src/js/securityutils.js
similarity index 100%
rename from leshan-server-core-demo/webapp/src/js/securityutils.js
rename to leshan-demo-servers-shared/webapp/src/js/securityutils.js
diff --git a/leshan-server-core-demo/webapp/src/plugins/axios.js b/leshan-demo-servers-shared/webapp/src/plugins/axios.js
similarity index 100%
rename from leshan-server-core-demo/webapp/src/plugins/axios.js
rename to leshan-demo-servers-shared/webapp/src/plugins/axios.js
diff --git a/leshan-server-core-demo/webapp/src/plugins/dayjs.js b/leshan-demo-servers-shared/webapp/src/plugins/dayjs.js
similarity index 100%
rename from leshan-server-core-demo/webapp/src/plugins/dayjs.js
rename to leshan-demo-servers-shared/webapp/src/plugins/dayjs.js
diff --git a/leshan-server-core-demo/webapp/src/plugins/dialog.js b/leshan-demo-servers-shared/webapp/src/plugins/dialog.js
similarity index 100%
rename from leshan-server-core-demo/webapp/src/plugins/dialog.js
rename to leshan-demo-servers-shared/webapp/src/plugins/dialog.js
diff --git a/leshan-server-core-demo/webapp/src/plugins/moment.js b/leshan-demo-servers-shared/webapp/src/plugins/moment.js
similarity index 100%
rename from leshan-server-core-demo/webapp/src/plugins/moment.js
rename to leshan-demo-servers-shared/webapp/src/plugins/moment.js
diff --git a/leshan-server-core-demo/webapp/src/plugins/preferences.js b/leshan-demo-servers-shared/webapp/src/plugins/preferences.js
similarity index 100%
rename from leshan-server-core-demo/webapp/src/plugins/preferences.js
rename to leshan-demo-servers-shared/webapp/src/plugins/preferences.js
diff --git a/leshan-server-core-demo/webapp/src/plugins/sse.js b/leshan-demo-servers-shared/webapp/src/plugins/sse.js
similarity index 100%
rename from leshan-server-core-demo/webapp/src/plugins/sse.js
rename to leshan-demo-servers-shared/webapp/src/plugins/sse.js
diff --git a/leshan-server-core-demo/webapp/src/plugins/vuetify.js b/leshan-demo-servers-shared/webapp/src/plugins/vuetify.js
similarity index 100%
rename from leshan-server-core-demo/webapp/src/plugins/vuetify.js
rename to leshan-demo-servers-shared/webapp/src/plugins/vuetify.js
diff --git a/leshan-server-core-demo/webapp/src/views/About.vue b/leshan-demo-servers-shared/webapp/src/views/About.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/views/About.vue
rename to leshan-demo-servers-shared/webapp/src/views/About.vue
diff --git a/leshan-server-core-demo/webapp/src/views/Server.vue b/leshan-demo-servers-shared/webapp/src/views/Server.vue
similarity index 100%
rename from leshan-server-core-demo/webapp/src/views/Server.vue
rename to leshan-demo-servers-shared/webapp/src/views/Server.vue
diff --git a/leshan-client-cf/logback-leshan-test.xml b/leshan-demo-shared/logback-leshan-test.xml
similarity index 100%
rename from leshan-client-cf/logback-leshan-test.xml
rename to leshan-demo-shared/logback-leshan-test.xml
diff --git a/leshan-core-demo/pom.xml b/leshan-demo-shared/pom.xml
similarity index 100%
rename from leshan-core-demo/pom.xml
rename to leshan-demo-shared/pom.xml
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/LeshanProperties.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/LeshanProperties.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/LeshanProperties.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/LeshanProperties.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/LwM2mDemoConstant.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/LwM2mDemoConstant.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/LwM2mDemoConstant.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/LwM2mDemoConstant.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/MultiParameterException.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/MultiParameterException.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/MultiParameterException.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/MultiParameterException.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/ShortErrorMessageHandler.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/ShortErrorMessageHandler.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/ShortErrorMessageHandler.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/ShortErrorMessageHandler.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/StandardHelpOptions.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/StandardHelpOptions.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/StandardHelpOptions.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/StandardHelpOptions.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/VersionProvider.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/VersionProvider.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/VersionProvider.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/VersionProvider.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/CIDConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/CIDConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/CIDConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/CIDConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/ContentFormatConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/ContentFormatConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/ContentFormatConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/ContentFormatConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/HexadecimalConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/HexadecimalConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/HexadecimalConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/HexadecimalConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/InetAddressConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/InetAddressConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/InetAddressConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/InetAddressConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/LwM2mPathConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/LwM2mPathConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/LwM2mPathConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/LwM2mPathConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/PortConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/PortConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/PortConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/PortConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/PrivateKeyConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/PrivateKeyConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/PrivateKeyConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/PrivateKeyConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/PublicKeyConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/PublicKeyConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/PublicKeyConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/PublicKeyConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/ResourcePathConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/ResourcePathConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/ResourcePathConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/ResourcePathConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/StrictlyPositiveIntegerConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/StrictlyPositiveIntegerConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/StrictlyPositiveIntegerConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/StrictlyPositiveIntegerConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/StringLwM2mPathConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/StringLwM2mPathConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/StringLwM2mPathConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/StringLwM2mPathConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/TruststoreConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/TruststoreConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/TruststoreConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/TruststoreConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/VersionConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/VersionConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/VersionConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/VersionConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/X509CertificateChainConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/X509CertificateChainConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/X509CertificateChainConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/X509CertificateChainConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/X509CertificateConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/X509CertificateConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/converters/X509CertificateConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/converters/X509CertificateConverter.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/interactive/InteractiveCLI.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/interactive/InteractiveCLI.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/interactive/InteractiveCLI.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/interactive/InteractiveCLI.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/interactive/JLineInteractiveCommands.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/interactive/JLineInteractiveCommands.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/interactive/JLineInteractiveCommands.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/interactive/JLineInteractiveCommands.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/interactive/TerminalAppender.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/interactive/TerminalAppender.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/cli/interactive/TerminalAppender.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/cli/interactive/TerminalAppender.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/logback/ColorAwarePatternLayout.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/logback/ColorAwarePatternLayout.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/logback/ColorAwarePatternLayout.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/logback/ColorAwarePatternLayout.java
diff --git a/leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/logback/NoColorConverter.java b/leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/logback/NoColorConverter.java
similarity index 100%
rename from leshan-core-demo/src/main/java/org/eclipse/leshan/core/demo/logback/NoColorConverter.java
rename to leshan-demo-shared/src/main/java/org/eclipse/leshan/demo/logback/NoColorConverter.java
diff --git a/leshan-core-demo/src/main/resources/leshan.properties b/leshan-demo-shared/src/main/resources/leshan.properties
similarity index 100%
rename from leshan-core-demo/src/main/resources/leshan.properties
rename to leshan-demo-shared/src/main/resources/leshan.properties
diff --git a/leshan-core-demo/src/main/resources/models/10-1_0.xml b/leshan-demo-shared/src/main/resources/models/10-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/10-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/10.xml b/leshan-demo-shared/src/main/resources/models/10.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10.xml
rename to leshan-demo-shared/src/main/resources/models/10.xml
diff --git a/leshan-core-demo/src/main/resources/models/10241.xml b/leshan-demo-shared/src/main/resources/models/10241.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10241.xml
rename to leshan-demo-shared/src/main/resources/models/10241.xml
diff --git a/leshan-core-demo/src/main/resources/models/10242.xml b/leshan-demo-shared/src/main/resources/models/10242.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10242.xml
rename to leshan-demo-shared/src/main/resources/models/10242.xml
diff --git a/leshan-core-demo/src/main/resources/models/10243-1_0.xml b/leshan-demo-shared/src/main/resources/models/10243-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10243-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/10243-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/10243.xml b/leshan-demo-shared/src/main/resources/models/10243.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10243.xml
rename to leshan-demo-shared/src/main/resources/models/10243.xml
diff --git a/leshan-core-demo/src/main/resources/models/10244.xml b/leshan-demo-shared/src/main/resources/models/10244.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10244.xml
rename to leshan-demo-shared/src/main/resources/models/10244.xml
diff --git a/leshan-core-demo/src/main/resources/models/10245.xml b/leshan-demo-shared/src/main/resources/models/10245.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10245.xml
rename to leshan-demo-shared/src/main/resources/models/10245.xml
diff --git a/leshan-core-demo/src/main/resources/models/10246.xml b/leshan-demo-shared/src/main/resources/models/10246.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10246.xml
rename to leshan-demo-shared/src/main/resources/models/10246.xml
diff --git a/leshan-core-demo/src/main/resources/models/10247.xml b/leshan-demo-shared/src/main/resources/models/10247.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10247.xml
rename to leshan-demo-shared/src/main/resources/models/10247.xml
diff --git a/leshan-core-demo/src/main/resources/models/10248.xml b/leshan-demo-shared/src/main/resources/models/10248.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10248.xml
rename to leshan-demo-shared/src/main/resources/models/10248.xml
diff --git a/leshan-core-demo/src/main/resources/models/10249.xml b/leshan-demo-shared/src/main/resources/models/10249.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10249.xml
rename to leshan-demo-shared/src/main/resources/models/10249.xml
diff --git a/leshan-core-demo/src/main/resources/models/10250.xml b/leshan-demo-shared/src/main/resources/models/10250.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10250.xml
rename to leshan-demo-shared/src/main/resources/models/10250.xml
diff --git a/leshan-core-demo/src/main/resources/models/10251.xml b/leshan-demo-shared/src/main/resources/models/10251.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10251.xml
rename to leshan-demo-shared/src/main/resources/models/10251.xml
diff --git a/leshan-core-demo/src/main/resources/models/10252.xml b/leshan-demo-shared/src/main/resources/models/10252.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10252.xml
rename to leshan-demo-shared/src/main/resources/models/10252.xml
diff --git a/leshan-core-demo/src/main/resources/models/10253.xml b/leshan-demo-shared/src/main/resources/models/10253.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10253.xml
rename to leshan-demo-shared/src/main/resources/models/10253.xml
diff --git a/leshan-core-demo/src/main/resources/models/10254.xml b/leshan-demo-shared/src/main/resources/models/10254.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10254.xml
rename to leshan-demo-shared/src/main/resources/models/10254.xml
diff --git a/leshan-core-demo/src/main/resources/models/10255.xml b/leshan-demo-shared/src/main/resources/models/10255.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10255.xml
rename to leshan-demo-shared/src/main/resources/models/10255.xml
diff --git a/leshan-core-demo/src/main/resources/models/10256.xml b/leshan-demo-shared/src/main/resources/models/10256.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10256.xml
rename to leshan-demo-shared/src/main/resources/models/10256.xml
diff --git a/leshan-core-demo/src/main/resources/models/10257.xml b/leshan-demo-shared/src/main/resources/models/10257.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10257.xml
rename to leshan-demo-shared/src/main/resources/models/10257.xml
diff --git a/leshan-core-demo/src/main/resources/models/10258.xml b/leshan-demo-shared/src/main/resources/models/10258.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10258.xml
rename to leshan-demo-shared/src/main/resources/models/10258.xml
diff --git a/leshan-core-demo/src/main/resources/models/10259.xml b/leshan-demo-shared/src/main/resources/models/10259.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10259.xml
rename to leshan-demo-shared/src/main/resources/models/10259.xml
diff --git a/leshan-core-demo/src/main/resources/models/10260-1_0.xml b/leshan-demo-shared/src/main/resources/models/10260-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10260-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/10260-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/10260.xml b/leshan-demo-shared/src/main/resources/models/10260.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10260.xml
rename to leshan-demo-shared/src/main/resources/models/10260.xml
diff --git a/leshan-core-demo/src/main/resources/models/10262.xml b/leshan-demo-shared/src/main/resources/models/10262.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10262.xml
rename to leshan-demo-shared/src/main/resources/models/10262.xml
diff --git a/leshan-core-demo/src/main/resources/models/10263.xml b/leshan-demo-shared/src/main/resources/models/10263.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10263.xml
rename to leshan-demo-shared/src/main/resources/models/10263.xml
diff --git a/leshan-core-demo/src/main/resources/models/10264.xml b/leshan-demo-shared/src/main/resources/models/10264.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10264.xml
rename to leshan-demo-shared/src/main/resources/models/10264.xml
diff --git a/leshan-core-demo/src/main/resources/models/10265.xml b/leshan-demo-shared/src/main/resources/models/10265.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10265.xml
rename to leshan-demo-shared/src/main/resources/models/10265.xml
diff --git a/leshan-core-demo/src/main/resources/models/10266.xml b/leshan-demo-shared/src/main/resources/models/10266.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10266.xml
rename to leshan-demo-shared/src/main/resources/models/10266.xml
diff --git a/leshan-core-demo/src/main/resources/models/10267.xml b/leshan-demo-shared/src/main/resources/models/10267.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10267.xml
rename to leshan-demo-shared/src/main/resources/models/10267.xml
diff --git a/leshan-core-demo/src/main/resources/models/10268.xml b/leshan-demo-shared/src/main/resources/models/10268.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10268.xml
rename to leshan-demo-shared/src/main/resources/models/10268.xml
diff --git a/leshan-core-demo/src/main/resources/models/10269.xml b/leshan-demo-shared/src/main/resources/models/10269.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10269.xml
rename to leshan-demo-shared/src/main/resources/models/10269.xml
diff --git a/leshan-core-demo/src/main/resources/models/10270.xml b/leshan-demo-shared/src/main/resources/models/10270.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10270.xml
rename to leshan-demo-shared/src/main/resources/models/10270.xml
diff --git a/leshan-core-demo/src/main/resources/models/10271.xml b/leshan-demo-shared/src/main/resources/models/10271.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10271.xml
rename to leshan-demo-shared/src/main/resources/models/10271.xml
diff --git a/leshan-core-demo/src/main/resources/models/10272.xml b/leshan-demo-shared/src/main/resources/models/10272.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10272.xml
rename to leshan-demo-shared/src/main/resources/models/10272.xml
diff --git a/leshan-core-demo/src/main/resources/models/10273.xml b/leshan-demo-shared/src/main/resources/models/10273.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10273.xml
rename to leshan-demo-shared/src/main/resources/models/10273.xml
diff --git a/leshan-core-demo/src/main/resources/models/10274.xml b/leshan-demo-shared/src/main/resources/models/10274.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10274.xml
rename to leshan-demo-shared/src/main/resources/models/10274.xml
diff --git a/leshan-core-demo/src/main/resources/models/10275.xml b/leshan-demo-shared/src/main/resources/models/10275.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10275.xml
rename to leshan-demo-shared/src/main/resources/models/10275.xml
diff --git a/leshan-core-demo/src/main/resources/models/10276.xml b/leshan-demo-shared/src/main/resources/models/10276.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10276.xml
rename to leshan-demo-shared/src/main/resources/models/10276.xml
diff --git a/leshan-core-demo/src/main/resources/models/10277.xml b/leshan-demo-shared/src/main/resources/models/10277.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10277.xml
rename to leshan-demo-shared/src/main/resources/models/10277.xml
diff --git a/leshan-core-demo/src/main/resources/models/10278.xml b/leshan-demo-shared/src/main/resources/models/10278.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10278.xml
rename to leshan-demo-shared/src/main/resources/models/10278.xml
diff --git a/leshan-core-demo/src/main/resources/models/10279.xml b/leshan-demo-shared/src/main/resources/models/10279.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10279.xml
rename to leshan-demo-shared/src/main/resources/models/10279.xml
diff --git a/leshan-core-demo/src/main/resources/models/10280.xml b/leshan-demo-shared/src/main/resources/models/10280.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10280.xml
rename to leshan-demo-shared/src/main/resources/models/10280.xml
diff --git a/leshan-core-demo/src/main/resources/models/10281.xml b/leshan-demo-shared/src/main/resources/models/10281.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10281.xml
rename to leshan-demo-shared/src/main/resources/models/10281.xml
diff --git a/leshan-core-demo/src/main/resources/models/10282.xml b/leshan-demo-shared/src/main/resources/models/10282.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10282.xml
rename to leshan-demo-shared/src/main/resources/models/10282.xml
diff --git a/leshan-core-demo/src/main/resources/models/10283.xml b/leshan-demo-shared/src/main/resources/models/10283.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10283.xml
rename to leshan-demo-shared/src/main/resources/models/10283.xml
diff --git a/leshan-core-demo/src/main/resources/models/10284.xml b/leshan-demo-shared/src/main/resources/models/10284.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10284.xml
rename to leshan-demo-shared/src/main/resources/models/10284.xml
diff --git a/leshan-core-demo/src/main/resources/models/10286.xml b/leshan-demo-shared/src/main/resources/models/10286.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10286.xml
rename to leshan-demo-shared/src/main/resources/models/10286.xml
diff --git a/leshan-core-demo/src/main/resources/models/10290.xml b/leshan-demo-shared/src/main/resources/models/10290.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10290.xml
rename to leshan-demo-shared/src/main/resources/models/10290.xml
diff --git a/leshan-core-demo/src/main/resources/models/10291.xml b/leshan-demo-shared/src/main/resources/models/10291.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10291.xml
rename to leshan-demo-shared/src/main/resources/models/10291.xml
diff --git a/leshan-core-demo/src/main/resources/models/10292.xml b/leshan-demo-shared/src/main/resources/models/10292.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10292.xml
rename to leshan-demo-shared/src/main/resources/models/10292.xml
diff --git a/leshan-core-demo/src/main/resources/models/10299.xml b/leshan-demo-shared/src/main/resources/models/10299.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10299.xml
rename to leshan-demo-shared/src/main/resources/models/10299.xml
diff --git a/leshan-core-demo/src/main/resources/models/10300.xml b/leshan-demo-shared/src/main/resources/models/10300.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10300.xml
rename to leshan-demo-shared/src/main/resources/models/10300.xml
diff --git a/leshan-core-demo/src/main/resources/models/10308-1_0.xml b/leshan-demo-shared/src/main/resources/models/10308-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10308-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/10308-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/10308.xml b/leshan-demo-shared/src/main/resources/models/10308.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10308.xml
rename to leshan-demo-shared/src/main/resources/models/10308.xml
diff --git a/leshan-core-demo/src/main/resources/models/10309.xml b/leshan-demo-shared/src/main/resources/models/10309.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10309.xml
rename to leshan-demo-shared/src/main/resources/models/10309.xml
diff --git a/leshan-core-demo/src/main/resources/models/10311-1_0.xml b/leshan-demo-shared/src/main/resources/models/10311-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10311-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/10311-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/10311.xml b/leshan-demo-shared/src/main/resources/models/10311.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10311.xml
rename to leshan-demo-shared/src/main/resources/models/10311.xml
diff --git a/leshan-core-demo/src/main/resources/models/10313.xml b/leshan-demo-shared/src/main/resources/models/10313.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10313.xml
rename to leshan-demo-shared/src/main/resources/models/10313.xml
diff --git a/leshan-core-demo/src/main/resources/models/10314.xml b/leshan-demo-shared/src/main/resources/models/10314.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10314.xml
rename to leshan-demo-shared/src/main/resources/models/10314.xml
diff --git a/leshan-core-demo/src/main/resources/models/10315.xml b/leshan-demo-shared/src/main/resources/models/10315.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10315.xml
rename to leshan-demo-shared/src/main/resources/models/10315.xml
diff --git a/leshan-core-demo/src/main/resources/models/10316.xml b/leshan-demo-shared/src/main/resources/models/10316.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10316.xml
rename to leshan-demo-shared/src/main/resources/models/10316.xml
diff --git a/leshan-core-demo/src/main/resources/models/10318.xml b/leshan-demo-shared/src/main/resources/models/10318.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10318.xml
rename to leshan-demo-shared/src/main/resources/models/10318.xml
diff --git a/leshan-core-demo/src/main/resources/models/10319.xml b/leshan-demo-shared/src/main/resources/models/10319.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10319.xml
rename to leshan-demo-shared/src/main/resources/models/10319.xml
diff --git a/leshan-core-demo/src/main/resources/models/10320.xml b/leshan-demo-shared/src/main/resources/models/10320.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10320.xml
rename to leshan-demo-shared/src/main/resources/models/10320.xml
diff --git a/leshan-core-demo/src/main/resources/models/10322.xml b/leshan-demo-shared/src/main/resources/models/10322.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10322.xml
rename to leshan-demo-shared/src/main/resources/models/10322.xml
diff --git a/leshan-core-demo/src/main/resources/models/10323.xml b/leshan-demo-shared/src/main/resources/models/10323.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10323.xml
rename to leshan-demo-shared/src/main/resources/models/10323.xml
diff --git a/leshan-core-demo/src/main/resources/models/10324.xml b/leshan-demo-shared/src/main/resources/models/10324.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10324.xml
rename to leshan-demo-shared/src/main/resources/models/10324.xml
diff --git a/leshan-core-demo/src/main/resources/models/10326.xml b/leshan-demo-shared/src/main/resources/models/10326.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10326.xml
rename to leshan-demo-shared/src/main/resources/models/10326.xml
diff --git a/leshan-core-demo/src/main/resources/models/10327.xml b/leshan-demo-shared/src/main/resources/models/10327.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10327.xml
rename to leshan-demo-shared/src/main/resources/models/10327.xml
diff --git a/leshan-core-demo/src/main/resources/models/10328.xml b/leshan-demo-shared/src/main/resources/models/10328.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10328.xml
rename to leshan-demo-shared/src/main/resources/models/10328.xml
diff --git a/leshan-core-demo/src/main/resources/models/10329.xml b/leshan-demo-shared/src/main/resources/models/10329.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10329.xml
rename to leshan-demo-shared/src/main/resources/models/10329.xml
diff --git a/leshan-core-demo/src/main/resources/models/10330.xml b/leshan-demo-shared/src/main/resources/models/10330.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10330.xml
rename to leshan-demo-shared/src/main/resources/models/10330.xml
diff --git a/leshan-core-demo/src/main/resources/models/10331.xml b/leshan-demo-shared/src/main/resources/models/10331.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10331.xml
rename to leshan-demo-shared/src/main/resources/models/10331.xml
diff --git a/leshan-core-demo/src/main/resources/models/10332.xml b/leshan-demo-shared/src/main/resources/models/10332.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10332.xml
rename to leshan-demo-shared/src/main/resources/models/10332.xml
diff --git a/leshan-core-demo/src/main/resources/models/10333.xml b/leshan-demo-shared/src/main/resources/models/10333.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10333.xml
rename to leshan-demo-shared/src/main/resources/models/10333.xml
diff --git a/leshan-core-demo/src/main/resources/models/10334.xml b/leshan-demo-shared/src/main/resources/models/10334.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10334.xml
rename to leshan-demo-shared/src/main/resources/models/10334.xml
diff --git a/leshan-core-demo/src/main/resources/models/10335.xml b/leshan-demo-shared/src/main/resources/models/10335.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10335.xml
rename to leshan-demo-shared/src/main/resources/models/10335.xml
diff --git a/leshan-core-demo/src/main/resources/models/10336.xml b/leshan-demo-shared/src/main/resources/models/10336.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10336.xml
rename to leshan-demo-shared/src/main/resources/models/10336.xml
diff --git a/leshan-core-demo/src/main/resources/models/10337.xml b/leshan-demo-shared/src/main/resources/models/10337.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10337.xml
rename to leshan-demo-shared/src/main/resources/models/10337.xml
diff --git a/leshan-core-demo/src/main/resources/models/10338.xml b/leshan-demo-shared/src/main/resources/models/10338.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10338.xml
rename to leshan-demo-shared/src/main/resources/models/10338.xml
diff --git a/leshan-core-demo/src/main/resources/models/10339.xml b/leshan-demo-shared/src/main/resources/models/10339.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10339.xml
rename to leshan-demo-shared/src/main/resources/models/10339.xml
diff --git a/leshan-core-demo/src/main/resources/models/10340.xml b/leshan-demo-shared/src/main/resources/models/10340.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10340.xml
rename to leshan-demo-shared/src/main/resources/models/10340.xml
diff --git a/leshan-core-demo/src/main/resources/models/10341.xml b/leshan-demo-shared/src/main/resources/models/10341.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10341.xml
rename to leshan-demo-shared/src/main/resources/models/10341.xml
diff --git a/leshan-core-demo/src/main/resources/models/10342.xml b/leshan-demo-shared/src/main/resources/models/10342.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10342.xml
rename to leshan-demo-shared/src/main/resources/models/10342.xml
diff --git a/leshan-core-demo/src/main/resources/models/10343.xml b/leshan-demo-shared/src/main/resources/models/10343.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10343.xml
rename to leshan-demo-shared/src/main/resources/models/10343.xml
diff --git a/leshan-core-demo/src/main/resources/models/10344.xml b/leshan-demo-shared/src/main/resources/models/10344.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10344.xml
rename to leshan-demo-shared/src/main/resources/models/10344.xml
diff --git a/leshan-core-demo/src/main/resources/models/10345.xml b/leshan-demo-shared/src/main/resources/models/10345.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10345.xml
rename to leshan-demo-shared/src/main/resources/models/10345.xml
diff --git a/leshan-core-demo/src/main/resources/models/10346.xml b/leshan-demo-shared/src/main/resources/models/10346.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10346.xml
rename to leshan-demo-shared/src/main/resources/models/10346.xml
diff --git a/leshan-core-demo/src/main/resources/models/10347.xml b/leshan-demo-shared/src/main/resources/models/10347.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10347.xml
rename to leshan-demo-shared/src/main/resources/models/10347.xml
diff --git a/leshan-core-demo/src/main/resources/models/10348.xml b/leshan-demo-shared/src/main/resources/models/10348.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10348.xml
rename to leshan-demo-shared/src/main/resources/models/10348.xml
diff --git a/leshan-core-demo/src/main/resources/models/10349.xml b/leshan-demo-shared/src/main/resources/models/10349.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10349.xml
rename to leshan-demo-shared/src/main/resources/models/10349.xml
diff --git a/leshan-core-demo/src/main/resources/models/10350.xml b/leshan-demo-shared/src/main/resources/models/10350.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10350.xml
rename to leshan-demo-shared/src/main/resources/models/10350.xml
diff --git a/leshan-core-demo/src/main/resources/models/10351.xml b/leshan-demo-shared/src/main/resources/models/10351.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10351.xml
rename to leshan-demo-shared/src/main/resources/models/10351.xml
diff --git a/leshan-core-demo/src/main/resources/models/10352.xml b/leshan-demo-shared/src/main/resources/models/10352.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10352.xml
rename to leshan-demo-shared/src/main/resources/models/10352.xml
diff --git a/leshan-core-demo/src/main/resources/models/10353.xml b/leshan-demo-shared/src/main/resources/models/10353.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10353.xml
rename to leshan-demo-shared/src/main/resources/models/10353.xml
diff --git a/leshan-core-demo/src/main/resources/models/10354.xml b/leshan-demo-shared/src/main/resources/models/10354.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10354.xml
rename to leshan-demo-shared/src/main/resources/models/10354.xml
diff --git a/leshan-core-demo/src/main/resources/models/10355.xml b/leshan-demo-shared/src/main/resources/models/10355.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10355.xml
rename to leshan-demo-shared/src/main/resources/models/10355.xml
diff --git a/leshan-core-demo/src/main/resources/models/10356.xml b/leshan-demo-shared/src/main/resources/models/10356.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10356.xml
rename to leshan-demo-shared/src/main/resources/models/10356.xml
diff --git a/leshan-core-demo/src/main/resources/models/10357.xml b/leshan-demo-shared/src/main/resources/models/10357.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10357.xml
rename to leshan-demo-shared/src/main/resources/models/10357.xml
diff --git a/leshan-core-demo/src/main/resources/models/10358.xml b/leshan-demo-shared/src/main/resources/models/10358.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10358.xml
rename to leshan-demo-shared/src/main/resources/models/10358.xml
diff --git a/leshan-core-demo/src/main/resources/models/10359.xml b/leshan-demo-shared/src/main/resources/models/10359.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10359.xml
rename to leshan-demo-shared/src/main/resources/models/10359.xml
diff --git a/leshan-core-demo/src/main/resources/models/10360.xml b/leshan-demo-shared/src/main/resources/models/10360.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10360.xml
rename to leshan-demo-shared/src/main/resources/models/10360.xml
diff --git a/leshan-core-demo/src/main/resources/models/10361.xml b/leshan-demo-shared/src/main/resources/models/10361.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10361.xml
rename to leshan-demo-shared/src/main/resources/models/10361.xml
diff --git a/leshan-core-demo/src/main/resources/models/10362.xml b/leshan-demo-shared/src/main/resources/models/10362.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10362.xml
rename to leshan-demo-shared/src/main/resources/models/10362.xml
diff --git a/leshan-core-demo/src/main/resources/models/10363.xml b/leshan-demo-shared/src/main/resources/models/10363.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10363.xml
rename to leshan-demo-shared/src/main/resources/models/10363.xml
diff --git a/leshan-core-demo/src/main/resources/models/10364.xml b/leshan-demo-shared/src/main/resources/models/10364.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10364.xml
rename to leshan-demo-shared/src/main/resources/models/10364.xml
diff --git a/leshan-core-demo/src/main/resources/models/10365.xml b/leshan-demo-shared/src/main/resources/models/10365.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10365.xml
rename to leshan-demo-shared/src/main/resources/models/10365.xml
diff --git a/leshan-core-demo/src/main/resources/models/10366.xml b/leshan-demo-shared/src/main/resources/models/10366.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10366.xml
rename to leshan-demo-shared/src/main/resources/models/10366.xml
diff --git a/leshan-core-demo/src/main/resources/models/10368.xml b/leshan-demo-shared/src/main/resources/models/10368.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10368.xml
rename to leshan-demo-shared/src/main/resources/models/10368.xml
diff --git a/leshan-core-demo/src/main/resources/models/10369.xml b/leshan-demo-shared/src/main/resources/models/10369.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10369.xml
rename to leshan-demo-shared/src/main/resources/models/10369.xml
diff --git a/leshan-core-demo/src/main/resources/models/10371.xml b/leshan-demo-shared/src/main/resources/models/10371.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10371.xml
rename to leshan-demo-shared/src/main/resources/models/10371.xml
diff --git a/leshan-core-demo/src/main/resources/models/10374.xml b/leshan-demo-shared/src/main/resources/models/10374.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10374.xml
rename to leshan-demo-shared/src/main/resources/models/10374.xml
diff --git a/leshan-core-demo/src/main/resources/models/10375.xml b/leshan-demo-shared/src/main/resources/models/10375.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/10375.xml
rename to leshan-demo-shared/src/main/resources/models/10375.xml
diff --git a/leshan-core-demo/src/main/resources/models/11-1_0.xml b/leshan-demo-shared/src/main/resources/models/11-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/11-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/11-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/11.xml b/leshan-demo-shared/src/main/resources/models/11.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/11.xml
rename to leshan-demo-shared/src/main/resources/models/11.xml
diff --git a/leshan-core-demo/src/main/resources/models/12-1_0.xml b/leshan-demo-shared/src/main/resources/models/12-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/12-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/12-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/12.xml b/leshan-demo-shared/src/main/resources/models/12.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/12.xml
rename to leshan-demo-shared/src/main/resources/models/12.xml
diff --git a/leshan-core-demo/src/main/resources/models/13-1_0.xml b/leshan-demo-shared/src/main/resources/models/13-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/13-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/13-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/13.xml b/leshan-demo-shared/src/main/resources/models/13.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/13.xml
rename to leshan-demo-shared/src/main/resources/models/13.xml
diff --git a/leshan-core-demo/src/main/resources/models/14.xml b/leshan-demo-shared/src/main/resources/models/14.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/14.xml
rename to leshan-demo-shared/src/main/resources/models/14.xml
diff --git a/leshan-core-demo/src/main/resources/models/15-1_0.xml b/leshan-demo-shared/src/main/resources/models/15-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/15-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/15-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/15.xml b/leshan-demo-shared/src/main/resources/models/15.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/15.xml
rename to leshan-demo-shared/src/main/resources/models/15.xml
diff --git a/leshan-core-demo/src/main/resources/models/16.xml b/leshan-demo-shared/src/main/resources/models/16.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/16.xml
rename to leshan-demo-shared/src/main/resources/models/16.xml
diff --git a/leshan-core-demo/src/main/resources/models/18830.xml b/leshan-demo-shared/src/main/resources/models/18830.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/18830.xml
rename to leshan-demo-shared/src/main/resources/models/18830.xml
diff --git a/leshan-core-demo/src/main/resources/models/18831.xml b/leshan-demo-shared/src/main/resources/models/18831.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/18831.xml
rename to leshan-demo-shared/src/main/resources/models/18831.xml
diff --git a/leshan-core-demo/src/main/resources/models/19.xml b/leshan-demo-shared/src/main/resources/models/19.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/19.xml
rename to leshan-demo-shared/src/main/resources/models/19.xml
diff --git a/leshan-core-demo/src/main/resources/models/20.xml b/leshan-demo-shared/src/main/resources/models/20.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/20.xml
rename to leshan-demo-shared/src/main/resources/models/20.xml
diff --git a/leshan-core-demo/src/main/resources/models/2048.xml b/leshan-demo-shared/src/main/resources/models/2048.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2048.xml
rename to leshan-demo-shared/src/main/resources/models/2048.xml
diff --git a/leshan-core-demo/src/main/resources/models/2049.xml b/leshan-demo-shared/src/main/resources/models/2049.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2049.xml
rename to leshan-demo-shared/src/main/resources/models/2049.xml
diff --git a/leshan-core-demo/src/main/resources/models/2050.xml b/leshan-demo-shared/src/main/resources/models/2050.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2050.xml
rename to leshan-demo-shared/src/main/resources/models/2050.xml
diff --git a/leshan-core-demo/src/main/resources/models/2051.xml b/leshan-demo-shared/src/main/resources/models/2051.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2051.xml
rename to leshan-demo-shared/src/main/resources/models/2051.xml
diff --git a/leshan-core-demo/src/main/resources/models/2052.xml b/leshan-demo-shared/src/main/resources/models/2052.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2052.xml
rename to leshan-demo-shared/src/main/resources/models/2052.xml
diff --git a/leshan-core-demo/src/main/resources/models/2053.xml b/leshan-demo-shared/src/main/resources/models/2053.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2053.xml
rename to leshan-demo-shared/src/main/resources/models/2053.xml
diff --git a/leshan-core-demo/src/main/resources/models/2054.xml b/leshan-demo-shared/src/main/resources/models/2054.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2054.xml
rename to leshan-demo-shared/src/main/resources/models/2054.xml
diff --git a/leshan-core-demo/src/main/resources/models/2055.xml b/leshan-demo-shared/src/main/resources/models/2055.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2055.xml
rename to leshan-demo-shared/src/main/resources/models/2055.xml
diff --git a/leshan-core-demo/src/main/resources/models/2056.xml b/leshan-demo-shared/src/main/resources/models/2056.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2056.xml
rename to leshan-demo-shared/src/main/resources/models/2056.xml
diff --git a/leshan-core-demo/src/main/resources/models/2057.xml b/leshan-demo-shared/src/main/resources/models/2057.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/2057.xml
rename to leshan-demo-shared/src/main/resources/models/2057.xml
diff --git a/leshan-core-demo/src/main/resources/models/22-1_0.xml b/leshan-demo-shared/src/main/resources/models/22-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/22-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/22-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/22.xml b/leshan-demo-shared/src/main/resources/models/22.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/22.xml
rename to leshan-demo-shared/src/main/resources/models/22.xml
diff --git a/leshan-core-demo/src/main/resources/models/25.xml b/leshan-demo-shared/src/main/resources/models/25.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/25.xml
rename to leshan-demo-shared/src/main/resources/models/25.xml
diff --git a/leshan-core-demo/src/main/resources/models/28.xml b/leshan-demo-shared/src/main/resources/models/28.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/28.xml
rename to leshan-demo-shared/src/main/resources/models/28.xml
diff --git a/leshan-core-demo/src/main/resources/models/3200-1_0.xml b/leshan-demo-shared/src/main/resources/models/3200-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3200-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3200-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3200.xml b/leshan-demo-shared/src/main/resources/models/3200.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3200.xml
rename to leshan-demo-shared/src/main/resources/models/3200.xml
diff --git a/leshan-core-demo/src/main/resources/models/3201-1_0.xml b/leshan-demo-shared/src/main/resources/models/3201-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3201-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3201-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3201.xml b/leshan-demo-shared/src/main/resources/models/3201.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3201.xml
rename to leshan-demo-shared/src/main/resources/models/3201.xml
diff --git a/leshan-core-demo/src/main/resources/models/3202-1_0.xml b/leshan-demo-shared/src/main/resources/models/3202-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3202-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3202-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3202.xml b/leshan-demo-shared/src/main/resources/models/3202.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3202.xml
rename to leshan-demo-shared/src/main/resources/models/3202.xml
diff --git a/leshan-core-demo/src/main/resources/models/3203-1_0.xml b/leshan-demo-shared/src/main/resources/models/3203-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3203-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3203-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3203.xml b/leshan-demo-shared/src/main/resources/models/3203.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3203.xml
rename to leshan-demo-shared/src/main/resources/models/3203.xml
diff --git a/leshan-core-demo/src/main/resources/models/3300-1_0.xml b/leshan-demo-shared/src/main/resources/models/3300-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3300-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3300-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3300.xml b/leshan-demo-shared/src/main/resources/models/3300.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3300.xml
rename to leshan-demo-shared/src/main/resources/models/3300.xml
diff --git a/leshan-core-demo/src/main/resources/models/3301-1_0.xml b/leshan-demo-shared/src/main/resources/models/3301-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3301-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3301-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3301.xml b/leshan-demo-shared/src/main/resources/models/3301.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3301.xml
rename to leshan-demo-shared/src/main/resources/models/3301.xml
diff --git a/leshan-core-demo/src/main/resources/models/3302-1_0.xml b/leshan-demo-shared/src/main/resources/models/3302-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3302-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3302-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3302.xml b/leshan-demo-shared/src/main/resources/models/3302.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3302.xml
rename to leshan-demo-shared/src/main/resources/models/3302.xml
diff --git a/leshan-core-demo/src/main/resources/models/3303-1_0.xml b/leshan-demo-shared/src/main/resources/models/3303-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3303-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3303-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3303.xml b/leshan-demo-shared/src/main/resources/models/3303.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3303.xml
rename to leshan-demo-shared/src/main/resources/models/3303.xml
diff --git a/leshan-core-demo/src/main/resources/models/3304-1_0.xml b/leshan-demo-shared/src/main/resources/models/3304-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3304-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3304-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3304.xml b/leshan-demo-shared/src/main/resources/models/3304.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3304.xml
rename to leshan-demo-shared/src/main/resources/models/3304.xml
diff --git a/leshan-core-demo/src/main/resources/models/3305-1_0.xml b/leshan-demo-shared/src/main/resources/models/3305-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3305-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3305-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3305.xml b/leshan-demo-shared/src/main/resources/models/3305.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3305.xml
rename to leshan-demo-shared/src/main/resources/models/3305.xml
diff --git a/leshan-core-demo/src/main/resources/models/3306-1_0.xml b/leshan-demo-shared/src/main/resources/models/3306-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3306-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3306-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3306.xml b/leshan-demo-shared/src/main/resources/models/3306.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3306.xml
rename to leshan-demo-shared/src/main/resources/models/3306.xml
diff --git a/leshan-core-demo/src/main/resources/models/3308-1_0.xml b/leshan-demo-shared/src/main/resources/models/3308-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3308-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3308-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3308.xml b/leshan-demo-shared/src/main/resources/models/3308.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3308.xml
rename to leshan-demo-shared/src/main/resources/models/3308.xml
diff --git a/leshan-core-demo/src/main/resources/models/3310-1_0.xml b/leshan-demo-shared/src/main/resources/models/3310-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3310-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3310-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3310.xml b/leshan-demo-shared/src/main/resources/models/3310.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3310.xml
rename to leshan-demo-shared/src/main/resources/models/3310.xml
diff --git a/leshan-core-demo/src/main/resources/models/3311.xml b/leshan-demo-shared/src/main/resources/models/3311.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3311.xml
rename to leshan-demo-shared/src/main/resources/models/3311.xml
diff --git a/leshan-core-demo/src/main/resources/models/3312-1_0.xml b/leshan-demo-shared/src/main/resources/models/3312-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3312-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3312-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3312.xml b/leshan-demo-shared/src/main/resources/models/3312.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3312.xml
rename to leshan-demo-shared/src/main/resources/models/3312.xml
diff --git a/leshan-core-demo/src/main/resources/models/3313-1_0.xml b/leshan-demo-shared/src/main/resources/models/3313-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3313-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3313-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3313.xml b/leshan-demo-shared/src/main/resources/models/3313.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3313.xml
rename to leshan-demo-shared/src/main/resources/models/3313.xml
diff --git a/leshan-core-demo/src/main/resources/models/3314-1_0.xml b/leshan-demo-shared/src/main/resources/models/3314-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3314-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3314-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3314.xml b/leshan-demo-shared/src/main/resources/models/3314.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3314.xml
rename to leshan-demo-shared/src/main/resources/models/3314.xml
diff --git a/leshan-core-demo/src/main/resources/models/3315-1_0.xml b/leshan-demo-shared/src/main/resources/models/3315-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3315-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3315-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3315.xml b/leshan-demo-shared/src/main/resources/models/3315.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3315.xml
rename to leshan-demo-shared/src/main/resources/models/3315.xml
diff --git a/leshan-core-demo/src/main/resources/models/3316-1_0.xml b/leshan-demo-shared/src/main/resources/models/3316-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3316-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3316-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3316.xml b/leshan-demo-shared/src/main/resources/models/3316.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3316.xml
rename to leshan-demo-shared/src/main/resources/models/3316.xml
diff --git a/leshan-core-demo/src/main/resources/models/3317-1_0.xml b/leshan-demo-shared/src/main/resources/models/3317-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3317-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3317-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3317.xml b/leshan-demo-shared/src/main/resources/models/3317.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3317.xml
rename to leshan-demo-shared/src/main/resources/models/3317.xml
diff --git a/leshan-core-demo/src/main/resources/models/3318-1_0.xml b/leshan-demo-shared/src/main/resources/models/3318-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3318-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3318-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3318.xml b/leshan-demo-shared/src/main/resources/models/3318.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3318.xml
rename to leshan-demo-shared/src/main/resources/models/3318.xml
diff --git a/leshan-core-demo/src/main/resources/models/3319-1_0.xml b/leshan-demo-shared/src/main/resources/models/3319-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3319-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3319-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3319.xml b/leshan-demo-shared/src/main/resources/models/3319.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3319.xml
rename to leshan-demo-shared/src/main/resources/models/3319.xml
diff --git a/leshan-core-demo/src/main/resources/models/3320-1_0.xml b/leshan-demo-shared/src/main/resources/models/3320-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3320-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3320-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3320.xml b/leshan-demo-shared/src/main/resources/models/3320.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3320.xml
rename to leshan-demo-shared/src/main/resources/models/3320.xml
diff --git a/leshan-core-demo/src/main/resources/models/3321-1_0.xml b/leshan-demo-shared/src/main/resources/models/3321-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3321-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3321-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3321.xml b/leshan-demo-shared/src/main/resources/models/3321.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3321.xml
rename to leshan-demo-shared/src/main/resources/models/3321.xml
diff --git a/leshan-core-demo/src/main/resources/models/3322-1_0.xml b/leshan-demo-shared/src/main/resources/models/3322-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3322-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3322-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3322.xml b/leshan-demo-shared/src/main/resources/models/3322.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3322.xml
rename to leshan-demo-shared/src/main/resources/models/3322.xml
diff --git a/leshan-core-demo/src/main/resources/models/3323-1_0.xml b/leshan-demo-shared/src/main/resources/models/3323-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3323-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3323-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3323.xml b/leshan-demo-shared/src/main/resources/models/3323.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3323.xml
rename to leshan-demo-shared/src/main/resources/models/3323.xml
diff --git a/leshan-core-demo/src/main/resources/models/3324-1_0.xml b/leshan-demo-shared/src/main/resources/models/3324-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3324-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3324-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3324.xml b/leshan-demo-shared/src/main/resources/models/3324.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3324.xml
rename to leshan-demo-shared/src/main/resources/models/3324.xml
diff --git a/leshan-core-demo/src/main/resources/models/3325-1_0.xml b/leshan-demo-shared/src/main/resources/models/3325-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3325-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3325-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3325.xml b/leshan-demo-shared/src/main/resources/models/3325.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3325.xml
rename to leshan-demo-shared/src/main/resources/models/3325.xml
diff --git a/leshan-core-demo/src/main/resources/models/3326-1_0.xml b/leshan-demo-shared/src/main/resources/models/3326-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3326-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3326-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3326.xml b/leshan-demo-shared/src/main/resources/models/3326.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3326.xml
rename to leshan-demo-shared/src/main/resources/models/3326.xml
diff --git a/leshan-core-demo/src/main/resources/models/3327-1_0.xml b/leshan-demo-shared/src/main/resources/models/3327-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3327-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3327-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3327.xml b/leshan-demo-shared/src/main/resources/models/3327.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3327.xml
rename to leshan-demo-shared/src/main/resources/models/3327.xml
diff --git a/leshan-core-demo/src/main/resources/models/3328-1_0.xml b/leshan-demo-shared/src/main/resources/models/3328-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3328-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3328-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3328.xml b/leshan-demo-shared/src/main/resources/models/3328.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3328.xml
rename to leshan-demo-shared/src/main/resources/models/3328.xml
diff --git a/leshan-core-demo/src/main/resources/models/3329-1_0.xml b/leshan-demo-shared/src/main/resources/models/3329-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3329-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3329-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3329.xml b/leshan-demo-shared/src/main/resources/models/3329.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3329.xml
rename to leshan-demo-shared/src/main/resources/models/3329.xml
diff --git a/leshan-core-demo/src/main/resources/models/3330-1_0.xml b/leshan-demo-shared/src/main/resources/models/3330-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3330-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3330-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3330.xml b/leshan-demo-shared/src/main/resources/models/3330.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3330.xml
rename to leshan-demo-shared/src/main/resources/models/3330.xml
diff --git a/leshan-core-demo/src/main/resources/models/3331-1_0.xml b/leshan-demo-shared/src/main/resources/models/3331-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3331-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3331-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3331.xml b/leshan-demo-shared/src/main/resources/models/3331.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3331.xml
rename to leshan-demo-shared/src/main/resources/models/3331.xml
diff --git a/leshan-core-demo/src/main/resources/models/3332-1_0.xml b/leshan-demo-shared/src/main/resources/models/3332-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3332-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3332-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3332.xml b/leshan-demo-shared/src/main/resources/models/3332.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3332.xml
rename to leshan-demo-shared/src/main/resources/models/3332.xml
diff --git a/leshan-core-demo/src/main/resources/models/3333-1_0.xml b/leshan-demo-shared/src/main/resources/models/3333-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3333-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3333-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3333.xml b/leshan-demo-shared/src/main/resources/models/3333.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3333.xml
rename to leshan-demo-shared/src/main/resources/models/3333.xml
diff --git a/leshan-core-demo/src/main/resources/models/3334-1_0.xml b/leshan-demo-shared/src/main/resources/models/3334-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3334-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3334-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3334.xml b/leshan-demo-shared/src/main/resources/models/3334.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3334.xml
rename to leshan-demo-shared/src/main/resources/models/3334.xml
diff --git a/leshan-core-demo/src/main/resources/models/3335-1_0.xml b/leshan-demo-shared/src/main/resources/models/3335-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3335-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3335-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3335.xml b/leshan-demo-shared/src/main/resources/models/3335.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3335.xml
rename to leshan-demo-shared/src/main/resources/models/3335.xml
diff --git a/leshan-core-demo/src/main/resources/models/3336-1_0.xml b/leshan-demo-shared/src/main/resources/models/3336-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3336-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3336-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3336-1_1.xml b/leshan-demo-shared/src/main/resources/models/3336-1_1.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3336-1_1.xml
rename to leshan-demo-shared/src/main/resources/models/3336-1_1.xml
diff --git a/leshan-core-demo/src/main/resources/models/3336.xml b/leshan-demo-shared/src/main/resources/models/3336.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3336.xml
rename to leshan-demo-shared/src/main/resources/models/3336.xml
diff --git a/leshan-core-demo/src/main/resources/models/3337-1_0.xml b/leshan-demo-shared/src/main/resources/models/3337-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3337-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3337-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3337.xml b/leshan-demo-shared/src/main/resources/models/3337.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3337.xml
rename to leshan-demo-shared/src/main/resources/models/3337.xml
diff --git a/leshan-core-demo/src/main/resources/models/3338-1_0.xml b/leshan-demo-shared/src/main/resources/models/3338-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3338-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3338-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3338.xml b/leshan-demo-shared/src/main/resources/models/3338.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3338.xml
rename to leshan-demo-shared/src/main/resources/models/3338.xml
diff --git a/leshan-core-demo/src/main/resources/models/3339.xml b/leshan-demo-shared/src/main/resources/models/3339.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3339.xml
rename to leshan-demo-shared/src/main/resources/models/3339.xml
diff --git a/leshan-core-demo/src/main/resources/models/3340.xml b/leshan-demo-shared/src/main/resources/models/3340.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3340.xml
rename to leshan-demo-shared/src/main/resources/models/3340.xml
diff --git a/leshan-core-demo/src/main/resources/models/3341.xml b/leshan-demo-shared/src/main/resources/models/3341.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3341.xml
rename to leshan-demo-shared/src/main/resources/models/3341.xml
diff --git a/leshan-core-demo/src/main/resources/models/3342-1_0.xml b/leshan-demo-shared/src/main/resources/models/3342-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3342-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3342-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3342.xml b/leshan-demo-shared/src/main/resources/models/3342.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3342.xml
rename to leshan-demo-shared/src/main/resources/models/3342.xml
diff --git a/leshan-core-demo/src/main/resources/models/3343.xml b/leshan-demo-shared/src/main/resources/models/3343.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3343.xml
rename to leshan-demo-shared/src/main/resources/models/3343.xml
diff --git a/leshan-core-demo/src/main/resources/models/3344.xml b/leshan-demo-shared/src/main/resources/models/3344.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3344.xml
rename to leshan-demo-shared/src/main/resources/models/3344.xml
diff --git a/leshan-core-demo/src/main/resources/models/3345.xml b/leshan-demo-shared/src/main/resources/models/3345.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3345.xml
rename to leshan-demo-shared/src/main/resources/models/3345.xml
diff --git a/leshan-core-demo/src/main/resources/models/3346-1_0.xml b/leshan-demo-shared/src/main/resources/models/3346-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3346-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3346-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3346.xml b/leshan-demo-shared/src/main/resources/models/3346.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3346.xml
rename to leshan-demo-shared/src/main/resources/models/3346.xml
diff --git a/leshan-core-demo/src/main/resources/models/3347-1_0.xml b/leshan-demo-shared/src/main/resources/models/3347-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3347-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3347-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3347.xml b/leshan-demo-shared/src/main/resources/models/3347.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3347.xml
rename to leshan-demo-shared/src/main/resources/models/3347.xml
diff --git a/leshan-core-demo/src/main/resources/models/3348-1_0.xml b/leshan-demo-shared/src/main/resources/models/3348-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3348-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3348-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3348.xml b/leshan-demo-shared/src/main/resources/models/3348.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3348.xml
rename to leshan-demo-shared/src/main/resources/models/3348.xml
diff --git a/leshan-core-demo/src/main/resources/models/3349-1_0.xml b/leshan-demo-shared/src/main/resources/models/3349-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3349-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3349-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3349.xml b/leshan-demo-shared/src/main/resources/models/3349.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3349.xml
rename to leshan-demo-shared/src/main/resources/models/3349.xml
diff --git a/leshan-core-demo/src/main/resources/models/3350-1_0.xml b/leshan-demo-shared/src/main/resources/models/3350-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3350-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3350-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3350.xml b/leshan-demo-shared/src/main/resources/models/3350.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3350.xml
rename to leshan-demo-shared/src/main/resources/models/3350.xml
diff --git a/leshan-core-demo/src/main/resources/models/3351.xml b/leshan-demo-shared/src/main/resources/models/3351.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3351.xml
rename to leshan-demo-shared/src/main/resources/models/3351.xml
diff --git a/leshan-core-demo/src/main/resources/models/3352.xml b/leshan-demo-shared/src/main/resources/models/3352.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3352.xml
rename to leshan-demo-shared/src/main/resources/models/3352.xml
diff --git a/leshan-core-demo/src/main/resources/models/3353.xml b/leshan-demo-shared/src/main/resources/models/3353.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3353.xml
rename to leshan-demo-shared/src/main/resources/models/3353.xml
diff --git a/leshan-core-demo/src/main/resources/models/3354.xml b/leshan-demo-shared/src/main/resources/models/3354.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3354.xml
rename to leshan-demo-shared/src/main/resources/models/3354.xml
diff --git a/leshan-core-demo/src/main/resources/models/3355.xml b/leshan-demo-shared/src/main/resources/models/3355.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3355.xml
rename to leshan-demo-shared/src/main/resources/models/3355.xml
diff --git a/leshan-core-demo/src/main/resources/models/3356.xml b/leshan-demo-shared/src/main/resources/models/3356.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3356.xml
rename to leshan-demo-shared/src/main/resources/models/3356.xml
diff --git a/leshan-core-demo/src/main/resources/models/3357.xml b/leshan-demo-shared/src/main/resources/models/3357.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3357.xml
rename to leshan-demo-shared/src/main/resources/models/3357.xml
diff --git a/leshan-core-demo/src/main/resources/models/3358.xml b/leshan-demo-shared/src/main/resources/models/3358.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3358.xml
rename to leshan-demo-shared/src/main/resources/models/3358.xml
diff --git a/leshan-core-demo/src/main/resources/models/3359.xml b/leshan-demo-shared/src/main/resources/models/3359.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3359.xml
rename to leshan-demo-shared/src/main/resources/models/3359.xml
diff --git a/leshan-core-demo/src/main/resources/models/3360.xml b/leshan-demo-shared/src/main/resources/models/3360.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3360.xml
rename to leshan-demo-shared/src/main/resources/models/3360.xml
diff --git a/leshan-core-demo/src/main/resources/models/3361.xml b/leshan-demo-shared/src/main/resources/models/3361.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3361.xml
rename to leshan-demo-shared/src/main/resources/models/3361.xml
diff --git a/leshan-core-demo/src/main/resources/models/3362.xml b/leshan-demo-shared/src/main/resources/models/3362.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3362.xml
rename to leshan-demo-shared/src/main/resources/models/3362.xml
diff --git a/leshan-core-demo/src/main/resources/models/3363.xml b/leshan-demo-shared/src/main/resources/models/3363.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3363.xml
rename to leshan-demo-shared/src/main/resources/models/3363.xml
diff --git a/leshan-core-demo/src/main/resources/models/3364.xml b/leshan-demo-shared/src/main/resources/models/3364.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3364.xml
rename to leshan-demo-shared/src/main/resources/models/3364.xml
diff --git a/leshan-core-demo/src/main/resources/models/3365.xml b/leshan-demo-shared/src/main/resources/models/3365.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3365.xml
rename to leshan-demo-shared/src/main/resources/models/3365.xml
diff --git a/leshan-core-demo/src/main/resources/models/3366.xml b/leshan-demo-shared/src/main/resources/models/3366.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3366.xml
rename to leshan-demo-shared/src/main/resources/models/3366.xml
diff --git a/leshan-core-demo/src/main/resources/models/3367.xml b/leshan-demo-shared/src/main/resources/models/3367.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3367.xml
rename to leshan-demo-shared/src/main/resources/models/3367.xml
diff --git a/leshan-core-demo/src/main/resources/models/3368.xml b/leshan-demo-shared/src/main/resources/models/3368.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3368.xml
rename to leshan-demo-shared/src/main/resources/models/3368.xml
diff --git a/leshan-core-demo/src/main/resources/models/3369.xml b/leshan-demo-shared/src/main/resources/models/3369.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3369.xml
rename to leshan-demo-shared/src/main/resources/models/3369.xml
diff --git a/leshan-core-demo/src/main/resources/models/3370.xml b/leshan-demo-shared/src/main/resources/models/3370.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3370.xml
rename to leshan-demo-shared/src/main/resources/models/3370.xml
diff --git a/leshan-core-demo/src/main/resources/models/3371.xml b/leshan-demo-shared/src/main/resources/models/3371.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3371.xml
rename to leshan-demo-shared/src/main/resources/models/3371.xml
diff --git a/leshan-core-demo/src/main/resources/models/3372.xml b/leshan-demo-shared/src/main/resources/models/3372.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3372.xml
rename to leshan-demo-shared/src/main/resources/models/3372.xml
diff --git a/leshan-core-demo/src/main/resources/models/3373.xml b/leshan-demo-shared/src/main/resources/models/3373.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3373.xml
rename to leshan-demo-shared/src/main/resources/models/3373.xml
diff --git a/leshan-core-demo/src/main/resources/models/3374.xml b/leshan-demo-shared/src/main/resources/models/3374.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3374.xml
rename to leshan-demo-shared/src/main/resources/models/3374.xml
diff --git a/leshan-core-demo/src/main/resources/models/3375.xml b/leshan-demo-shared/src/main/resources/models/3375.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3375.xml
rename to leshan-demo-shared/src/main/resources/models/3375.xml
diff --git a/leshan-core-demo/src/main/resources/models/3376.xml b/leshan-demo-shared/src/main/resources/models/3376.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3376.xml
rename to leshan-demo-shared/src/main/resources/models/3376.xml
diff --git a/leshan-core-demo/src/main/resources/models/3377.xml b/leshan-demo-shared/src/main/resources/models/3377.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3377.xml
rename to leshan-demo-shared/src/main/resources/models/3377.xml
diff --git a/leshan-core-demo/src/main/resources/models/3378.xml b/leshan-demo-shared/src/main/resources/models/3378.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3378.xml
rename to leshan-demo-shared/src/main/resources/models/3378.xml
diff --git a/leshan-core-demo/src/main/resources/models/3379.xml b/leshan-demo-shared/src/main/resources/models/3379.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3379.xml
rename to leshan-demo-shared/src/main/resources/models/3379.xml
diff --git a/leshan-core-demo/src/main/resources/models/3380-1_0.xml b/leshan-demo-shared/src/main/resources/models/3380-1_0.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3380-1_0.xml
rename to leshan-demo-shared/src/main/resources/models/3380-1_0.xml
diff --git a/leshan-core-demo/src/main/resources/models/3380.xml b/leshan-demo-shared/src/main/resources/models/3380.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3380.xml
rename to leshan-demo-shared/src/main/resources/models/3380.xml
diff --git a/leshan-core-demo/src/main/resources/models/3381.xml b/leshan-demo-shared/src/main/resources/models/3381.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3381.xml
rename to leshan-demo-shared/src/main/resources/models/3381.xml
diff --git a/leshan-core-demo/src/main/resources/models/3382.xml b/leshan-demo-shared/src/main/resources/models/3382.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3382.xml
rename to leshan-demo-shared/src/main/resources/models/3382.xml
diff --git a/leshan-core-demo/src/main/resources/models/3383.xml b/leshan-demo-shared/src/main/resources/models/3383.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3383.xml
rename to leshan-demo-shared/src/main/resources/models/3383.xml
diff --git a/leshan-core-demo/src/main/resources/models/3384.xml b/leshan-demo-shared/src/main/resources/models/3384.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3384.xml
rename to leshan-demo-shared/src/main/resources/models/3384.xml
diff --git a/leshan-core-demo/src/main/resources/models/3385.xml b/leshan-demo-shared/src/main/resources/models/3385.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3385.xml
rename to leshan-demo-shared/src/main/resources/models/3385.xml
diff --git a/leshan-core-demo/src/main/resources/models/3386.xml b/leshan-demo-shared/src/main/resources/models/3386.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3386.xml
rename to leshan-demo-shared/src/main/resources/models/3386.xml
diff --git a/leshan-core-demo/src/main/resources/models/3387.xml b/leshan-demo-shared/src/main/resources/models/3387.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3387.xml
rename to leshan-demo-shared/src/main/resources/models/3387.xml
diff --git a/leshan-core-demo/src/main/resources/models/3388.xml b/leshan-demo-shared/src/main/resources/models/3388.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3388.xml
rename to leshan-demo-shared/src/main/resources/models/3388.xml
diff --git a/leshan-core-demo/src/main/resources/models/3389.xml b/leshan-demo-shared/src/main/resources/models/3389.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3389.xml
rename to leshan-demo-shared/src/main/resources/models/3389.xml
diff --git a/leshan-core-demo/src/main/resources/models/3390.xml b/leshan-demo-shared/src/main/resources/models/3390.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3390.xml
rename to leshan-demo-shared/src/main/resources/models/3390.xml
diff --git a/leshan-core-demo/src/main/resources/models/3391.xml b/leshan-demo-shared/src/main/resources/models/3391.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3391.xml
rename to leshan-demo-shared/src/main/resources/models/3391.xml
diff --git a/leshan-core-demo/src/main/resources/models/3392.xml b/leshan-demo-shared/src/main/resources/models/3392.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3392.xml
rename to leshan-demo-shared/src/main/resources/models/3392.xml
diff --git a/leshan-core-demo/src/main/resources/models/3393.xml b/leshan-demo-shared/src/main/resources/models/3393.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3393.xml
rename to leshan-demo-shared/src/main/resources/models/3393.xml
diff --git a/leshan-core-demo/src/main/resources/models/3394.xml b/leshan-demo-shared/src/main/resources/models/3394.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3394.xml
rename to leshan-demo-shared/src/main/resources/models/3394.xml
diff --git a/leshan-core-demo/src/main/resources/models/3395.xml b/leshan-demo-shared/src/main/resources/models/3395.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3395.xml
rename to leshan-demo-shared/src/main/resources/models/3395.xml
diff --git a/leshan-core-demo/src/main/resources/models/3396.xml b/leshan-demo-shared/src/main/resources/models/3396.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3396.xml
rename to leshan-demo-shared/src/main/resources/models/3396.xml
diff --git a/leshan-core-demo/src/main/resources/models/3397.xml b/leshan-demo-shared/src/main/resources/models/3397.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3397.xml
rename to leshan-demo-shared/src/main/resources/models/3397.xml
diff --git a/leshan-core-demo/src/main/resources/models/3398.xml b/leshan-demo-shared/src/main/resources/models/3398.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3398.xml
rename to leshan-demo-shared/src/main/resources/models/3398.xml
diff --git a/leshan-core-demo/src/main/resources/models/3399.xml b/leshan-demo-shared/src/main/resources/models/3399.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3399.xml
rename to leshan-demo-shared/src/main/resources/models/3399.xml
diff --git a/leshan-core-demo/src/main/resources/models/3400.xml b/leshan-demo-shared/src/main/resources/models/3400.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3400.xml
rename to leshan-demo-shared/src/main/resources/models/3400.xml
diff --git a/leshan-core-demo/src/main/resources/models/3401.xml b/leshan-demo-shared/src/main/resources/models/3401.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3401.xml
rename to leshan-demo-shared/src/main/resources/models/3401.xml
diff --git a/leshan-core-demo/src/main/resources/models/3402.xml b/leshan-demo-shared/src/main/resources/models/3402.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3402.xml
rename to leshan-demo-shared/src/main/resources/models/3402.xml
diff --git a/leshan-core-demo/src/main/resources/models/3403.xml b/leshan-demo-shared/src/main/resources/models/3403.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3403.xml
rename to leshan-demo-shared/src/main/resources/models/3403.xml
diff --git a/leshan-core-demo/src/main/resources/models/3404.xml b/leshan-demo-shared/src/main/resources/models/3404.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3404.xml
rename to leshan-demo-shared/src/main/resources/models/3404.xml
diff --git a/leshan-core-demo/src/main/resources/models/3405.xml b/leshan-demo-shared/src/main/resources/models/3405.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3405.xml
rename to leshan-demo-shared/src/main/resources/models/3405.xml
diff --git a/leshan-core-demo/src/main/resources/models/3406.xml b/leshan-demo-shared/src/main/resources/models/3406.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3406.xml
rename to leshan-demo-shared/src/main/resources/models/3406.xml
diff --git a/leshan-core-demo/src/main/resources/models/3407.xml b/leshan-demo-shared/src/main/resources/models/3407.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3407.xml
rename to leshan-demo-shared/src/main/resources/models/3407.xml
diff --git a/leshan-core-demo/src/main/resources/models/3408.xml b/leshan-demo-shared/src/main/resources/models/3408.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3408.xml
rename to leshan-demo-shared/src/main/resources/models/3408.xml
diff --git a/leshan-core-demo/src/main/resources/models/3410.xml b/leshan-demo-shared/src/main/resources/models/3410.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3410.xml
rename to leshan-demo-shared/src/main/resources/models/3410.xml
diff --git a/leshan-core-demo/src/main/resources/models/3411.xml b/leshan-demo-shared/src/main/resources/models/3411.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3411.xml
rename to leshan-demo-shared/src/main/resources/models/3411.xml
diff --git a/leshan-core-demo/src/main/resources/models/3412.xml b/leshan-demo-shared/src/main/resources/models/3412.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3412.xml
rename to leshan-demo-shared/src/main/resources/models/3412.xml
diff --git a/leshan-core-demo/src/main/resources/models/3413.xml b/leshan-demo-shared/src/main/resources/models/3413.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3413.xml
rename to leshan-demo-shared/src/main/resources/models/3413.xml
diff --git a/leshan-core-demo/src/main/resources/models/3414.xml b/leshan-demo-shared/src/main/resources/models/3414.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3414.xml
rename to leshan-demo-shared/src/main/resources/models/3414.xml
diff --git a/leshan-core-demo/src/main/resources/models/3415.xml b/leshan-demo-shared/src/main/resources/models/3415.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3415.xml
rename to leshan-demo-shared/src/main/resources/models/3415.xml
diff --git a/leshan-core-demo/src/main/resources/models/3416.xml b/leshan-demo-shared/src/main/resources/models/3416.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3416.xml
rename to leshan-demo-shared/src/main/resources/models/3416.xml
diff --git a/leshan-core-demo/src/main/resources/models/3417.xml b/leshan-demo-shared/src/main/resources/models/3417.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3417.xml
rename to leshan-demo-shared/src/main/resources/models/3417.xml
diff --git a/leshan-core-demo/src/main/resources/models/3418.xml b/leshan-demo-shared/src/main/resources/models/3418.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3418.xml
rename to leshan-demo-shared/src/main/resources/models/3418.xml
diff --git a/leshan-core-demo/src/main/resources/models/3419.xml b/leshan-demo-shared/src/main/resources/models/3419.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3419.xml
rename to leshan-demo-shared/src/main/resources/models/3419.xml
diff --git a/leshan-core-demo/src/main/resources/models/3420.xml b/leshan-demo-shared/src/main/resources/models/3420.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3420.xml
rename to leshan-demo-shared/src/main/resources/models/3420.xml
diff --git a/leshan-core-demo/src/main/resources/models/3421.xml b/leshan-demo-shared/src/main/resources/models/3421.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3421.xml
rename to leshan-demo-shared/src/main/resources/models/3421.xml
diff --git a/leshan-core-demo/src/main/resources/models/3423.xml b/leshan-demo-shared/src/main/resources/models/3423.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3423.xml
rename to leshan-demo-shared/src/main/resources/models/3423.xml
diff --git a/leshan-core-demo/src/main/resources/models/3424.xml b/leshan-demo-shared/src/main/resources/models/3424.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3424.xml
rename to leshan-demo-shared/src/main/resources/models/3424.xml
diff --git a/leshan-core-demo/src/main/resources/models/3425.xml b/leshan-demo-shared/src/main/resources/models/3425.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3425.xml
rename to leshan-demo-shared/src/main/resources/models/3425.xml
diff --git a/leshan-core-demo/src/main/resources/models/3426.xml b/leshan-demo-shared/src/main/resources/models/3426.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3426.xml
rename to leshan-demo-shared/src/main/resources/models/3426.xml
diff --git a/leshan-core-demo/src/main/resources/models/3427.xml b/leshan-demo-shared/src/main/resources/models/3427.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3427.xml
rename to leshan-demo-shared/src/main/resources/models/3427.xml
diff --git a/leshan-core-demo/src/main/resources/models/3428.xml b/leshan-demo-shared/src/main/resources/models/3428.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3428.xml
rename to leshan-demo-shared/src/main/resources/models/3428.xml
diff --git a/leshan-core-demo/src/main/resources/models/3429.xml b/leshan-demo-shared/src/main/resources/models/3429.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3429.xml
rename to leshan-demo-shared/src/main/resources/models/3429.xml
diff --git a/leshan-core-demo/src/main/resources/models/3430.xml b/leshan-demo-shared/src/main/resources/models/3430.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3430.xml
rename to leshan-demo-shared/src/main/resources/models/3430.xml
diff --git a/leshan-core-demo/src/main/resources/models/3431.xml b/leshan-demo-shared/src/main/resources/models/3431.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3431.xml
rename to leshan-demo-shared/src/main/resources/models/3431.xml
diff --git a/leshan-core-demo/src/main/resources/models/3432.xml b/leshan-demo-shared/src/main/resources/models/3432.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3432.xml
rename to leshan-demo-shared/src/main/resources/models/3432.xml
diff --git a/leshan-core-demo/src/main/resources/models/3433.xml b/leshan-demo-shared/src/main/resources/models/3433.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3433.xml
rename to leshan-demo-shared/src/main/resources/models/3433.xml
diff --git a/leshan-core-demo/src/main/resources/models/3434.xml b/leshan-demo-shared/src/main/resources/models/3434.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3434.xml
rename to leshan-demo-shared/src/main/resources/models/3434.xml
diff --git a/leshan-core-demo/src/main/resources/models/3435.xml b/leshan-demo-shared/src/main/resources/models/3435.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3435.xml
rename to leshan-demo-shared/src/main/resources/models/3435.xml
diff --git a/leshan-core-demo/src/main/resources/models/3436.xml b/leshan-demo-shared/src/main/resources/models/3436.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3436.xml
rename to leshan-demo-shared/src/main/resources/models/3436.xml
diff --git a/leshan-core-demo/src/main/resources/models/3437.xml b/leshan-demo-shared/src/main/resources/models/3437.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3437.xml
rename to leshan-demo-shared/src/main/resources/models/3437.xml
diff --git a/leshan-core-demo/src/main/resources/models/3438.xml b/leshan-demo-shared/src/main/resources/models/3438.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3438.xml
rename to leshan-demo-shared/src/main/resources/models/3438.xml
diff --git a/leshan-core-demo/src/main/resources/models/3439.xml b/leshan-demo-shared/src/main/resources/models/3439.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3439.xml
rename to leshan-demo-shared/src/main/resources/models/3439.xml
diff --git a/leshan-core-demo/src/main/resources/models/3441.xml b/leshan-demo-shared/src/main/resources/models/3441.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3441.xml
rename to leshan-demo-shared/src/main/resources/models/3441.xml
diff --git a/leshan-core-demo/src/main/resources/models/3442.xml b/leshan-demo-shared/src/main/resources/models/3442.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/3442.xml
rename to leshan-demo-shared/src/main/resources/models/3442.xml
diff --git a/leshan-core-demo/src/main/resources/models/500.xml b/leshan-demo-shared/src/main/resources/models/500.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/500.xml
rename to leshan-demo-shared/src/main/resources/models/500.xml
diff --git a/leshan-core-demo/src/main/resources/models/501.xml b/leshan-demo-shared/src/main/resources/models/501.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/501.xml
rename to leshan-demo-shared/src/main/resources/models/501.xml
diff --git a/leshan-core-demo/src/main/resources/models/502.xml b/leshan-demo-shared/src/main/resources/models/502.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/502.xml
rename to leshan-demo-shared/src/main/resources/models/502.xml
diff --git a/leshan-core-demo/src/main/resources/models/503.xml b/leshan-demo-shared/src/main/resources/models/503.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/503.xml
rename to leshan-demo-shared/src/main/resources/models/503.xml
diff --git a/leshan-core-demo/src/main/resources/models/504.xml b/leshan-demo-shared/src/main/resources/models/504.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/504.xml
rename to leshan-demo-shared/src/main/resources/models/504.xml
diff --git a/leshan-core-demo/src/main/resources/models/505.xml b/leshan-demo-shared/src/main/resources/models/505.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/505.xml
rename to leshan-demo-shared/src/main/resources/models/505.xml
diff --git a/leshan-core-demo/src/main/resources/models/8.xml b/leshan-demo-shared/src/main/resources/models/8.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/8.xml
rename to leshan-demo-shared/src/main/resources/models/8.xml
diff --git a/leshan-core-demo/src/main/resources/models/9.xml b/leshan-demo-shared/src/main/resources/models/9.xml
similarity index 100%
rename from leshan-core-demo/src/main/resources/models/9.xml
rename to leshan-demo-shared/src/main/resources/models/9.xml
diff --git a/leshan-core-demo/src/test/java/org/eclipse/leshan/core/demo/ValidateDemoModelsTest.java b/leshan-demo-shared/src/test/java/org/eclipse/leshan/demo/ValidateDemoModelsTest.java
similarity index 100%
rename from leshan-core-demo/src/test/java/org/eclipse/leshan/core/demo/ValidateDemoModelsTest.java
rename to leshan-demo-shared/src/test/java/org/eclipse/leshan/demo/ValidateDemoModelsTest.java
diff --git a/leshan-client-core/logback-leshan-test.xml b/leshan-lwm2m-client/logback-leshan-test.xml
similarity index 100%
rename from leshan-client-core/logback-leshan-test.xml
rename to leshan-lwm2m-client/logback-leshan-test.xml
diff --git a/leshan-client-core/pom.xml b/leshan-lwm2m-client/pom.xml
similarity index 100%
rename from leshan-client-core/pom.xml
rename to leshan-lwm2m-client/pom.xml
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/EndpointsManager.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/EndpointsManager.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/EndpointsManager.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/EndpointsManager.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/LeshanClient.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/LeshanClient.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/LeshanClient.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/LeshanClient.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/LeshanClientBuilder.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/LeshanClientBuilder.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/LeshanClientBuilder.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/LeshanClientBuilder.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/LwM2mClient.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/LwM2mClient.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/LwM2mClient.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/LwM2mClient.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationUpdate.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/RegistrationUpdate.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationUpdate.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/RegistrationUpdate.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationUpdateHandler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/RegistrationUpdateHandler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/RegistrationUpdateHandler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/RegistrationUpdateHandler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/BaseBootstrapConsistencyChecker.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/BaseBootstrapConsistencyChecker.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/BaseBootstrapConsistencyChecker.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/BaseBootstrapConsistencyChecker.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapConsistencyChecker.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapConsistencyChecker.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapConsistencyChecker.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapConsistencyChecker.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapHandler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapHandler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapHandler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapHandler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapListener.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapListener.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapListener.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/BootstrapListener.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/DefaultBootstrapConsistencyChecker.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/DefaultBootstrapConsistencyChecker.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/DefaultBootstrapConsistencyChecker.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/DefaultBootstrapConsistencyChecker.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/InvalidStateException.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/InvalidStateException.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/bootstrap/InvalidStateException.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/bootstrap/InvalidStateException.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/ClientEndpointToolbox.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/ClientEndpointToolbox.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/ClientEndpointToolbox.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/ClientEndpointToolbox.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/CompositeClientEndpointsProvider.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/CompositeClientEndpointsProvider.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/CompositeClientEndpointsProvider.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/CompositeClientEndpointsProvider.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/DefaultCompositeClientEndpointsProvider.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/DefaultCompositeClientEndpointsProvider.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/DefaultCompositeClientEndpointsProvider.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/DefaultCompositeClientEndpointsProvider.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/DefaultEndpointsManager.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/DefaultEndpointsManager.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/DefaultEndpointsManager.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/DefaultEndpointsManager.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/LwM2mClientEndpoint.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/LwM2mClientEndpoint.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/LwM2mClientEndpoint.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/LwM2mClientEndpoint.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/LwM2mClientEndpointsProvider.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/LwM2mClientEndpointsProvider.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/endpoint/LwM2mClientEndpointsProvider.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/endpoint/LwM2mClientEndpointsProvider.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngine.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngine.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngine.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngine.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngineFactory.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngineFactory.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngineFactory.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/engine/DefaultRegistrationEngineFactory.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngine.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngine.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngine.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngine.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngineFactory.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngineFactory.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngineFactory.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/engine/RegistrationEngineFactory.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/DefaultNotificationStrategy.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/DefaultNotificationStrategy.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/DefaultNotificationStrategy.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/DefaultNotificationStrategy.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/NotificationDataStore.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/NotificationDataStore.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/NotificationDataStore.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/NotificationDataStore.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/NotificationManager.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/NotificationManager.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/NotificationManager.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/NotificationManager.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/NotificationStrategy.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/NotificationStrategy.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/NotificationStrategy.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/NotificationStrategy.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/checker/CriteriaBasedOnValueChecker.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/checker/CriteriaBasedOnValueChecker.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/checker/CriteriaBasedOnValueChecker.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/checker/CriteriaBasedOnValueChecker.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/checker/FloatChecker.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/checker/FloatChecker.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/checker/FloatChecker.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/checker/FloatChecker.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/checker/IntegerChecker.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/checker/IntegerChecker.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/checker/IntegerChecker.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/checker/IntegerChecker.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/checker/UnsignedIntegerChecker.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/checker/UnsignedIntegerChecker.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/notification/checker/UnsignedIntegerChecker.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/notification/checker/UnsignedIntegerChecker.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Device.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/Device.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Device.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/Device.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/object/LwM2mTestObject.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/LwM2mTestObject.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/object/LwM2mTestObject.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/LwM2mTestObject.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Oscore.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/Oscore.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Oscore.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/Oscore.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Security.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/Security.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Security.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/Security.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Server.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/Server.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/object/Server.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/object/Server.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserver.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserver.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserver.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserver.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserverAdapter.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserverAdapter.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserverAdapter.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserverAdapter.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserverDispatcher.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserverDispatcher.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserverDispatcher.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/observer/LwM2mClientObserverDispatcher.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/request/DefaultDownlinkReceiver.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/request/DefaultDownlinkReceiver.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/request/DefaultDownlinkReceiver.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/request/DefaultDownlinkReceiver.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/request/DefaultUplinkRequestSender.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/request/DefaultUplinkRequestSender.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/request/DefaultUplinkRequestSender.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/request/DefaultUplinkRequestSender.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/request/DownlinkRequestReceiver.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/request/DownlinkRequestReceiver.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/request/DownlinkRequestReceiver.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/request/DownlinkRequestReceiver.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/request/UplinkRequestSender.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/request/UplinkRequestSender.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/request/UplinkRequestSender.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/request/UplinkRequestSender.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/BaseInstanceEnabler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/BaseInstanceEnabler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/BaseInstanceEnabler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/BaseInstanceEnabler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/BaseInstanceEnablerFactory.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/BaseInstanceEnablerFactory.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/BaseInstanceEnablerFactory.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/BaseInstanceEnablerFactory.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/BaseObjectEnabler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/BaseObjectEnabler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/BaseObjectEnabler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/BaseObjectEnabler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/DummyInstanceEnabler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/DummyInstanceEnabler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/DummyInstanceEnabler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/DummyInstanceEnabler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mInstanceEnabler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mInstanceEnabler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mInstanceEnabler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mInstanceEnabler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mInstanceEnablerFactory.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mInstanceEnablerFactory.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mInstanceEnablerFactory.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mInstanceEnablerFactory.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mObjectEnabler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mObjectEnabler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mObjectEnabler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mObjectEnabler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mObjectTree.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mObjectTree.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mObjectTree.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mObjectTree.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mRootEnabler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mRootEnabler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/LwM2mRootEnabler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/LwM2mRootEnabler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/NotificationSender.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/NotificationSender.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/NotificationSender.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/NotificationSender.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/NotifySender.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/NotifySender.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/NotifySender.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/NotifySender.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/ObjectEnabler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/ObjectEnabler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/ObjectEnabler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/ObjectEnabler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/ObjectsInitializer.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/ObjectsInitializer.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/ObjectsInitializer.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/ObjectsInitializer.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/RootEnabler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/RootEnabler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/RootEnabler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/RootEnabler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/SimpleInstanceEnabler.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/SimpleInstanceEnabler.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/SimpleInstanceEnabler.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/SimpleInstanceEnabler.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/TransactionalObjectListener.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/TransactionalObjectListener.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/TransactionalObjectListener.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/TransactionalObjectListener.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectListener.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectListener.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectListener.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectListener.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectsListener.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectsListener.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectsListener.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectsListener.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectsListenerAdapter.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectsListenerAdapter.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectsListenerAdapter.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/listener/ObjectsListenerAdapter.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/listener/ResourceListener.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/listener/ResourceListener.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/listener/ResourceListener.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/resource/listener/ResourceListener.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/security/CertificateVerifierFactory.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/security/CertificateVerifierFactory.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/security/CertificateVerifierFactory.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/security/CertificateVerifierFactory.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/send/DataSender.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/DataSender.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/send/DataSender.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/DataSender.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/send/DataSenderManager.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/DataSenderManager.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/send/DataSenderManager.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/DataSenderManager.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/send/ManualDataSender.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/ManualDataSender.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/send/ManualDataSender.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/ManualDataSender.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/send/NoDataException.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/NoDataException.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/send/NoDataException.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/NoDataException.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/send/SendService.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/SendService.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/send/SendService.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/send/SendService.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/DmServerInfo.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/DmServerInfo.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/DmServerInfo.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/DmServerInfo.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/LwM2mServer.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/LwM2mServer.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/LwM2mServer.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/LwM2mServer.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/ServerInfo.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/ServerInfo.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/ServerInfo.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/ServerInfo.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/ServersInfo.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/ServersInfo.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/ServersInfo.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/ServersInfo.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/ServersInfoExtractor.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/ServersInfoExtractor.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/ServersInfoExtractor.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/servers/ServersInfoExtractor.java
diff --git a/leshan-client-core/src/main/java/org/eclipse/leshan/client/util/LinkFormatHelper.java b/leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/util/LinkFormatHelper.java
similarity index 100%
rename from leshan-client-core/src/main/java/org/eclipse/leshan/client/util/LinkFormatHelper.java
rename to leshan-lwm2m-client/src/main/java/org/eclipse/leshan/client/util/LinkFormatHelper.java
diff --git a/leshan-client-core/src/test/java/org/eclipse/leshan/client/send/ManualDataSenderTest.java b/leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/send/ManualDataSenderTest.java
similarity index 100%
rename from leshan-client-core/src/test/java/org/eclipse/leshan/client/send/ManualDataSenderTest.java
rename to leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/send/ManualDataSenderTest.java
diff --git a/leshan-client-core/src/test/java/org/eclipse/leshan/client/util/BaseInstanceEnablerFactoryTest.java b/leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/util/BaseInstanceEnablerFactoryTest.java
similarity index 100%
rename from leshan-client-core/src/test/java/org/eclipse/leshan/client/util/BaseInstanceEnablerFactoryTest.java
rename to leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/util/BaseInstanceEnablerFactoryTest.java
diff --git a/leshan-client-core/src/test/java/org/eclipse/leshan/client/util/LinkFormatHelperTest.java b/leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/util/LinkFormatHelperTest.java
similarity index 100%
rename from leshan-client-core/src/test/java/org/eclipse/leshan/client/util/LinkFormatHelperTest.java
rename to leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/util/LinkFormatHelperTest.java
diff --git a/leshan-client-core/src/test/java/org/eclipse/leshan/client/util/ObjectEnablerTest.java b/leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/util/ObjectEnablerTest.java
similarity index 100%
rename from leshan-client-core/src/test/java/org/eclipse/leshan/client/util/ObjectEnablerTest.java
rename to leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/util/ObjectEnablerTest.java
diff --git a/leshan-client-core/src/test/java/org/eclipse/leshan/client/util/ObjectsInitializerTest.java b/leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/util/ObjectsInitializerTest.java
similarity index 100%
rename from leshan-client-core/src/test/java/org/eclipse/leshan/client/util/ObjectsInitializerTest.java
rename to leshan-lwm2m-client/src/test/java/org/eclipse/leshan/client/util/ObjectsInitializerTest.java
diff --git a/leshan-core/certificates/certificates.jks b/leshan-lwm2m-core/certificates/certificates.jks
similarity index 100%
rename from leshan-core/certificates/certificates.jks
rename to leshan-lwm2m-core/certificates/certificates.jks
diff --git a/leshan-core/certificates/eclipse.org.pem b/leshan-lwm2m-core/certificates/eclipse.org.pem
similarity index 99%
rename from leshan-core/certificates/eclipse.org.pem
rename to leshan-lwm2m-core/certificates/eclipse.org.pem
index 1af1cccb69..2fc7e8f331 100644
--- a/leshan-core/certificates/eclipse.org.pem
+++ b/leshan-lwm2m-core/certificates/eclipse.org.pem
@@ -76,3 +76,4 @@ xICaEnL6VpPX/78whQYwvwt/Tv9XBZ0k7YXDK/umdaisLRbvfXknsuvCnQsH6qqF
 0wGjIChBWUMo0oHjqvbsezt3tkBigAVBRQHvFwY+3sAzm2fTYS5yh+Rp/BIAV0Ae
 cPUeybQ=
 -----END CERTIFICATE-----
+
diff --git a/leshan-core/certificates/generate_certificates.sh b/leshan-lwm2m-core/certificates/generate_certificates.sh
similarity index 100%
rename from leshan-core/certificates/generate_certificates.sh
rename to leshan-lwm2m-core/certificates/generate_certificates.sh
diff --git a/leshan-core-cf/logback-leshan-test.xml b/leshan-lwm2m-core/logback-leshan-test.xml
similarity index 100%
rename from leshan-core-cf/logback-leshan-test.xml
rename to leshan-lwm2m-core/logback-leshan-test.xml
diff --git a/leshan-core/pom.xml b/leshan-lwm2m-core/pom.xml
similarity index 100%
rename from leshan-core/pom.xml
rename to leshan-lwm2m-core/pom.xml
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/CertificateUsage.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/CertificateUsage.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/CertificateUsage.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/CertificateUsage.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/Destroyable.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/Destroyable.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/Destroyable.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/Destroyable.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/LwM2m.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/LwM2m.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/LwM2m.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/LwM2m.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/LwM2mId.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/LwM2mId.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/LwM2mId.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/LwM2mId.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/MatchingType.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/MatchingType.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/MatchingType.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/MatchingType.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/ResponseCode.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/ResponseCode.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/ResponseCode.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/ResponseCode.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/SecurityMode.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/SecurityMode.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/SecurityMode.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/SecurityMode.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/Startable.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/Startable.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/Startable.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/Startable.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/Stoppable.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/Stoppable.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/Stoppable.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/Stoppable.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/credentials/CredentialsReader.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/credentials/CredentialsReader.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/credentials/CredentialsReader.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/credentials/CredentialsReader.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/endpoint/EndpointUriUtil.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/endpoint/EndpointUriUtil.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/endpoint/EndpointUriUtil.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/endpoint/EndpointUriUtil.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/endpoint/Protocol.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/endpoint/Protocol.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/endpoint/Protocol.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/endpoint/Protocol.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/JsonArrayEntry.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/JsonArrayEntry.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/json/JsonArrayEntry.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/JsonArrayEntry.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/JsonRootObject.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/JsonRootObject.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/json/JsonRootObject.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/JsonRootObject.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/LwM2mJsonException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonRootObjectSerDes.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonRootObjectSerDes.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonRootObjectSerDes.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonRootObjectSerDes.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/LwM2mJsonJacksonEncoderDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/jackson/LwM2mJsonJacksonEncoderDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/LwM2mJsonJacksonEncoderDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/json/jackson/LwM2mJsonJacksonEncoderDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/DefaultLinkParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/DefaultLinkParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/DefaultLinkParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/DefaultLinkParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/DefaultLinkSerializer.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/DefaultLinkSerializer.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/DefaultLinkSerializer.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/DefaultLinkSerializer.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/Link.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/Link.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/Link.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/Link.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/LinkParseException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/LinkParseException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/LinkParseException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/LinkParseException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/LinkParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/LinkParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/LinkParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/LinkParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/LinkSerializer.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/LinkSerializer.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/LinkSerializer.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/LinkSerializer.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/Attribute.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/Attribute.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/Attribute.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/Attribute.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeSet.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeSet.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeSet.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/AttributeSet.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/Attributes.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/Attributes.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/Attributes.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/Attributes.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/BaseAttribute.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/BaseAttribute.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/BaseAttribute.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/BaseAttribute.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/ContentFormatAttribute.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/ContentFormatAttribute.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/ContentFormatAttribute.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/ContentFormatAttribute.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/DefaultAttributeParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/DefaultAttributeParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/DefaultAttributeParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/DefaultAttributeParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/InvalidAttributeException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/InvalidAttributeException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/InvalidAttributeException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/InvalidAttributeException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/QuotedStringAttribute.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/QuotedStringAttribute.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/QuotedStringAttribute.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/QuotedStringAttribute.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/ResourceTypeAttribute.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/ResourceTypeAttribute.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/ResourceTypeAttribute.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/ResourceTypeAttribute.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/UnquotedStringAttribute.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/UnquotedStringAttribute.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/UnquotedStringAttribute.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/UnquotedStringAttribute.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/ValuelessAttribute.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/ValuelessAttribute.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/attributes/ValuelessAttribute.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/attributes/ValuelessAttribute.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/DefaultLwM2mLinkParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/DefaultLwM2mLinkParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/DefaultLwM2mLinkParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/DefaultLwM2mLinkParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/LwM2mLink.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/LwM2mLink.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/LwM2mLink.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/LwM2mLink.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/LwM2mLinkParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/LwM2mLinkParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/LwM2mLinkParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/LwM2mLinkParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/MixedLwM2mLink.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/MixedLwM2mLink.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/MixedLwM2mLink.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/MixedLwM2mLink.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AccessMode.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AccessMode.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AccessMode.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AccessMode.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AssignationLevel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AssignationLevel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AssignationLevel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AssignationLevel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/Attachment.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/Attachment.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/Attachment.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/Attachment.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AttributeClass.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AttributeClass.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AttributeClass.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/AttributeClass.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/DefaultLwM2mAttributeParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/DefaultLwM2mAttributeParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/DefaultLwM2mAttributeParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/DefaultLwM2mAttributeParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/DoubleAttributeModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/DoubleAttributeModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/DoubleAttributeModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/DoubleAttributeModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/InvalidAttributesException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/InvalidAttributesException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/InvalidAttributesException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/InvalidAttributesException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LongAttributeModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LongAttributeModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LongAttributeModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LongAttributeModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttribute.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttribute.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttribute.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttribute.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeSet.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeSet.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeSet.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributeSet.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributes.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributes.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributes.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributes.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mVersionAttributeModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mVersionAttributeModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mVersionAttributeModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mVersionAttributeModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/MixedLwM2mAttributeSet.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/MixedLwM2mAttributeSet.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/MixedLwM2mAttributeSet.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/MixedLwM2mAttributeSet.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/NotificationAttributeTree.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/NotificationAttributeTree.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/NotificationAttributeTree.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/NotificationAttributeTree.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/ObjectVersionAttributeModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/ObjectVersionAttributeModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/ObjectVersionAttributeModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/ObjectVersionAttributeModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/PositiveDoubleAttributeModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/PositiveDoubleAttributeModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/PositiveDoubleAttributeModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/PositiveDoubleAttributeModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/PositiveLongAttributeModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/PositiveLongAttributeModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/PositiveLongAttributeModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/PositiveLongAttributeModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/StringAttributeModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/StringAttributeModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/StringAttributeModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/link/lwm2m/attributes/StringAttributeModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/DDFFileParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DDFFileParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/DDFFileParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DDFFileParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/DDFFileValidator.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DDFFileValidator.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/DDFFileValidator.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DDFFileValidator.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/DDFFileValidatorFactory.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DDFFileValidatorFactory.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/DDFFileValidatorFactory.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DDFFileValidatorFactory.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/DefaultDDFFileValidator.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DefaultDDFFileValidator.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/DefaultDDFFileValidator.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DefaultDDFFileValidator.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/DefaultDDFFileValidatorFactory.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DefaultDDFFileValidatorFactory.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/DefaultDDFFileValidatorFactory.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DefaultDDFFileValidatorFactory.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/DefaultObjectModelValidator.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DefaultObjectModelValidator.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/DefaultObjectModelValidator.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/DefaultObjectModelValidator.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/InvalidDDFFileException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/InvalidDDFFileException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/InvalidDDFFileException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/InvalidDDFFileException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/InvalidModelException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/InvalidModelException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/InvalidModelException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/InvalidModelException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/LwM2mCoreObjectVersionRegistry.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/LwM2mCoreObjectVersionRegistry.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/LwM2mCoreObjectVersionRegistry.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/LwM2mCoreObjectVersionRegistry.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/LwM2mModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/LwM2mModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/LwM2mModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/LwM2mModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/LwM2mModelRepository.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/LwM2mModelRepository.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/LwM2mModelRepository.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/LwM2mModelRepository.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/ObjectLoader.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/ObjectModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/ObjectModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectModelValidator.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/ObjectModelValidator.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/ObjectModelValidator.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/ObjectModelValidator.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/ResourceModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/ResourceModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/ResourceModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/ResourceModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/StaticModel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/StaticModel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/StaticModel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/StaticModel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/model/URN.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/URN.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/model/URN.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/model/URN.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/InvalidLwM2mPathException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/InvalidLwM2mPathException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/InvalidLwM2mPathException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/InvalidLwM2mPathException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mChildNode.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mChildNode.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mChildNode.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mChildNode.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mIncompletePath.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mIncompletePath.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mIncompletePath.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mIncompletePath.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mMultipleResource.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mMultipleResource.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mMultipleResource.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mMultipleResource.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNode.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNode.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNode.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNode.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeLevel.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeLevel.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeLevel.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeLevel.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeUtil.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeUtil.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeUtil.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeUtil.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeVisitor.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeVisitor.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeVisitor.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mNodeVisitor.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mObject.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mObject.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mObject.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mObject.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mObjectInstance.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mObjectInstance.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mObjectInstance.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mObjectInstance.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mPath.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mPath.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mPath.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mPath.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mResource.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mResource.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mResource.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mResource.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mResourceInstance.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mResourceInstance.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mResourceInstance.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mResourceInstance.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mRoot.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mRoot.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mRoot.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mRoot.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mSingleResource.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mSingleResource.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/LwM2mSingleResource.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/LwM2mSingleResource.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/ObjectLink.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/ObjectLink.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/ObjectLink.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/ObjectLink.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/TimestampedLwM2mNode.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/TimestampedLwM2mNode.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/TimestampedLwM2mNode.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/TimestampedLwM2mNode.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/TimestampedLwM2mNodes.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/TimestampedLwM2mNodes.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/TimestampedLwM2mNodes.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/TimestampedLwM2mNodes.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/CodecException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/CodecException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/CodecException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/CodecException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mValueChecker.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mValueChecker.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mValueChecker.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mValueChecker.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mValueConverter.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mValueConverter.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mValueConverter.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mValueConverter.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/MultiNodeDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/MultiNodeDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/MultiNodeDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/MultiNodeDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/MultiNodeEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/MultiNodeEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/MultiNodeEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/MultiNodeEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/NodeDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/NodeDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/NodeDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/NodeDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/NodeEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/NodeEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/NodeEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/NodeEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/PathDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/PathDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/PathDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/PathDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/PathEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/PathEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/PathEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/PathEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedNodeDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedNodeDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedNodeDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedNodeDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedNodeEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedNodeEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedNodeEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedNodeEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/cbor/LwM2mNodeCborDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/cbor/LwM2mNodeCborDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/cbor/LwM2mNodeCborDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/cbor/LwM2mNodeCborDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/cbor/LwM2mNodeCborEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/cbor/LwM2mNodeCborEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/cbor/LwM2mNodeCborEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/cbor/LwM2mNodeCborEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/json/LwM2mNodeJsonEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/opaque/LwM2mNodeOpaqueDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/opaque/LwM2mNodeOpaqueDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/opaque/LwM2mNodeOpaqueDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/opaque/LwM2mNodeOpaqueDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/opaque/LwM2mNodeOpaqueEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/opaque/LwM2mNodeOpaqueEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/opaque/LwM2mNodeOpaqueEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/opaque/LwM2mNodeOpaqueEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mPathSenMLDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mPathSenMLDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mPathSenMLDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mPathSenMLDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mPathSenMLEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mPathSenMLEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mPathSenMLEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mPathSenMLEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mResolvedSenMLRecord.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mResolvedSenMLRecord.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mResolvedSenMLRecord.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mResolvedSenMLRecord.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mSenMLResolver.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mSenMLResolver.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mSenMLResolver.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mSenMLResolver.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/text/LwM2mNodeTextDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/text/LwM2mNodeTextDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/text/LwM2mNodeTextDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/text/LwM2mNodeTextDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/text/LwM2mNodeTextEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/text/LwM2mNodeTextEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/text/LwM2mNodeTextEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/text/LwM2mNodeTextEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/tlv/LwM2mNodeTlvDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/tlv/LwM2mNodeTlvDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/tlv/LwM2mNodeTlvDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/tlv/LwM2mNodeTlvDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/tlv/LwM2mNodeTlvEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/tlv/LwM2mNodeTlvEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/tlv/LwM2mNodeTlvEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/node/codec/tlv/LwM2mNodeTlvEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/observation/CompositeObservation.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/observation/CompositeObservation.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/observation/CompositeObservation.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/observation/CompositeObservation.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/observation/Observation.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/observation/Observation.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/observation/Observation.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/observation/Observation.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/observation/ObservationIdentifier.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/observation/ObservationIdentifier.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/observation/ObservationIdentifier.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/observation/ObservationIdentifier.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/observation/SingleObservation.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/observation/SingleObservation.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/observation/SingleObservation.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/observation/SingleObservation.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/oscore/AeadAlgorithm.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/AeadAlgorithm.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/oscore/AeadAlgorithm.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/AeadAlgorithm.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/oscore/HkdfAlgorithm.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/HkdfAlgorithm.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/oscore/HkdfAlgorithm.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/HkdfAlgorithm.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/oscore/InvalidOscoreSettingException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/InvalidOscoreSettingException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/oscore/InvalidOscoreSettingException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/InvalidOscoreSettingException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/oscore/OscoreSetting.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/OscoreSetting.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/oscore/OscoreSetting.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/OscoreSetting.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/oscore/OscoreValidator.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/OscoreValidator.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/oscore/OscoreValidator.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/oscore/OscoreValidator.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/parser/StringParser.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/parser/StringParser.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/parser/StringParser.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/parser/StringParser.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/peer/IpPeer.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/IpPeer.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/peer/IpPeer.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/IpPeer.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/peer/LwM2mIdentity.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/LwM2mIdentity.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/peer/LwM2mIdentity.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/LwM2mIdentity.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/peer/LwM2mPeer.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/LwM2mPeer.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/peer/LwM2mPeer.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/LwM2mPeer.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/peer/OscoreIdentity.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/OscoreIdentity.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/peer/OscoreIdentity.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/OscoreIdentity.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/peer/PskIdentity.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/PskIdentity.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/peer/PskIdentity.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/PskIdentity.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/peer/RpkIdentity.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/RpkIdentity.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/peer/RpkIdentity.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/RpkIdentity.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/peer/SocketIdentity.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/SocketIdentity.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/peer/SocketIdentity.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/SocketIdentity.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/peer/X509Identity.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/X509Identity.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/peer/X509Identity.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/peer/X509Identity.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/AbstractLwM2mRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/AbstractLwM2mRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/AbstractLwM2mRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/AbstractLwM2mRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/AbstractSimpleDownlinkRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/AbstractSimpleDownlinkRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/AbstractSimpleDownlinkRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/AbstractSimpleDownlinkRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/BindingMode.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BindingMode.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/BindingMode.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BindingMode.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDeleteRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDeleteRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDeleteRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDeleteRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDiscoverRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDiscoverRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDiscoverRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDiscoverRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDownlinkRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDownlinkRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDownlinkRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapDownlinkRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapFinishRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapFinishRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapFinishRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapFinishRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapReadRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapReadRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapReadRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapReadRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapWriteRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapWriteRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/BootstrapWriteRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/BootstrapWriteRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/CancelCompositeObservationRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/CancelCompositeObservationRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/CancelCompositeObservationRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/CancelCompositeObservationRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/CancelObservationRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/CancelObservationRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/CancelObservationRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/CancelObservationRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/CompositeDownlinkRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/CompositeDownlinkRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/CompositeDownlinkRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/CompositeDownlinkRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/ContentFormat.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ContentFormat.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/ContentFormat.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ContentFormat.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/CreateRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/CreateRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/CreateRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/CreateRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/DeleteRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DeleteRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/DeleteRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DeleteRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/DeregisterRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DeregisterRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/DeregisterRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DeregisterRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/DiscoverRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DiscoverRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/DiscoverRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DiscoverRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/DownLinkRequestVisitorAdapter.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DownLinkRequestVisitorAdapter.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/DownLinkRequestVisitorAdapter.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DownLinkRequestVisitorAdapter.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/DownlinkRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DownlinkRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/DownlinkRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DownlinkRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/DownlinkRequestVisitor.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DownlinkRequestVisitor.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/DownlinkRequestVisitor.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/DownlinkRequestVisitor.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/ExecuteRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ExecuteRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/ExecuteRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ExecuteRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/LwM2mRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/LwM2mRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/LwM2mRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/LwM2mRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/ObserveCompositeRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ObserveCompositeRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/ObserveCompositeRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ObserveCompositeRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/ObserveRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ObserveRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/ObserveRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ObserveRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/ReadCompositeRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ReadCompositeRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/ReadCompositeRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ReadCompositeRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/ReadRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ReadRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/ReadRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/ReadRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/RegisterRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/RegisterRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/RegisterRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/RegisterRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/SendRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/SendRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/SendRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/SendRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/SimpleDownlinkRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/SimpleDownlinkRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/SimpleDownlinkRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/SimpleDownlinkRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/UpdateRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/UpdateRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/UpdateRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/UpdateRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/UplinkRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/UplinkRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/UplinkRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/UplinkRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/UplinkRequestVisitor.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/UplinkRequestVisitor.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/UplinkRequestVisitor.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/UplinkRequestVisitor.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteAttributesRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/WriteAttributesRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteAttributesRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/WriteAttributesRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteCompositeRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/WriteCompositeRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteCompositeRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/WriteCompositeRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteRequest.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/WriteRequest.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/WriteRequest.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/WriteRequest.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/argument/Argument.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/argument/Argument.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/argument/Argument.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/argument/Argument.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/argument/Arguments.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/argument/Arguments.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/argument/Arguments.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/argument/Arguments.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/argument/InvalidArgumentException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/argument/InvalidArgumentException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/argument/InvalidArgumentException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/argument/InvalidArgumentException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/ClientSleepingException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/ClientSleepingException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/ClientSleepingException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/ClientSleepingException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/InvalidRequestException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/InvalidRequestException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/InvalidRequestException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/InvalidRequestException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/InvalidResponseException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/InvalidResponseException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/InvalidResponseException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/InvalidResponseException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/RequestCanceledException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/RequestCanceledException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/RequestCanceledException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/RequestCanceledException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/RequestRejectedException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/RequestRejectedException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/RequestRejectedException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/RequestRejectedException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/SendFailedException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/SendFailedException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/SendFailedException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/SendFailedException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/TimeoutException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/TimeoutException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/TimeoutException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/TimeoutException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/UnconnectedPeerException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/UnconnectedPeerException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/UnconnectedPeerException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/request/exception/UnconnectedPeerException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/AbstractLwM2mResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/AbstractLwM2mResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/AbstractLwM2mResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/AbstractLwM2mResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapDeleteResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapDeleteResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapDeleteResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapDeleteResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapDiscoverResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapDiscoverResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapDiscoverResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapDiscoverResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapFinishResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapFinishResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapFinishResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapFinishResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapReadResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapReadResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapReadResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapReadResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapWriteResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapWriteResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/BootstrapWriteResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/BootstrapWriteResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/CancelObservationResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/CancelObservationResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/CancelObservationResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/CancelObservationResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/CreateResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/CreateResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/CreateResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/CreateResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/DeleteResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/DeleteResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/DeleteResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/DeleteResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/DeregisterResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/DeregisterResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/DeregisterResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/DeregisterResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/DiscoverResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/DiscoverResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/DiscoverResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/DiscoverResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ErrorCallback.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ErrorCallback.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/ErrorCallback.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ErrorCallback.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ExecuteResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ExecuteResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/ExecuteResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ExecuteResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/LwM2mResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/LwM2mResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/LwM2mResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/LwM2mResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ObserveCompositeResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ObserveCompositeResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/ObserveCompositeResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ObserveCompositeResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ObserveResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ObserveResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/ObserveResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ObserveResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ReadResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/ReadResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/RegisterResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/RegisterResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/RegisterResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/RegisterResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ResponseCallback.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ResponseCallback.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/ResponseCallback.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ResponseCallback.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/SendResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/SendResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/SendResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/SendResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/SendableResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/SendableResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/SendableResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/SendableResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/UpdateResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/UpdateResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/UpdateResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/UpdateResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteAttributesResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/WriteAttributesResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteAttributesResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/WriteAttributesResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteCompositeResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/WriteCompositeResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteCompositeResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/WriteCompositeResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/WriteResponse.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/response/WriteResponse.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/WriteResponse.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/CertPathUtil.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/CertPathUtil.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/CertPathUtil.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/CertPathUtil.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/PKIValidator.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/PKIValidator.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/PKIValidator.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/PKIValidator.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/X509CertUtil.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/X509CertUtil.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/X509CertUtil.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/util/X509CertUtil.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/BaseCertificateVerifier.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/BaseCertificateVerifier.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/BaseCertificateVerifier.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/BaseCertificateVerifier.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/CaConstraintCertificateVerifier.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/CaConstraintCertificateVerifier.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/CaConstraintCertificateVerifier.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/CaConstraintCertificateVerifier.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/DefaultCertificateVerifier.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/DefaultCertificateVerifier.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/DefaultCertificateVerifier.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/DefaultCertificateVerifier.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/DomainIssuerCertificateVerifier.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/DomainIssuerCertificateVerifier.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/DomainIssuerCertificateVerifier.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/DomainIssuerCertificateVerifier.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/ServiceCertificateConstraintCertificateVerifier.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/ServiceCertificateConstraintCertificateVerifier.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/ServiceCertificateConstraintCertificateVerifier.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/ServiceCertificateConstraintCertificateVerifier.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/TrustAnchorAssertionCertificateVerifier.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/TrustAnchorAssertionCertificateVerifier.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/TrustAnchorAssertionCertificateVerifier.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/TrustAnchorAssertionCertificateVerifier.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/X509CertificateVerifier.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/X509CertificateVerifier.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/X509CertificateVerifier.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/certificate/verifier/X509CertificateVerifier.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/jsse/LwM2mX509TrustManager.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/jsse/LwM2mX509TrustManager.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/jsse/LwM2mX509TrustManager.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/jsse/LwM2mX509TrustManager.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/security/util/SecurityUtil.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/util/SecurityUtil.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/security/util/SecurityUtil.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/security/util/SecurityUtil.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/tlv/Tlv.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/tlv/Tlv.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/tlv/Tlv.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/tlv/Tlv.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/tlv/TlvDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/tlv/TlvDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/tlv/TlvDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/tlv/TlvDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/tlv/TlvEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/tlv/TlvEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/tlv/TlvEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/tlv/TlvEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/tlv/TlvException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/tlv/TlvException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/tlv/TlvException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/tlv/TlvException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/Hex.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/Hex.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/Hex.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/Hex.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/NamedThreadFactory.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/NamedThreadFactory.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/NamedThreadFactory.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/NamedThreadFactory.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/RandomStringUtils.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/RandomStringUtils.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/RandomStringUtils.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/RandomStringUtils.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/StringUtils.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/StringUtils.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/StringUtils.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/StringUtils.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/TimestampUtil.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/TimestampUtil.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/TimestampUtil.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/TimestampUtil.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/Validate.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/Validate.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/Validate.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/Validate.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/Base64Decoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/Base64Decoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/Base64Decoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/Base64Decoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/Base64Encoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/Base64Encoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/Base64Encoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/Base64Encoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/DefaultBase64Decoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/DefaultBase64Decoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/DefaultBase64Decoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/DefaultBase64Decoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/DefaultBase64Encoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/DefaultBase64Encoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/DefaultBase64Encoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/DefaultBase64Encoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/InvalidBase64Exception.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/InvalidBase64Exception.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/base64/InvalidBase64Exception.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/base64/InvalidBase64Exception.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/datatype/LwM2mValueUtil.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/datatype/LwM2mValueUtil.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/datatype/LwM2mValueUtil.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/datatype/LwM2mValueUtil.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/datatype/NumberUtil.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/datatype/NumberUtil.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/datatype/NumberUtil.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/datatype/NumberUtil.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/datatype/ULong.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/datatype/ULong.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/datatype/ULong.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/datatype/ULong.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/json/JacksonJsonSerDes.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/json/JacksonJsonSerDes.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/json/JacksonJsonSerDes.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/json/JacksonJsonSerDes.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/util/json/JsonException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/json/JsonException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/core/util/json/JsonException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/util/json/JsonException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/ResolvedSenMLRecord.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/ResolvedSenMLRecord.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/ResolvedSenMLRecord.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/ResolvedSenMLRecord.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLEncoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLEncoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLEncoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLEncoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLException.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLException.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLException.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLException.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLPack.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLPack.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLPack.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLPack.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLRecord.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLRecord.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLRecord.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLRecord.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLResolver.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLResolver.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/SenMLResolver.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/SenMLResolver.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/cbor/upokecenter/SenMLCborPackSerDes.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/cbor/upokecenter/SenMLCborPackSerDes.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/cbor/upokecenter/SenMLCborPackSerDes.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/cbor/upokecenter/SenMLCborPackSerDes.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/cbor/upokecenter/SenMLCborUpokecenterEncoderDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/cbor/upokecenter/SenMLCborUpokecenterEncoderDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/cbor/upokecenter/SenMLCborUpokecenterEncoderDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/cbor/upokecenter/SenMLCborUpokecenterEncoderDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonJacksonEncoderDecoder.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonJacksonEncoderDecoder.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonJacksonEncoderDecoder.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonJacksonEncoderDecoder.java
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonRecordSerDes.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonRecordSerDes.java
similarity index 100%
rename from leshan-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonRecordSerDes.java
rename to leshan-lwm2m-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonRecordSerDes.java
diff --git a/leshan-core/src/main/resources/models/0-1_0.xml b/leshan-lwm2m-core/src/main/resources/models/0-1_0.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/0-1_0.xml
rename to leshan-lwm2m-core/src/main/resources/models/0-1_0.xml
diff --git a/leshan-core/src/main/resources/models/0-1_1.xml b/leshan-lwm2m-core/src/main/resources/models/0-1_1.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/0-1_1.xml
rename to leshan-lwm2m-core/src/main/resources/models/0-1_1.xml
diff --git a/leshan-core/src/main/resources/models/0.xml b/leshan-lwm2m-core/src/main/resources/models/0.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/0.xml
rename to leshan-lwm2m-core/src/main/resources/models/0.xml
diff --git a/leshan-core/src/main/resources/models/1-1_0.xml b/leshan-lwm2m-core/src/main/resources/models/1-1_0.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/1-1_0.xml
rename to leshan-lwm2m-core/src/main/resources/models/1-1_0.xml
diff --git a/leshan-core/src/main/resources/models/1-1_1.xml b/leshan-lwm2m-core/src/main/resources/models/1-1_1.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/1-1_1.xml
rename to leshan-lwm2m-core/src/main/resources/models/1-1_1.xml
diff --git a/leshan-core/src/main/resources/models/2-1_0.xml b/leshan-lwm2m-core/src/main/resources/models/2-1_0.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/2-1_0.xml
rename to leshan-lwm2m-core/src/main/resources/models/2-1_0.xml
diff --git a/leshan-core/src/main/resources/models/2.xml b/leshan-lwm2m-core/src/main/resources/models/2.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/2.xml
rename to leshan-lwm2m-core/src/main/resources/models/2.xml
diff --git a/leshan-core/src/main/resources/models/21.xml b/leshan-lwm2m-core/src/main/resources/models/21.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/21.xml
rename to leshan-lwm2m-core/src/main/resources/models/21.xml
diff --git a/leshan-core/src/main/resources/models/3-1_0.xml b/leshan-lwm2m-core/src/main/resources/models/3-1_0.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/3-1_0.xml
rename to leshan-lwm2m-core/src/main/resources/models/3-1_0.xml
diff --git a/leshan-core/src/main/resources/models/3-1_1.xml b/leshan-lwm2m-core/src/main/resources/models/3-1_1.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/3-1_1.xml
rename to leshan-lwm2m-core/src/main/resources/models/3-1_1.xml
diff --git a/leshan-core/src/main/resources/models/3.xml b/leshan-lwm2m-core/src/main/resources/models/3.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/3.xml
rename to leshan-lwm2m-core/src/main/resources/models/3.xml
diff --git a/leshan-core/src/main/resources/models/4-1_0.xml b/leshan-lwm2m-core/src/main/resources/models/4-1_0.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/4-1_0.xml
rename to leshan-lwm2m-core/src/main/resources/models/4-1_0.xml
diff --git a/leshan-core/src/main/resources/models/4-1_1.xml b/leshan-lwm2m-core/src/main/resources/models/4-1_1.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/4-1_1.xml
rename to leshan-lwm2m-core/src/main/resources/models/4-1_1.xml
diff --git a/leshan-core/src/main/resources/models/4-1_2.xml b/leshan-lwm2m-core/src/main/resources/models/4-1_2.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/4-1_2.xml
rename to leshan-lwm2m-core/src/main/resources/models/4-1_2.xml
diff --git a/leshan-core/src/main/resources/models/4.xml b/leshan-lwm2m-core/src/main/resources/models/4.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/4.xml
rename to leshan-lwm2m-core/src/main/resources/models/4.xml
diff --git a/leshan-core/src/main/resources/models/5-1_0.xml b/leshan-lwm2m-core/src/main/resources/models/5-1_0.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/5-1_0.xml
rename to leshan-lwm2m-core/src/main/resources/models/5-1_0.xml
diff --git a/leshan-core/src/main/resources/models/5.xml b/leshan-lwm2m-core/src/main/resources/models/5.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/5.xml
rename to leshan-lwm2m-core/src/main/resources/models/5.xml
diff --git a/leshan-core/src/main/resources/models/6.xml b/leshan-lwm2m-core/src/main/resources/models/6.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/6.xml
rename to leshan-lwm2m-core/src/main/resources/models/6.xml
diff --git a/leshan-core/src/main/resources/models/7.xml b/leshan-lwm2m-core/src/main/resources/models/7.xml
similarity index 100%
rename from leshan-core/src/main/resources/models/7.xml
rename to leshan-lwm2m-core/src/main/resources/models/7.xml
diff --git a/leshan-core/src/main/resources/schemas/LWM2M-v1_1.xsd b/leshan-lwm2m-core/src/main/resources/schemas/LWM2M-v1_1.xsd
similarity index 100%
rename from leshan-core/src/main/resources/schemas/LWM2M-v1_1.xsd
rename to leshan-lwm2m-core/src/main/resources/schemas/LWM2M-v1_1.xsd
diff --git a/leshan-core/src/main/resources/schemas/LWM2M.xsd b/leshan-lwm2m-core/src/main/resources/schemas/LWM2M.xsd
similarity index 100%
rename from leshan-core/src/main/resources/schemas/LWM2M.xsd
rename to leshan-lwm2m-core/src/main/resources/schemas/LWM2M.xsd
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/VersionTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/VersionTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/VersionTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/VersionTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/datatype/NumberUtilTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/datatype/NumberUtilTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/datatype/NumberUtilTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/datatype/NumberUtilTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/json/JsonDeserializerTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/json/JsonDeserializerTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/json/JsonDeserializerTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/json/JsonDeserializerTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/json/JsonSerializerTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/json/JsonSerializerTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/json/JsonSerializerTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/json/JsonSerializerTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/DefaultLinkParserTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/DefaultLinkParserTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/link/DefaultLinkParserTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/DefaultLinkParserTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/DefaultLinkSerializerTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/DefaultLinkSerializerTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/link/DefaultLinkSerializerTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/DefaultLinkSerializerTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/LinkParserValidationTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/LinkParserValidationTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/link/LinkParserValidationTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/LinkParserValidationTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/MixedLwM2mLinkTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/MixedLwM2mLinkTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/link/MixedLwM2mLinkTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/MixedLwM2mLinkTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeSetTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeSetTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeSetTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeSetTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/attributes/AttributeTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/DefaultLwM2mLinkParserTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/DefaultLwM2mLinkParserTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/DefaultLwM2mLinkParserTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/DefaultLwM2mLinkParserTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/attributes/DefaultLwM2mAttributeParserTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/attributes/DefaultLwM2mAttributeParserTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/attributes/DefaultLwM2mAttributeParserTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/attributes/DefaultLwM2mAttributeParserTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributesTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributesTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributesTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/link/lwm2m/attributes/LwM2mAttributesTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/model/DDFFileParserTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/model/DDFFileParserTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/model/DDFFileParserTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/model/DDFFileParserTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/model/LwM2mModelRespositotyTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/model/LwM2mModelRespositotyTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/model/LwM2mModelRespositotyTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/model/LwM2mModelRespositotyTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/model/ValidateModelsTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/model/ValidateModelsTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/model/ValidateModelsTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/model/ValidateModelsTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/node/LwM2MResourceTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/LwM2MResourceTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/node/LwM2MResourceTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/LwM2MResourceTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/node/LwM2mPathTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/LwM2mPathTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/node/LwM2mPathTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/LwM2mPathTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/node/TimestampedLwM2mNodesTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/TimestampedLwM2mNodesTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/node/TimestampedLwM2mNodesTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/TimestampedLwM2mNodesTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderEncoderTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderEncoderTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderEncoderTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderEncoderTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeEncoderTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeEncoderTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeEncoderTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeEncoderTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/request/ContentFormatTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/ContentFormatTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/request/ContentFormatTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/ContentFormatTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/request/WriteAttributesRequestTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/WriteAttributesRequestTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/request/WriteAttributesRequestTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/WriteAttributesRequestTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentValidationTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentValidationTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentValidationTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentValidationTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentaSerializingTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentaSerializingTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentaSerializingTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentaSerializingTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentsParsingTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentsParsingTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentsParsingTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentsParsingTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentsTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentsTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentsTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/request/argument/ArgumentsTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/response/ObserveResponseTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ObserveResponseTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/response/ObserveResponseTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ObserveResponseTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/security/util/X509CertUtilTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/security/util/X509CertUtilTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/security/util/X509CertUtilTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/security/util/X509CertUtilTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/senml/cbor/AbstractSenMLTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/senml/cbor/AbstractSenMLTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/senml/cbor/AbstractSenMLTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/senml/cbor/AbstractSenMLTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLCborSerializerTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLCborSerializerTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLCborSerializerTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLCborSerializerTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLJsonSerDesTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLJsonSerDesTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLJsonSerDesTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLJsonSerDesTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLTestUtil.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLTestUtil.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLTestUtil.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/senml/cbor/SenMLTestUtil.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvDecoderTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/tlv/TlvDecoderTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvDecoderTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/tlv/TlvDecoderTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvEncoderTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/tlv/TlvEncoderTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/tlv/TlvEncoderTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/tlv/TlvEncoderTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/util/ContentFormatArgumentConverter.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/ContentFormatArgumentConverter.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/util/ContentFormatArgumentConverter.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/ContentFormatArgumentConverter.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/util/TestLwM2mId.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/TestLwM2mId.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/util/TestLwM2mId.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/TestLwM2mId.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/util/TestObjectLoader.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/TestObjectLoader.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/util/TestObjectLoader.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/TestObjectLoader.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/util/TimestampUtilTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/TimestampUtilTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/util/TimestampUtilTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/TimestampUtilTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/util/base64/DefaultBase64DecoderTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/base64/DefaultBase64DecoderTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/util/base64/DefaultBase64DecoderTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/base64/DefaultBase64DecoderTest.java
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/util/base64/DefaultBase64EncoderTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/base64/DefaultBase64EncoderTest.java
similarity index 100%
rename from leshan-core/src/test/java/org/eclipse/leshan/core/util/base64/DefaultBase64EncoderTest.java
rename to leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/util/base64/DefaultBase64EncoderTest.java
diff --git a/leshan-core/src/test/resources/models/3441.xml b/leshan-lwm2m-core/src/test/resources/models/3441.xml
similarity index 100%
rename from leshan-core/src/test/resources/models/3441.xml
rename to leshan-lwm2m-core/src/test/resources/models/3441.xml
diff --git a/leshan-core/src/test/resources/models/3442.xml b/leshan-lwm2m-core/src/test/resources/models/3442.xml
similarity index 100%
rename from leshan-core/src/test/resources/models/3442.xml
rename to leshan-lwm2m-core/src/test/resources/models/3442.xml
diff --git a/leshan-core/src/test/resources/models/xxe_injection.xml b/leshan-lwm2m-core/src/test/resources/models/xxe_injection.xml
similarity index 100%
rename from leshan-core/src/test/resources/models/xxe_injection.xml
rename to leshan-lwm2m-core/src/test/resources/models/xxe_injection.xml
diff --git a/leshan-server-redis/pom.xml b/leshan-lwm2m-server-redis/pom.xml
similarity index 100%
rename from leshan-server-redis/pom.xml
rename to leshan-lwm2m-server-redis/pom.xml
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/JedisLock.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/JedisLock.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/JedisLock.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/JedisLock.java
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisLock.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisLock.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisLock.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisLock.java
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisRegistrationStore.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisRegistrationStore.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisRegistrationStore.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisRegistrationStore.java
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisSecurityStore.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisSecurityStore.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisSecurityStore.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/RedisSecurityStore.java
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/SingleInstanceJedisLock.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/SingleInstanceJedisLock.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/SingleInstanceJedisLock.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/SingleInstanceJedisLock.java
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/LwM2mIdentitySerDes.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/LwM2mIdentitySerDes.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/LwM2mIdentitySerDes.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/LwM2mIdentitySerDes.java
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/LwM2mPeerSerDes.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/LwM2mPeerSerDes.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/LwM2mPeerSerDes.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/LwM2mPeerSerDes.java
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/ObservationSerDes.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/ObservationSerDes.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/ObservationSerDes.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/ObservationSerDes.java
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/RegistrationSerDes.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/RegistrationSerDes.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/RegistrationSerDes.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/RegistrationSerDes.java
diff --git a/leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDes.java b/leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDes.java
similarity index 100%
rename from leshan-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDes.java
rename to leshan-lwm2m-server-redis/src/main/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDes.java
diff --git a/leshan-server-redis/src/test/java/org/eclipse/leshan/server/redis/serialization/RegistrationSerDesTest.java b/leshan-lwm2m-server-redis/src/test/java/org/eclipse/leshan/server/redis/serialization/RegistrationSerDesTest.java
similarity index 100%
rename from leshan-server-redis/src/test/java/org/eclipse/leshan/server/redis/serialization/RegistrationSerDesTest.java
rename to leshan-lwm2m-server-redis/src/test/java/org/eclipse/leshan/server/redis/serialization/RegistrationSerDesTest.java
diff --git a/leshan-server-redis/src/test/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDesTest.java b/leshan-lwm2m-server-redis/src/test/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDesTest.java
similarity index 100%
rename from leshan-server-redis/src/test/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDesTest.java
rename to leshan-lwm2m-server-redis/src/test/java/org/eclipse/leshan/server/redis/serialization/SecurityInfoSerDesTest.java
diff --git a/leshan-core-demo/logback-leshan-test.xml b/leshan-lwm2m-server/logback-leshan-test.xml
similarity index 100%
rename from leshan-core-demo/logback-leshan-test.xml
rename to leshan-lwm2m-server/logback-leshan-test.xml
diff --git a/leshan-server-core/pom.xml b/leshan-lwm2m-server/pom.xml
similarity index 100%
rename from leshan-server-core/pom.xml
rename to leshan-lwm2m-server/pom.xml
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/LeshanServer.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/LeshanServer.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/LeshanServer.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/LeshanServer.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/LeshanServerBuilder.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/LeshanServerBuilder.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/LeshanServerBuilder.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/LeshanServerBuilder.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfig.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfig.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfig.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfig.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigStoreTaskProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigStoreTaskProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigStoreTaskProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigStoreTaskProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapFailureCause.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapFailureCause.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapFailureCause.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapFailureCause.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapHandler.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapHandler.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapHandler.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapHandler.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapHandlerFactory.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapHandlerFactory.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapHandlerFactory.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapHandlerFactory.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSession.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSession.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSession.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSession.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionAdapter.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionAdapter.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionAdapter.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionAdapter.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionDispatcher.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionDispatcher.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionDispatcher.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionDispatcher.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionListener.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionListener.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionListener.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionListener.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionManager.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionManager.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionManager.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapSessionManager.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapTaskProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapTaskProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapTaskProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapTaskProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapUtil.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapUtil.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapUtil.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/BootstrapUtil.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/ConfigurationChecker.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/ConfigurationChecker.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/ConfigurationChecker.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/ConfigurationChecker.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapAuthorizer.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapAuthorizer.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapAuthorizer.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapAuthorizer.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapHandler.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapHandler.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapHandler.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapHandler.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapSession.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapSession.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapSession.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapSession.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapSessionManager.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapSessionManager.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapSessionManager.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/DefaultBootstrapSessionManager.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/EditableBootstrapConfigStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/EditableBootstrapConfigStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/EditableBootstrapConfigStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/EditableBootstrapConfigStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/InMemoryBootstrapConfigStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/InMemoryBootstrapConfigStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/InMemoryBootstrapConfigStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/InMemoryBootstrapConfigStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/InvalidConfigurationException.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/InvalidConfigurationException.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/InvalidConfigurationException.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/InvalidConfigurationException.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/LeshanBootstrapServer.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/LeshanBootstrapServer.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/LeshanBootstrapServer.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/LeshanBootstrapServer.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/LeshanBootstrapServerBuilder.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/LeshanBootstrapServerBuilder.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/LeshanBootstrapServerBuilder.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/LeshanBootstrapServerBuilder.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/LwM2mBootstrapRequestSender.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/LwM2mBootstrapRequestSender.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/LwM2mBootstrapRequestSender.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/LwM2mBootstrapRequestSender.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/SmsSecurityMode.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/SmsSecurityMode.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/SmsSecurityMode.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/SmsSecurityMode.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/BootstrapServerEndpointToolbox.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/BootstrapServerEndpointToolbox.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/BootstrapServerEndpointToolbox.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/BootstrapServerEndpointToolbox.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/CompositeBootstrapServerEndpointsProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/CompositeBootstrapServerEndpointsProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/CompositeBootstrapServerEndpointsProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/CompositeBootstrapServerEndpointsProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/DefaultCompositeBootstrapServerEndpointsProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/DefaultCompositeBootstrapServerEndpointsProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/DefaultCompositeBootstrapServerEndpointsProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/DefaultCompositeBootstrapServerEndpointsProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/LwM2mBootstrapServerEndpoint.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/LwM2mBootstrapServerEndpoint.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/LwM2mBootstrapServerEndpoint.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/LwM2mBootstrapServerEndpoint.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/LwM2mBootstrapServerEndpointsProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/LwM2mBootstrapServerEndpointsProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/LwM2mBootstrapServerEndpointsProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/endpoint/LwM2mBootstrapServerEndpointsProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/request/BootstrapDownlinkRequestSender.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/request/BootstrapDownlinkRequestSender.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/request/BootstrapDownlinkRequestSender.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/request/BootstrapDownlinkRequestSender.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/request/BootstrapUplinkRequestReceiver.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/request/BootstrapUplinkRequestReceiver.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/request/BootstrapUplinkRequestReceiver.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/request/BootstrapUplinkRequestReceiver.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/request/DefaultBootstrapDownlinkRequestSender.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/request/DefaultBootstrapDownlinkRequestSender.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/request/DefaultBootstrapDownlinkRequestSender.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/request/DefaultBootstrapDownlinkRequestSender.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/request/DefaultBootstrapUplinkRequestReceiver.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/request/DefaultBootstrapUplinkRequestReceiver.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/bootstrap/request/DefaultBootstrapUplinkRequestReceiver.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/bootstrap/request/DefaultBootstrapUplinkRequestReceiver.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/CompositeServerEndpointsProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/CompositeServerEndpointsProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/CompositeServerEndpointsProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/CompositeServerEndpointsProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/DefaultCompositeServerEndpointsProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/DefaultCompositeServerEndpointsProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/DefaultCompositeServerEndpointsProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/DefaultCompositeServerEndpointsProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/LwM2mServerEndpoint.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/LwM2mServerEndpoint.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/LwM2mServerEndpoint.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/LwM2mServerEndpoint.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/LwM2mServerEndpointsProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/LwM2mServerEndpointsProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/LwM2mServerEndpointsProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/LwM2mServerEndpointsProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/ServerEndpointToolbox.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/ServerEndpointToolbox.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/endpoint/ServerEndpointToolbox.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/endpoint/ServerEndpointToolbox.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/model/LwM2mBootstrapModelProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/LwM2mBootstrapModelProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/model/LwM2mBootstrapModelProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/LwM2mBootstrapModelProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/model/LwM2mModelProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/LwM2mModelProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/model/LwM2mModelProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/LwM2mModelProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/model/StandardBootstrapModelProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/StandardBootstrapModelProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/model/StandardBootstrapModelProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/StandardBootstrapModelProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/model/StandardModelProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/StandardModelProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/model/StandardModelProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/StandardModelProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/model/StaticModelProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/StaticModelProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/model/StaticModelProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/StaticModelProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/model/VersionedBootstrapModelProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/VersionedBootstrapModelProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/model/VersionedBootstrapModelProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/VersionedBootstrapModelProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/model/VersionedModelProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/VersionedModelProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/model/VersionedModelProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/model/VersionedModelProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/observation/LwM2mNotificationReceiver.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/observation/LwM2mNotificationReceiver.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/observation/LwM2mNotificationReceiver.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/observation/LwM2mNotificationReceiver.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/observation/ObservationListener.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/observation/ObservationListener.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/observation/ObservationListener.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/observation/ObservationListener.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/observation/ObservationService.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/observation/ObservationService.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/observation/ObservationService.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/observation/ObservationService.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/observation/ObservationServiceImpl.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/observation/ObservationServiceImpl.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/observation/ObservationServiceImpl.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/observation/ObservationServiceImpl.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/profile/ClientProfile.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/profile/ClientProfile.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/profile/ClientProfile.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/profile/ClientProfile.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/profile/ClientProfileProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/profile/ClientProfileProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/profile/ClientProfileProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/profile/ClientProfileProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/profile/DefaultClientProfileProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/profile/DefaultClientProfileProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/profile/DefaultClientProfileProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/profile/DefaultClientProfileProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/ClientAwakeTimeProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/ClientAwakeTimeProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/ClientAwakeTimeProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/ClientAwakeTimeProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceListener.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/PresenceListener.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceListener.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/PresenceListener.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceService.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/PresenceService.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceService.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/PresenceService.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/PresenceServiceImpl.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceStateListener.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/PresenceStateListener.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/PresenceStateListener.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/PresenceStateListener.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/QueueModeLwM2mRequestSender.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/QueueModeLwM2mRequestSender.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/QueueModeLwM2mRequestSender.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/QueueModeLwM2mRequestSender.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/StaticClientAwakeTimeProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/StaticClientAwakeTimeProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/queue/StaticClientAwakeTimeProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/queue/StaticClientAwakeTimeProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/DefaultRegistrationDataExtractor.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/DefaultRegistrationDataExtractor.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/DefaultRegistrationDataExtractor.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/DefaultRegistrationDataExtractor.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/Deregistration.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/Deregistration.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/Deregistration.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/Deregistration.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/ExpirationListener.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/ExpirationListener.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/ExpirationListener.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/ExpirationListener.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/InMemoryRegistrationStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/InMemoryRegistrationStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/InMemoryRegistrationStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/InMemoryRegistrationStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RandomStringRegistrationIdProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RandomStringRegistrationIdProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RandomStringRegistrationIdProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RandomStringRegistrationIdProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/Registration.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/Registration.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/Registration.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/Registration.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationDataExtractor.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationDataExtractor.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationDataExtractor.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationDataExtractor.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationHandler.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationHandler.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationHandler.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationHandler.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationIdProvider.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationIdProvider.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationIdProvider.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationIdProvider.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationListener.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationListener.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationListener.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationListener.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationService.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationService.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationService.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationService.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationServiceImpl.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationServiceImpl.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationServiceImpl.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationServiceImpl.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationUpdate.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationUpdate.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/RegistrationUpdate.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/RegistrationUpdate.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/UpdatedRegistration.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/UpdatedRegistration.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/registration/UpdatedRegistration.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/registration/UpdatedRegistration.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/request/DefaultDownlinkRequestSender.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/DefaultDownlinkRequestSender.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/request/DefaultDownlinkRequestSender.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/DefaultDownlinkRequestSender.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/request/DefaultUplinkRequestReceiver.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/DefaultUplinkRequestReceiver.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/request/DefaultUplinkRequestReceiver.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/DefaultUplinkRequestReceiver.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/request/DownlinkRequestSender.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/DownlinkRequestSender.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/request/DownlinkRequestSender.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/DownlinkRequestSender.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/request/LowerLayerConfig.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/LowerLayerConfig.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/request/LowerLayerConfig.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/LowerLayerConfig.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/request/UplinkRequestReceiver.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/UplinkRequestReceiver.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/request/UplinkRequestReceiver.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/request/UplinkRequestReceiver.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/Authorization.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/Authorization.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/Authorization.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/Authorization.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/Authorizer.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/Authorizer.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/Authorizer.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/Authorizer.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/BootstrapAuthorizer.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/BootstrapAuthorizer.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/BootstrapAuthorizer.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/BootstrapAuthorizer.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/BootstrapSecurityStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/BootstrapSecurityStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/BootstrapSecurityStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/BootstrapSecurityStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/BootstrapSecurityStoreAdapter.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/BootstrapSecurityStoreAdapter.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/BootstrapSecurityStoreAdapter.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/BootstrapSecurityStoreAdapter.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/DefaultAuthorizer.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/DefaultAuthorizer.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/DefaultAuthorizer.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/DefaultAuthorizer.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/EditableSecurityStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/EditableSecurityStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/EditableSecurityStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/EditableSecurityStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/FileSecurityStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/FileSecurityStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/FileSecurityStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/FileSecurityStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/InMemorySecurityStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/InMemorySecurityStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/InMemorySecurityStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/InMemorySecurityStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/NonUniqueSecurityInfoException.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/NonUniqueSecurityInfoException.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/NonUniqueSecurityInfoException.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/NonUniqueSecurityInfoException.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/SecurityChecker.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/SecurityChecker.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/SecurityChecker.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/SecurityChecker.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/SecurityInfo.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/SecurityInfo.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/SecurityInfo.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/SecurityInfo.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/SecurityStore.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/SecurityStore.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/SecurityStore.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/SecurityStore.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/SecurityStoreListener.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/SecurityStoreListener.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/SecurityStoreListener.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/SecurityStoreListener.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/security/ServerSecurityInfo.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/ServerSecurityInfo.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/security/ServerSecurityInfo.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/security/ServerSecurityInfo.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/send/SendHandler.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/send/SendHandler.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/send/SendHandler.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/send/SendHandler.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/send/SendListener.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/send/SendListener.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/send/SendListener.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/send/SendListener.java
diff --git a/leshan-server-core/src/main/java/org/eclipse/leshan/server/send/SendService.java b/leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/send/SendService.java
similarity index 100%
rename from leshan-server-core/src/main/java/org/eclipse/leshan/server/send/SendService.java
rename to leshan-lwm2m-server/src/main/java/org/eclipse/leshan/server/send/SendService.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/SerializationTests.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/SerializationTests.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/SerializationTests.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/SerializationTests.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/SerializationUtil.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/SerializationUtil.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/SerializationUtil.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/SerializationUtil.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigTest.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigTest.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigTest.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/bootstrap/BootstrapConfigTest.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/bootstrap/BootstrapHandlerTest.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/bootstrap/BootstrapHandlerTest.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/bootstrap/BootstrapHandlerTest.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/bootstrap/BootstrapHandlerTest.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/queue/PresenceServiceTest.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/queue/PresenceServiceTest.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/queue/PresenceServiceTest.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/queue/PresenceServiceTest.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/InMemoryRegistrationStoreTest.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/InMemoryRegistrationStoreTest.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/InMemoryRegistrationStoreTest.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/InMemoryRegistrationStoreTest.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/RegistrationHandlerTest.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/RegistrationHandlerTest.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/RegistrationHandlerTest.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/RegistrationHandlerTest.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/RegistrationSortObjectLinksTest.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/RegistrationSortObjectLinksTest.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/RegistrationSortObjectLinksTest.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/RegistrationSortObjectLinksTest.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/RegistrationTest.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/RegistrationTest.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/RegistrationTest.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/RegistrationTest.java
diff --git a/leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/RegistrationUpdateTest.java b/leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/RegistrationUpdateTest.java
similarity index 100%
rename from leshan-server-core/src/test/java/org/eclipse/leshan/server/registration/RegistrationUpdateTest.java
rename to leshan-lwm2m-server/src/test/java/org/eclipse/leshan/server/registration/RegistrationUpdateTest.java
diff --git a/leshan-core/logback-leshan-test.xml b/leshan-tl-cf-client-coap/logback-leshan-test.xml
similarity index 100%
rename from leshan-core/logback-leshan-test.xml
rename to leshan-tl-cf-client-coap/logback-leshan-test.xml
diff --git a/leshan-client-cf/pom.xml b/leshan-tl-cf-client-coap/pom.xml
similarity index 100%
rename from leshan-client-cf/pom.xml
rename to leshan-tl-cf-client-coap/pom.xml
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/CaliforniumConnectionController.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/CaliforniumConnectionController.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/CaliforniumConnectionController.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/CaliforniumConnectionController.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LwM2mClientCoapResource.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/LwM2mClientCoapResource.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LwM2mClientCoapResource.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/LwM2mClientCoapResource.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/ObserveCompositeRelationFilter.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/ObserveCompositeRelationFilter.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/ObserveCompositeRelationFilter.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/ObserveCompositeRelationFilter.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/RootResource.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/RootResource.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/RootResource.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/RootResource.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/bootstrap/BootstrapResource.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/bootstrap/BootstrapResource.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/bootstrap/BootstrapResource.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/bootstrap/BootstrapResource.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpoint.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/CaliforniumClientEndpoint.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpoint.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/CaliforniumClientEndpoint.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointFactory.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/CaliforniumClientEndpointFactory.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointFactory.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/CaliforniumClientEndpointFactory.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointsProvider.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/CaliforniumClientEndpointsProvider.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/CaliforniumClientEndpointsProvider.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/CaliforniumClientEndpointsProvider.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/ClientCoapMessageTranslator.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/ClientCoapMessageTranslator.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/ClientCoapMessageTranslator.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/ClientCoapMessageTranslator.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/ClientProtocolProvider.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/ClientProtocolProvider.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/ClientProtocolProvider.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/ClientProtocolProvider.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/ServerIdentityExtractor.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/ServerIdentityExtractor.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/ServerIdentityExtractor.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/ServerIdentityExtractor.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapClientEndpointFactory.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coap/CoapClientEndpointFactory.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapClientEndpointFactory.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coap/CoapClientEndpointFactory.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapClientProtocolProvider.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coap/CoapClientProtocolProvider.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapClientProtocolProvider.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coap/CoapClientProtocolProvider.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapOscoreClientEndpointFactory.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coap/CoapOscoreClientEndpointFactory.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapOscoreClientEndpointFactory.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coap/CoapOscoreClientEndpointFactory.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapOscoreProtocolProvider.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coap/CoapOscoreProtocolProvider.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coap/CoapOscoreProtocolProvider.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coap/CoapOscoreProtocolProvider.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coaps/CoapsClientEndpointFactory.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coaps/CoapsClientEndpointFactory.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coaps/CoapsClientEndpointFactory.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coaps/CoapsClientEndpointFactory.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coaps/CoapsClientProtocolProvider.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coaps/CoapsClientProtocolProvider.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/endpoint/coaps/CoapsClientProtocolProvider.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/endpoint/coaps/CoapsClientProtocolProvider.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/InstanceRemovedFilter.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/object/InstanceRemovedFilter.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/InstanceRemovedFilter.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/object/InstanceRemovedFilter.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ObjectResource.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/object/ObjectResource.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ObjectResource.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/object/ObjectResource.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ResourceObserveFilter.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/object/ResourceObserveFilter.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/object/ResourceObserveFilter.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/object/ResourceObserveFilter.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/CoapRequestBuilder.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/request/CoapRequestBuilder.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/CoapRequestBuilder.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/request/CoapRequestBuilder.java
diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/LwM2mResponseBuilder.java b/leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/request/LwM2mResponseBuilder.java
similarity index 100%
rename from leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/request/LwM2mResponseBuilder.java
rename to leshan-tl-cf-client-coap/src/main/java/org/eclipse/leshan/transport/californium/client/request/LwM2mResponseBuilder.java
diff --git a/leshan-server-cf/logback-leshan-test.xml b/leshan-tl-cf-server-coap/logback-leshan-test.xml
similarity index 100%
rename from leshan-server-cf/logback-leshan-test.xml
rename to leshan-tl-cf-server-coap/logback-leshan-test.xml
diff --git a/leshan-server-cf/pom.xml b/leshan-tl-cf-server-coap/pom.xml
similarity index 100%
rename from leshan-server-cf/pom.xml
rename to leshan-tl-cf-server-coap/pom.xml
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/ConnectionCleaner.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/ConnectionCleaner.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/ConnectionCleaner.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/ConnectionCleaner.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LwM2mOscoreStore.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/LwM2mOscoreStore.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LwM2mOscoreStore.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/LwM2mOscoreStore.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LwM2mPskStore.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/LwM2mPskStore.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LwM2mPskStore.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/LwM2mPskStore.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/OscoreContextCleaner.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/OscoreContextCleaner.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/OscoreContextCleaner.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/OscoreContextCleaner.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/RootResource.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/RootResource.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/RootResource.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/RootResource.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/BootstrapOscoreContextCleaner.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/BootstrapOscoreContextCleaner.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/BootstrapOscoreContextCleaner.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/BootstrapOscoreContextCleaner.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/BootstrapResource.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/BootstrapResource.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/BootstrapResource.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/BootstrapResource.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LwM2mBootstrapOscoreStore.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/LwM2mBootstrapOscoreStore.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LwM2mBootstrapOscoreStore.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/LwM2mBootstrapOscoreStore.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LwM2mBootstrapPskStore.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/LwM2mBootstrapPskStore.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/LwM2mBootstrapPskStore.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/LwM2mBootstrapPskStore.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/OscoreBootstrapListener.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/OscoreBootstrapListener.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/OscoreBootstrapListener.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/OscoreBootstrapListener.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/BootstrapServerCoapMessageTranslator.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/BootstrapServerCoapMessageTranslator.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/BootstrapServerCoapMessageTranslator.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/BootstrapServerCoapMessageTranslator.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/BootstrapServerProtocolProvider.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/BootstrapServerProtocolProvider.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/BootstrapServerProtocolProvider.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/BootstrapServerProtocolProvider.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/CaliforniumBootstrapServerEndpoint.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/CaliforniumBootstrapServerEndpoint.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/CaliforniumBootstrapServerEndpoint.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/CaliforniumBootstrapServerEndpoint.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/CaliforniumBootstrapServerEndpointFactory.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/CaliforniumBootstrapServerEndpointFactory.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/CaliforniumBootstrapServerEndpointFactory.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/CaliforniumBootstrapServerEndpointFactory.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/CaliforniumBootstrapServerEndpointsProvider.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/CaliforniumBootstrapServerEndpointsProvider.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/CaliforniumBootstrapServerEndpointsProvider.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/CaliforniumBootstrapServerEndpointsProvider.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coap/CoapBootstrapServerEndpointFactory.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coap/CoapBootstrapServerEndpointFactory.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coap/CoapBootstrapServerEndpointFactory.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coap/CoapBootstrapServerEndpointFactory.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coap/CoapBootstrapServerEndpointFactoryBuilder.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coap/CoapBootstrapServerEndpointFactoryBuilder.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coap/CoapBootstrapServerEndpointFactoryBuilder.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coap/CoapBootstrapServerEndpointFactoryBuilder.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coap/CoapBootstrapServerProtocolProvider.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coap/CoapBootstrapServerProtocolProvider.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coap/CoapBootstrapServerProtocolProvider.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coap/CoapBootstrapServerProtocolProvider.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coap/CoapOscoreBootstrapServerEndpointFactory.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coap/CoapOscoreBootstrapServerEndpointFactory.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coap/CoapOscoreBootstrapServerEndpointFactory.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coap/CoapOscoreBootstrapServerEndpointFactory.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coaps/CoapsBootstrapServerEndpointFactory.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coaps/CoapsBootstrapServerEndpointFactory.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coaps/CoapsBootstrapServerEndpointFactory.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coaps/CoapsBootstrapServerEndpointFactory.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coaps/CoapsBootstrapServerEndpointFactoryBuilder.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coaps/CoapsBootstrapServerEndpointFactoryBuilder.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coaps/CoapsBootstrapServerEndpointFactoryBuilder.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coaps/CoapsBootstrapServerEndpointFactoryBuilder.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coaps/CoapsBootstrapServerProtocolProvider.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coaps/CoapsBootstrapServerProtocolProvider.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/endpoint/coaps/CoapsBootstrapServerProtocolProvider.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/endpoint/coaps/CoapsBootstrapServerProtocolProvider.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/request/CoapRequestBuilder.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/request/CoapRequestBuilder.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/request/CoapRequestBuilder.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/request/CoapRequestBuilder.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/request/LwM2mResponseBuilder.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/request/LwM2mResponseBuilder.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/bootstrap/request/LwM2mResponseBuilder.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/bootstrap/request/LwM2mResponseBuilder.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/AbstractEndpointFactoryBuilder.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/AbstractEndpointFactoryBuilder.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/AbstractEndpointFactoryBuilder.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/AbstractEndpointFactoryBuilder.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/CaliforniumServerEndpoint.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/CaliforniumServerEndpoint.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/CaliforniumServerEndpoint.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/CaliforniumServerEndpoint.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/CaliforniumServerEndpointFactory.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/CaliforniumServerEndpointFactory.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/CaliforniumServerEndpointFactory.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/CaliforniumServerEndpointFactory.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/CaliforniumServerEndpointsProvider.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/CaliforniumServerEndpointsProvider.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/CaliforniumServerEndpointsProvider.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/CaliforniumServerEndpointsProvider.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/ServerCoapMessageTranslator.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/ServerCoapMessageTranslator.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/ServerCoapMessageTranslator.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/ServerCoapMessageTranslator.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/ServerProtocolProvider.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/ServerProtocolProvider.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/ServerProtocolProvider.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/ServerProtocolProvider.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coap/CoapOscoreServerEndpointFactory.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coap/CoapOscoreServerEndpointFactory.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coap/CoapOscoreServerEndpointFactory.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coap/CoapOscoreServerEndpointFactory.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coap/CoapServerEndpointFactory.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coap/CoapServerEndpointFactory.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coap/CoapServerEndpointFactory.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coap/CoapServerEndpointFactory.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coap/CoapServerEndpointFactoryBuilder.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coap/CoapServerEndpointFactoryBuilder.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coap/CoapServerEndpointFactoryBuilder.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coap/CoapServerEndpointFactoryBuilder.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coap/CoapServerProtocolProvider.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coap/CoapServerProtocolProvider.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coap/CoapServerProtocolProvider.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coap/CoapServerProtocolProvider.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coaps/CoapsServerEndpointFactory.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coaps/CoapsServerEndpointFactory.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coaps/CoapsServerEndpointFactory.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coaps/CoapsServerEndpointFactory.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coaps/CoapsServerEndpointFactoryBuilder.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coaps/CoapsServerEndpointFactoryBuilder.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coaps/CoapsServerEndpointFactoryBuilder.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coaps/CoapsServerEndpointFactoryBuilder.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coaps/CoapsServerProtocolProvider.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coaps/CoapsServerProtocolProvider.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/endpoint/coaps/CoapsServerProtocolProvider.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/endpoint/coaps/CoapsServerProtocolProvider.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/observation/EndpointContextSerDes.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/observation/EndpointContextSerDes.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/observation/EndpointContextSerDes.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/observation/EndpointContextSerDes.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/observation/LwM2mObservationStore.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/observation/LwM2mObservationStore.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/observation/LwM2mObservationStore.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/observation/LwM2mObservationStore.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/observation/ObservationSerDes.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/observation/ObservationSerDes.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/observation/ObservationSerDes.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/observation/ObservationSerDes.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/registration/RegisterResource.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/registration/RegisterResource.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/registration/RegisterResource.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/registration/RegisterResource.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CoapRequestBuilder.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/request/CoapRequestBuilder.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CoapRequestBuilder.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/request/CoapRequestBuilder.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CoapRequestSetter.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/request/CoapRequestSetter.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/CoapRequestSetter.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/request/CoapRequestSetter.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/LwM2mResponseBuilder.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/request/LwM2mResponseBuilder.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/request/LwM2mResponseBuilder.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/request/LwM2mResponseBuilder.java
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/send/SendResource.java b/leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/send/SendResource.java
similarity index 100%
rename from leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/send/SendResource.java
rename to leshan-tl-cf-server-coap/src/main/java/org/eclipse/leshan/transport/californium/server/send/SendResource.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/DummyDecoder.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/DummyDecoder.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/DummyDecoder.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/DummyDecoder.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/LeshanServerBuilderTest.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/LeshanServerBuilderTest.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/LeshanServerBuilderTest.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/LeshanServerBuilderTest.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/LeshanServerTest.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/LeshanServerTest.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/LeshanServerTest.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/LeshanServerTest.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServerBuilderTest.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/bootstrap/LeshanBootstrapServerBuilderTest.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServerBuilderTest.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/bootstrap/LeshanBootstrapServerBuilderTest.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServerTest.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/bootstrap/LeshanBootstrapServerTest.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServerTest.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/bootstrap/LeshanBootstrapServerTest.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/observation/LwM2mObservationStoreTest.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/observation/LwM2mObservationStoreTest.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/observation/LwM2mObservationStoreTest.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/observation/LwM2mObservationStoreTest.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/observation/ObservationServiceTest.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/observation/ObservationServiceTest.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/observation/ObservationServiceTest.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/observation/ObservationServiceTest.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/observation/ObserveUtilTest.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/observation/ObserveUtilTest.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/observation/ObserveUtilTest.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/observation/ObserveUtilTest.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/request/CoapRequestBuilderTest.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/request/CoapRequestBuilderTest.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/request/CoapRequestBuilderTest.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/request/CoapRequestBuilderTest.java
diff --git a/leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/request/LwM2mResponseBuilderTest.java b/leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/request/LwM2mResponseBuilderTest.java
similarity index 100%
rename from leshan-server-cf/src/test/java/org/eclipse/leshan/server/californium/request/LwM2mResponseBuilderTest.java
rename to leshan-tl-cf-server-coap/src/test/java/org/eclipse/leshan/transport/californium/server/request/LwM2mResponseBuilderTest.java
diff --git a/leshan-server-core/logback-leshan-test.xml b/leshan-tl-cf-shared/logback-leshan-test.xml
similarity index 100%
rename from leshan-server-core/logback-leshan-test.xml
rename to leshan-tl-cf-shared/logback-leshan-test.xml
diff --git a/leshan-core-cf/pom.xml b/leshan-tl-cf-shared/pom.xml
similarity index 100%
rename from leshan-core-cf/pom.xml
rename to leshan-tl-cf-shared/pom.xml
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/AbstractRequestObserver.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/AbstractRequestObserver.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/AbstractRequestObserver.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/AbstractRequestObserver.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/AsyncRequestObserver.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/AsyncRequestObserver.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/AsyncRequestObserver.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/AsyncRequestObserver.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/CoapAsyncRequestObserver.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/CoapAsyncRequestObserver.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/CoapAsyncRequestObserver.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/CoapAsyncRequestObserver.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/CoapResponseCallback.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/CoapResponseCallback.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/CoapResponseCallback.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/CoapResponseCallback.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/CoapSyncRequestObserver.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/CoapSyncRequestObserver.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/CoapSyncRequestObserver.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/CoapSyncRequestObserver.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/DefaultExceptionTranslator.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/DefaultExceptionTranslator.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/DefaultExceptionTranslator.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/DefaultExceptionTranslator.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/ExceptionTranslator.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/ExceptionTranslator.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/ExceptionTranslator.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/ExceptionTranslator.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/LwM2mCoapResource.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/LwM2mCoapResource.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/LwM2mCoapResource.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/LwM2mCoapResource.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/Lwm2mEndpointContextMatcher.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/Lwm2mEndpointContextMatcher.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/Lwm2mEndpointContextMatcher.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/Lwm2mEndpointContextMatcher.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/ObserveUtil.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/ObserveUtil.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/ObserveUtil.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/ObserveUtil.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/PrincipalMdcConnectionListener.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/PrincipalMdcConnectionListener.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/PrincipalMdcConnectionListener.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/PrincipalMdcConnectionListener.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/ResponseCodeUtil.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/ResponseCodeUtil.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/ResponseCodeUtil.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/ResponseCodeUtil.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/SyncRequestObserver.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/SyncRequestObserver.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/SyncRequestObserver.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/SyncRequestObserver.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/identity/DefaultCoapIdentityHandler.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/identity/DefaultCoapIdentityHandler.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/identity/DefaultCoapIdentityHandler.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/identity/DefaultCoapIdentityHandler.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/identity/IdentityHandler.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/identity/IdentityHandler.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/identity/IdentityHandler.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/identity/IdentityHandler.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/identity/IdentityHandlerProvider.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/identity/IdentityHandlerProvider.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/identity/IdentityHandlerProvider.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/identity/IdentityHandlerProvider.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/oscore/cf/InMemoryOscoreContextDB.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/oscore/cf/InMemoryOscoreContextDB.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/oscore/cf/InMemoryOscoreContextDB.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/oscore/cf/InMemoryOscoreContextDB.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/oscore/cf/OscoreParameters.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/oscore/cf/OscoreParameters.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/oscore/cf/OscoreParameters.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/oscore/cf/OscoreParameters.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/oscore/cf/OscoreStore.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/oscore/cf/OscoreStore.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/oscore/cf/OscoreStore.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/oscore/cf/OscoreStore.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/oscore/cf/StaticOscoreStore.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/oscore/cf/StaticOscoreStore.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/oscore/cf/StaticOscoreStore.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/oscore/cf/StaticOscoreStore.java
diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/security/LwM2mCertificateVerifier.java b/leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/security/LwM2mCertificateVerifier.java
similarity index 100%
rename from leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/security/LwM2mCertificateVerifier.java
rename to leshan-tl-cf-shared/src/main/java/org/eclipse/leshan/transport/californium/security/LwM2mCertificateVerifier.java
diff --git a/leshan-core-cf/src/test/java/org/eclipse/leshan/core/californium/ResponseCodeUtilTest.java b/leshan-tl-cf-shared/src/test/java/org/eclipse/leshan/transport/californium/ResponseCodeUtilTest.java
similarity index 100%
rename from leshan-core-cf/src/test/java/org/eclipse/leshan/core/californium/ResponseCodeUtilTest.java
rename to leshan-tl-cf-shared/src/test/java/org/eclipse/leshan/transport/californium/ResponseCodeUtilTest.java
diff --git a/leshan-tl-javacoap-client/pom.xml b/leshan-tl-jc-client-coap/pom.xml
similarity index 100%
rename from leshan-tl-javacoap-client/pom.xml
rename to leshan-tl-jc-client-coap/pom.xml
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/AbstractJavaCoapClientEndpointsProvider.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/AbstractJavaCoapClientEndpointsProvider.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/AbstractJavaCoapClientEndpointsProvider.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/AbstractJavaCoapClientEndpointsProvider.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/JavaCoapClientEndpoint.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/JavaCoapClientEndpoint.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/JavaCoapClientEndpoint.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/JavaCoapClientEndpoint.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/JavaCoapClientEndpointsProvider.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/JavaCoapClientEndpointsProvider.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/JavaCoapClientEndpointsProvider.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/endpoint/JavaCoapClientEndpointsProvider.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/HashMapObserversStore.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/HashMapObserversStore.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/HashMapObserversStore.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/HashMapObserversStore.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/LwM2mKeys.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/LwM2mKeys.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/LwM2mKeys.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/LwM2mKeys.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/NotificationHandler.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/NotificationHandler.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/NotificationHandler.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/NotificationHandler.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversListener.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversListener.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversListener.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversListener.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversManager.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversManager.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversManager.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversManager.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversStore.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversStore.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversStore.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/observe/ObserversStore.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/ClientCoapMessageTranslator.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/ClientCoapMessageTranslator.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/ClientCoapMessageTranslator.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/ClientCoapMessageTranslator.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/CoapRequestBuilder.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/CoapRequestBuilder.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/CoapRequestBuilder.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/CoapRequestBuilder.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/LwM2mResponseBuilder.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/LwM2mResponseBuilder.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/LwM2mResponseBuilder.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/request/LwM2mResponseBuilder.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/BootstrapResource.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/BootstrapResource.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/BootstrapResource.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/BootstrapResource.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/LwM2mClientCoapResource.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/LwM2mClientCoapResource.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/LwM2mClientCoapResource.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/LwM2mClientCoapResource.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/ObjectResource.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/ObjectResource.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/ObjectResource.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/ObjectResource.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/RootResource.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/RootResource.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/RootResource.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/RootResource.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/RouterService.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/RouterService.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/RouterService.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/RouterService.java
diff --git a/leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/ServerIdentityExtractor.java b/leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/ServerIdentityExtractor.java
similarity index 100%
rename from leshan-tl-javacoap-client/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/ServerIdentityExtractor.java
rename to leshan-tl-jc-client-coap/src/main/java/org/eclipse/leshan/transport/javacoap/client/resource/ServerIdentityExtractor.java
diff --git a/leshan-tl-javacoap-client-coaptcp/pom.xml b/leshan-tl-jc-client-coaptcp/pom.xml
similarity index 100%
rename from leshan-tl-javacoap-client-coaptcp/pom.xml
rename to leshan-tl-jc-client-coaptcp/pom.xml
diff --git a/leshan-tl-javacoap-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/JavaCoapTcpClientEndpointsProvider.java b/leshan-tl-jc-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/JavaCoapTcpClientEndpointsProvider.java
similarity index 100%
rename from leshan-tl-javacoap-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/JavaCoapTcpClientEndpointsProvider.java
rename to leshan-tl-jc-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/JavaCoapTcpClientEndpointsProvider.java
diff --git a/leshan-tl-javacoap-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/JavaCoapsTcpClientEndpointsProvider.java b/leshan-tl-jc-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/JavaCoapsTcpClientEndpointsProvider.java
similarity index 100%
rename from leshan-tl-javacoap-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/JavaCoapsTcpClientEndpointsProvider.java
rename to leshan-tl-jc-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/JavaCoapsTcpClientEndpointsProvider.java
diff --git a/leshan-tl-javacoap-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/SSLSocketClientTransport.java b/leshan-tl-jc-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/SSLSocketClientTransport.java
similarity index 100%
rename from leshan-tl-javacoap-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/SSLSocketClientTransport.java
rename to leshan-tl-jc-client-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/client/coaptcp/endpoint/SSLSocketClientTransport.java
diff --git a/leshan-tl-javacoap-core/logback-leshan-test.xml b/leshan-tl-jc-server-coap/logback-leshan-test.xml
similarity index 100%
rename from leshan-tl-javacoap-core/logback-leshan-test.xml
rename to leshan-tl-jc-server-coap/logback-leshan-test.xml
diff --git a/leshan-tl-javacoap-server/pom.xml b/leshan-tl-jc-server-coap/pom.xml
similarity index 100%
rename from leshan-tl-javacoap-server/pom.xml
rename to leshan-tl-jc-server-coap/pom.xml
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/AbstractJavaCoapServerEndpointsProvider.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/AbstractJavaCoapServerEndpointsProvider.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/AbstractJavaCoapServerEndpointsProvider.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/AbstractJavaCoapServerEndpointsProvider.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/EndpointUriProvider.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/EndpointUriProvider.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/EndpointUriProvider.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/EndpointUriProvider.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/JavaCoapServerEndpoint.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/JavaCoapServerEndpoint.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/JavaCoapServerEndpoint.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/JavaCoapServerEndpoint.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/JavaCoapServerEndpointsProvider.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/JavaCoapServerEndpointsProvider.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/JavaCoapServerEndpointsProvider.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/JavaCoapServerEndpointsProvider.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/ServerCoapMessageTranslator.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/ServerCoapMessageTranslator.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/ServerCoapMessageTranslator.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/endpoint/ServerCoapMessageTranslator.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/CoapNotificationReceiver.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/CoapNotificationReceiver.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/CoapNotificationReceiver.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/CoapNotificationReceiver.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/LwM2mKeys.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/LwM2mKeys.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/LwM2mKeys.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/LwM2mKeys.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/LwM2mObservationsStore.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/LwM2mObservationsStore.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/LwM2mObservationsStore.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/LwM2mObservationsStore.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/ObservationUtil.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/ObservationUtil.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/ObservationUtil.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/observation/ObservationUtil.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/request/CoapRequestBuilder.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/request/CoapRequestBuilder.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/request/CoapRequestBuilder.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/request/CoapRequestBuilder.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/request/LwM2mResponseBuilder.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/request/LwM2mResponseBuilder.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/request/LwM2mResponseBuilder.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/request/LwM2mResponseBuilder.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/resource/RegistrationResource.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/resource/RegistrationResource.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/resource/RegistrationResource.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/resource/RegistrationResource.java
diff --git a/leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/resource/SendResource.java b/leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/resource/SendResource.java
similarity index 100%
rename from leshan-tl-javacoap-server/src/main/java/org/eclipse/leshan/transport/javacoap/server/resource/SendResource.java
rename to leshan-tl-jc-server-coap/src/main/java/org/eclipse/leshan/transport/javacoap/server/resource/SendResource.java
diff --git a/leshan-tl-javacoap-server-coaptcp/logback-leshan-test.xml b/leshan-tl-jc-server-coaptcp/logback-leshan-test.xml
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/logback-leshan-test.xml
rename to leshan-tl-jc-server-coaptcp/logback-leshan-test.xml
diff --git a/leshan-tl-javacoap-server-coaptcp/pom.xml b/leshan-tl-jc-server-coaptcp/pom.xml
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/pom.xml
rename to leshan-tl-jc-server-coaptcp/pom.xml
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/JavaCoapTcpServerEndpointsProvider.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/JavaCoapTcpServerEndpointsProvider.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/JavaCoapTcpServerEndpointsProvider.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/JavaCoapTcpServerEndpointsProvider.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/JavaCoapsTcpServerEndpointsProvider.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/JavaCoapsTcpServerEndpointsProvider.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/JavaCoapsTcpServerEndpointsProvider.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/JavaCoapsTcpServerEndpointsProvider.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/LwM2mTransportContextMatcher.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/LwM2mTransportContextMatcher.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/LwM2mTransportContextMatcher.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/endpoint/LwM2mTransportContextMatcher.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpDecoder.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpDecoder.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpDecoder.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpDecoder.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpEncoder.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpEncoder.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpEncoder.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpEncoder.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpTransportResolver.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpTransportResolver.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpTransportResolver.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapTcpTransportResolver.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapsTcpTransportResolver.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapsTcpTransportResolver.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapsTcpTransportResolver.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/CoapsTcpTransportResolver.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/DefaultTransportContextMatcher.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/DefaultTransportContextMatcher.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/DefaultTransportContextMatcher.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/DefaultTransportContextMatcher.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/NettyCoapTcpTransport.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/NettyCoapTcpTransport.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/NettyCoapTcpTransport.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/NettyCoapTcpTransport.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/NettyUtils.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/NettyUtils.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/NettyUtils.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/NettyUtils.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/TransportContextHandler.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/TransportContextHandler.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/TransportContextHandler.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/TransportContextHandler.java
diff --git a/leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/UnconnectedPeerException.java b/leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/UnconnectedPeerException.java
similarity index 100%
rename from leshan-tl-javacoap-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/UnconnectedPeerException.java
rename to leshan-tl-jc-server-coaptcp/src/main/java/org/eclipse/leshan/transport/javacoap/server/coaptcp/transport/UnconnectedPeerException.java
diff --git a/leshan-tl-javacoap-server/logback-leshan-test.xml b/leshan-tl-jc-shared/logback-leshan-test.xml
similarity index 100%
rename from leshan-tl-javacoap-server/logback-leshan-test.xml
rename to leshan-tl-jc-shared/logback-leshan-test.xml
diff --git a/leshan-tl-javacoap-core/pom.xml b/leshan-tl-jc-shared/pom.xml
similarity index 100%
rename from leshan-tl-javacoap-core/pom.xml
rename to leshan-tl-jc-shared/pom.xml
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/SingleX509KeyManager.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/SingleX509KeyManager.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/SingleX509KeyManager.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/SingleX509KeyManager.java
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/State.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/State.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/State.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/State.java
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/DefaultCoapIdentityHandler.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/DefaultCoapIdentityHandler.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/DefaultCoapIdentityHandler.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/DefaultCoapIdentityHandler.java
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/DefaultTlsIdentityHandler.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/DefaultTlsIdentityHandler.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/DefaultTlsIdentityHandler.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/DefaultTlsIdentityHandler.java
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/IdentityHandler.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/IdentityHandler.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/IdentityHandler.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/IdentityHandler.java
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/IdentityHandlerProvider.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/IdentityHandlerProvider.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/IdentityHandlerProvider.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/IdentityHandlerProvider.java
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/TlsTransportContextKeys.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/TlsTransportContextKeys.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/identity/TlsTransportContextKeys.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/identity/TlsTransportContextKeys.java
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/request/RandomTokenGenerator.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/request/RandomTokenGenerator.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/request/RandomTokenGenerator.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/request/RandomTokenGenerator.java
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/request/ResponseCodeUtil.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/request/ResponseCodeUtil.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/request/ResponseCodeUtil.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/request/ResponseCodeUtil.java
diff --git a/leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/resource/LwM2mCoapResource.java b/leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/resource/LwM2mCoapResource.java
similarity index 100%
rename from leshan-tl-javacoap-core/src/main/java/org/eclipse/leshan/transport/javacoap/resource/LwM2mCoapResource.java
rename to leshan-tl-jc-shared/src/main/java/org/eclipse/leshan/transport/javacoap/resource/LwM2mCoapResource.java