diff --git a/src/C++/Driver/src/CKobuki.cpp b/src/C++/Driver/src/KobukiDriver/CKobuki.cpp
similarity index 100%
rename from src/C++/Driver/src/CKobuki.cpp
rename to src/C++/Driver/src/KobukiDriver/CKobuki.cpp
diff --git a/src/C++/Driver/src/CKobuki.h b/src/C++/Driver/src/KobukiDriver/CKobuki.h
similarity index 100%
rename from src/C++/Driver/src/CKobuki.h
rename to src/C++/Driver/src/KobukiDriver/CKobuki.h
diff --git a/src/C++/Driver/src/KobukiParser.cpp b/src/C++/Driver/src/KobukiDriver/KobukiParser.cpp
similarity index 100%
rename from src/C++/Driver/src/KobukiParser.cpp
rename to src/C++/Driver/src/KobukiDriver/KobukiParser.cpp
diff --git a/src/C++/Driver/src/KobukiParser.h b/src/C++/Driver/src/KobukiDriver/KobukiParser.h
similarity index 100%
rename from src/C++/Driver/src/KobukiParser.h
rename to src/C++/Driver/src/KobukiDriver/KobukiParser.h
diff --git a/src/C++/Driver/src/graph.h b/src/C++/Driver/src/KobukiDriver/graph.h
similarity index 100%
rename from src/C++/Driver/src/graph.h
rename to src/C++/Driver/src/KobukiDriver/graph.h
diff --git a/src/C++/Driver/src/MQTT/main.cpp b/src/C++/Driver/src/MQTT/example.cpp
similarity index 100%
rename from src/C++/Driver/src/MQTT/main.cpp
rename to src/C++/Driver/src/MQTT/example.cpp
diff --git a/src/C++/Driver/src/main.cpp b/src/C++/Driver/src/main.cpp
index 62d4cec..71fefcf 100644
--- a/src/C++/Driver/src/main.cpp
+++ b/src/C++/Driver/src/main.cpp
@@ -1,18 +1,28 @@
-#include "CKobuki.h"
 #include <iostream>
 #include <cmath>
 #include <thread>
-#include "graph.h"
+#include "KobukiDriver/graph.h"
+#include "MQTT/MqttClient.h"
+#include "KobukiDriver/CKobuki.h"
+
 
 using namespace std;
 CKobuki robot;
 int movement();
 int checkCenterCliff();
 
-int main()
-{
+void setup(){
 	unsigned char *null_ptr(0);
 	robot.startCommunication("/dev/ttyUSB0", true, null_ptr);
+	MqttClient client("mqtt://localhost:1883", "raspberry_pi_client", "ishak", "kobuki");
+    client.connect();
+    client.subscribe("home/commands");
+
+}
+
+int main()
+{
+
 	// thread mv(movement);
 	// mv.join(); //only exit once thread one is done running