diff --git a/components/mqtt/CMakeLists.txt b/components/mqtt/CMakeLists.txt
index f53b44ad..659b15b1 100644
--- a/components/mqtt/CMakeLists.txt
+++ b/components/mqtt/CMakeLists.txt
@@ -1,5 +1,12 @@
-set(COMPONENT_SRCDIRS source/library source/platform)
-set(COMPONENT_ADD_INCLUDEDIRS include include/mqtt)
+set(COMPONENT_ADD_INCLUDEDIRS
+    paho/MQTTClient-C/src
+    paho/MQTTClient-C/src/FreeRTOS
+    paho/MQTTPacket/src)
+
+set(COMPONENT_SRCDIRS
+    paho/MQTTClient-C/src
+    paho/MQTTClient-C/src/FreeRTOS
+    paho/MQTTPacket/src)
 
 set(COMPONENT_REQUIRES freertos lwip ssl)
 
diff --git a/components/mqtt/component.mk b/components/mqtt/component.mk
index 0777d0ba..7b0104a3 100644
--- a/components/mqtt/component.mk
+++ b/components/mqtt/component.mk
@@ -1,8 +1,12 @@
 #
 # Component Makefile
 #
-COMPONENT_ADD_INCLUDEDIRS += include/mqtt
+COMPONENT_ADD_INCLUDEDIRS += paho/MQTTClient-C/src \
+                             paho/MQTTClient-C/src/FreeRTOS \
+                             paho/MQTTPacket/src
 
-COMPONENT_SRCDIRS += source/library source/platform
+COMPONENT_SRCDIRS += paho/MQTTClient-C/src \
+                     paho/MQTTClient-C/src/FreeRTOS \
+                     paho/MQTTPacket/src
 
 CFLAGS += -DMQTT_TASK
diff --git a/components/mqtt/source/platform/MQTTFreeRTOS.c b/components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c
old mode 100644
new mode 100755
similarity index 100%
rename from components/mqtt/source/platform/MQTTFreeRTOS.c
rename to components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c
diff --git a/components/mqtt/include/mqtt/MQTTFreeRTOS.h b/components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.h
old mode 100644
new mode 100755
similarity index 100%
rename from components/mqtt/include/mqtt/MQTTFreeRTOS.h
rename to components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.h
diff --git a/components/mqtt/source/library/MQTTClient.c b/components/mqtt/paho/MQTTClient-C/src/MQTTClient.c
old mode 100644
new mode 100755
similarity index 100%
rename from components/mqtt/source/library/MQTTClient.c
rename to components/mqtt/paho/MQTTClient-C/src/MQTTClient.c
diff --git a/components/mqtt/include/mqtt/MQTTClient.h b/components/mqtt/paho/MQTTClient-C/src/MQTTClient.h
old mode 100644
new mode 100755
similarity index 100%
rename from components/mqtt/include/mqtt/MQTTClient.h
rename to components/mqtt/paho/MQTTClient-C/src/MQTTClient.h
diff --git a/components/mqtt/include/mqtt/MQTTConnect.h b/components/mqtt/paho/MQTTPacket/src/MQTTConnect.h
similarity index 100%
rename from components/mqtt/include/mqtt/MQTTConnect.h
rename to components/mqtt/paho/MQTTPacket/src/MQTTConnect.h
diff --git a/components/mqtt/source/library/MQTTConnectClient.c b/components/mqtt/paho/MQTTPacket/src/MQTTConnectClient.c
similarity index 100%
rename from components/mqtt/source/library/MQTTConnectClient.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTConnectClient.c
diff --git a/components/mqtt/source/library/MQTTConnectServer.c b/components/mqtt/paho/MQTTPacket/src/MQTTConnectServer.c
similarity index 100%
rename from components/mqtt/source/library/MQTTConnectServer.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTConnectServer.c
diff --git a/components/mqtt/source/library/MQTTDeserializePublish.c b/components/mqtt/paho/MQTTPacket/src/MQTTDeserializePublish.c
similarity index 100%
rename from components/mqtt/source/library/MQTTDeserializePublish.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTDeserializePublish.c
diff --git a/components/mqtt/source/library/MQTTFormat.c b/components/mqtt/paho/MQTTPacket/src/MQTTFormat.c
similarity index 100%
rename from components/mqtt/source/library/MQTTFormat.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTFormat.c
diff --git a/components/mqtt/include/mqtt/MQTTFormat.h b/components/mqtt/paho/MQTTPacket/src/MQTTFormat.h
similarity index 100%
rename from components/mqtt/include/mqtt/MQTTFormat.h
rename to components/mqtt/paho/MQTTPacket/src/MQTTFormat.h
diff --git a/components/mqtt/source/library/MQTTPacket.c b/components/mqtt/paho/MQTTPacket/src/MQTTPacket.c
similarity index 100%
rename from components/mqtt/source/library/MQTTPacket.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTPacket.c
diff --git a/components/mqtt/include/mqtt/MQTTPacket.h b/components/mqtt/paho/MQTTPacket/src/MQTTPacket.h
similarity index 100%
rename from components/mqtt/include/mqtt/MQTTPacket.h
rename to components/mqtt/paho/MQTTPacket/src/MQTTPacket.h
diff --git a/components/mqtt/include/mqtt/MQTTPublish.h b/components/mqtt/paho/MQTTPacket/src/MQTTPublish.h
similarity index 100%
rename from components/mqtt/include/mqtt/MQTTPublish.h
rename to components/mqtt/paho/MQTTPacket/src/MQTTPublish.h
diff --git a/components/mqtt/source/library/MQTTSerializePublish.c b/components/mqtt/paho/MQTTPacket/src/MQTTSerializePublish.c
similarity index 100%
rename from components/mqtt/source/library/MQTTSerializePublish.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTSerializePublish.c
diff --git a/components/mqtt/include/mqtt/MQTTSubscribe.h b/components/mqtt/paho/MQTTPacket/src/MQTTSubscribe.h
similarity index 100%
rename from components/mqtt/include/mqtt/MQTTSubscribe.h
rename to components/mqtt/paho/MQTTPacket/src/MQTTSubscribe.h
diff --git a/components/mqtt/source/library/MQTTSubscribeClient.c b/components/mqtt/paho/MQTTPacket/src/MQTTSubscribeClient.c
similarity index 100%
rename from components/mqtt/source/library/MQTTSubscribeClient.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTSubscribeClient.c
diff --git a/components/mqtt/source/library/MQTTSubscribeServer.c b/components/mqtt/paho/MQTTPacket/src/MQTTSubscribeServer.c
similarity index 100%
rename from components/mqtt/source/library/MQTTSubscribeServer.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTSubscribeServer.c
diff --git a/components/mqtt/include/mqtt/MQTTUnsubscribe.h b/components/mqtt/paho/MQTTPacket/src/MQTTUnsubscribe.h
similarity index 100%
rename from components/mqtt/include/mqtt/MQTTUnsubscribe.h
rename to components/mqtt/paho/MQTTPacket/src/MQTTUnsubscribe.h
diff --git a/components/mqtt/source/library/MQTTUnsubscribeClient.c b/components/mqtt/paho/MQTTPacket/src/MQTTUnsubscribeClient.c
similarity index 100%
rename from components/mqtt/source/library/MQTTUnsubscribeClient.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTUnsubscribeClient.c
diff --git a/components/mqtt/source/library/MQTTUnsubscribeServer.c b/components/mqtt/paho/MQTTPacket/src/MQTTUnsubscribeServer.c
similarity index 100%
rename from components/mqtt/source/library/MQTTUnsubscribeServer.c
rename to components/mqtt/paho/MQTTPacket/src/MQTTUnsubscribeServer.c
diff --git a/components/mqtt/include/mqtt/StackTrace.h b/components/mqtt/paho/MQTTPacket/src/StackTrace.h
similarity index 100%
rename from components/mqtt/include/mqtt/StackTrace.h
rename to components/mqtt/paho/MQTTPacket/src/StackTrace.h
diff --git a/examples/protocols/mqtt/main/MQTTEcho.c b/examples/protocols/mqtt/main/MQTTEcho.c
index 53252078..7754d653 100644
--- a/examples/protocols/mqtt/main/MQTTEcho.c
+++ b/examples/protocols/mqtt/main/MQTTEcho.c
@@ -19,7 +19,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
-#include "mqtt/MQTTClient.h"
+#include "MQTTClient.h"
 
 #include "user_config.h"