diff --git a/.gradle/6.7/executionHistory/executionHistory.bin b/.gradle/6.7/executionHistory/executionHistory.bin
index 7d6d3ed19ff7e62cae457fe153e43695ad405be5..08f5652dab4ac9d2fd8aaee03be0066740e0c11e 100644
Binary files a/.gradle/6.7/executionHistory/executionHistory.bin and b/.gradle/6.7/executionHistory/executionHistory.bin differ
diff --git a/.gradle/6.7/executionHistory/executionHistory.lock b/.gradle/6.7/executionHistory/executionHistory.lock
index 62c3aedfab28f21a41bba0496bc7fa301fd0d594..f5d327842988626ef4b0ffb4ea5e166f45cd1f29 100644
Binary files a/.gradle/6.7/executionHistory/executionHistory.lock and b/.gradle/6.7/executionHistory/executionHistory.lock differ
diff --git a/.gradle/6.7/fileHashes/fileHashes.bin b/.gradle/6.7/fileHashes/fileHashes.bin
index 118d56ca6680a8dcae1c1211a60e055fff234143..7b5bfb4988a7b0e43abc483baac5d9eb672035ef 100644
Binary files a/.gradle/6.7/fileHashes/fileHashes.bin and b/.gradle/6.7/fileHashes/fileHashes.bin differ
diff --git a/.gradle/6.7/fileHashes/fileHashes.lock b/.gradle/6.7/fileHashes/fileHashes.lock
index 1c845f92a768ab1f65c58207ff272373697b3137..f235325ad01d016949d55ffe4167f0dab0f64a7f 100644
Binary files a/.gradle/6.7/fileHashes/fileHashes.lock and b/.gradle/6.7/fileHashes/fileHashes.lock differ
diff --git a/.gradle/6.7/javaCompile/classAnalysis.bin b/.gradle/6.7/javaCompile/classAnalysis.bin
index 7b4c29d993f66e379248aeb8ac87a7f4be2cd3fa..95cfbd7d9e6754d8632eba78d9c6e6b63b8fb010 100644
Binary files a/.gradle/6.7/javaCompile/classAnalysis.bin and b/.gradle/6.7/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/6.7/javaCompile/javaCompile.lock b/.gradle/6.7/javaCompile/javaCompile.lock
index 53be1f6f17f9db5c7ab57ef5acec0bd1d99c6278..8c2e48cd28ad20826164cfc5876c303305e6df6a 100644
Binary files a/.gradle/6.7/javaCompile/javaCompile.lock and b/.gradle/6.7/javaCompile/javaCompile.lock differ
diff --git a/.gradle/6.7/javaCompile/taskHistory.bin b/.gradle/6.7/javaCompile/taskHistory.bin
index ad114d8b6c92b52da046b44b1dff0eacceca451d..0986f1f244f0639fbe4473a070a336d8043bbafd 100644
Binary files a/.gradle/6.7/javaCompile/taskHistory.bin and b/.gradle/6.7/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index e6c0138b458c378c30f7213251b4bf78664efb14..e395a6aeb70677c15535d679bcaf6c63d9cc6321 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 37fd1b7c777f77561f69f3e6120972c975604a6c..d33e4bacbfc6e264b8a5039d7027427c5f00437a 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000000000000000000000000000000000000..39eba9a543b8a4b80b9318d462952b6a5674a1ed
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+REST_MQTT_example
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ba1ec5c7e20c12eb5b893684698eab151c4a8803..611e7c8ad7b91e576987485e8678b0fdad4193ae 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/build/classes/java/main/PubExample.class b/build/classes/java/main/MQTT/PubExample.class
similarity index 67%
rename from build/classes/java/main/PubExample.class
rename to build/classes/java/main/MQTT/PubExample.class
index 47d621ee76caf58ec83f46cce2795725b981ef06..cbf5848d90467622e2c80eb309dccc545bf411a2 100644
Binary files a/build/classes/java/main/PubExample.class and b/build/classes/java/main/MQTT/PubExample.class differ
diff --git a/build/classes/java/main/SubExample$1.class b/build/classes/java/main/MQTT/SubExample$1.class
similarity index 51%
rename from build/classes/java/main/SubExample$1.class
rename to build/classes/java/main/MQTT/SubExample$1.class
index 7605034a75cf3da5a137d283b64479a64d8eb1dc..422a3084ea496af76cf141b8d53de8b49cf03b90 100644
Binary files a/build/classes/java/main/SubExample$1.class and b/build/classes/java/main/MQTT/SubExample$1.class differ
diff --git a/build/classes/java/main/MQTT/SubExample.class b/build/classes/java/main/MQTT/SubExample.class
new file mode 100644
index 0000000000000000000000000000000000000000..f6979cd01c6c2ab757c964a759badc497bb8c6b4
Binary files /dev/null and b/build/classes/java/main/MQTT/SubExample.class differ
diff --git a/build/classes/java/main/SubExample.class b/build/classes/java/main/SubExample.class
deleted file mode 100644
index f0d6da4d9070bbb29bd56a96d20f1a328b155518..0000000000000000000000000000000000000000
Binary files a/build/classes/java/main/SubExample.class and /dev/null differ
diff --git a/build/tmp/compileJava/source-classes-mapping.txt b/build/tmp/compileJava/source-classes-mapping.txt
index 066e28c24b7847dba77d447daebd0461bad2d489..24efb495b5ebe9de94c8bb0d9d5cd365a94ef8d7 100644
--- a/build/tmp/compileJava/source-classes-mapping.txt
+++ b/build/tmp/compileJava/source-classes-mapping.txt
@@ -1,15 +1,15 @@
-REST/beans/Users.java
- REST.beans.Users
-REST/StartServer.java
- REST.StartServer
 REST/beans/User.java
  REST.beans.User
 REST/services/HelloWorld.java
  REST.services.HelloWorld
 REST/services/UsersService.java
  REST.services.UsersService
+REST/StartServer.java
+ REST.StartServer
+REST/beans/Users.java
+ REST.beans.Users
 MQTT/PubExample.java
- PubExample
+ MQTT.PubExample
 MQTT/SubExample.java
- SubExample
- SubExample$1
+ MQTT.SubExample
+ MQTT.SubExample$1
diff --git a/build/tmp/war/MANIFEST.MF b/build/tmp/war/MANIFEST.MF
index 59499bce4a2bd51cba227b7c00fcf745b19c95a4..58630c02ef423cffd6dd6aafd946eb8512040c37 100644
--- a/build/tmp/war/MANIFEST.MF
+++ b/build/tmp/war/MANIFEST.MF
@@ -1,2 +1,2 @@
-Manifest-Version: 1.0
-
+Manifest-Version: 1.0
+
diff --git a/src/main/java/MQTT/SubExample.java b/src/main/java/MQTT/SubExample.java
index 9cc6c3aca048156acc2496389a758cc22cfd3182..1de2812899e292f5b5a416f4c5d627187a57bc38 100644
--- a/src/main/java/MQTT/SubExample.java
+++ b/src/main/java/MQTT/SubExample.java
@@ -18,14 +18,13 @@ public class SubExample {
 
         try {
             // Create an Mqtt client
-            MqttAsyncClient mqttClient = new MqttAsyncClient(broker, clientId);
+            MqttClient mqttClient = new MqttClient(broker, clientId);
             MqttConnectOptions connOpts = new MqttConnectOptions();
             connOpts.setCleanSession(true);
 
             // Connect the client
             System.out.println(clientId + " Connecting to " + broker);
-            IMqttToken token = mqttClient.connect(connOpts);
-            token.waitForCompletion();
+            mqttClient.connect(connOpts);
             System.out.println(clientId + " Connected");
 
 
diff --git a/sub_01-tcplocalhost1883/.lck b/sub_01-tcplocalhost1883/.lck
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000