diff --git a/include/mqtt/MQTTClient.h b/components/mqtt/include/mqtt/MQTTClient.h
similarity index 100%
rename from include/mqtt/MQTTClient.h
rename to components/mqtt/include/mqtt/MQTTClient.h
diff --git a/include/mqtt/MQTTConnect.h b/components/mqtt/include/mqtt/MQTTConnect.h
similarity index 100%
rename from include/mqtt/MQTTConnect.h
rename to components/mqtt/include/mqtt/MQTTConnect.h
diff --git a/include/mqtt/MQTTFormat.h b/components/mqtt/include/mqtt/MQTTFormat.h
similarity index 100%
rename from include/mqtt/MQTTFormat.h
rename to components/mqtt/include/mqtt/MQTTFormat.h
diff --git a/include/mqtt/MQTTFreeRTOS.h b/components/mqtt/include/mqtt/MQTTFreeRTOS.h
similarity index 100%
rename from include/mqtt/MQTTFreeRTOS.h
rename to components/mqtt/include/mqtt/MQTTFreeRTOS.h
diff --git a/include/mqtt/MQTTPacket.h b/components/mqtt/include/mqtt/MQTTPacket.h
similarity index 100%
rename from include/mqtt/MQTTPacket.h
rename to components/mqtt/include/mqtt/MQTTPacket.h
diff --git a/include/mqtt/MQTTPublish.h b/components/mqtt/include/mqtt/MQTTPublish.h
similarity index 100%
rename from include/mqtt/MQTTPublish.h
rename to components/mqtt/include/mqtt/MQTTPublish.h
diff --git a/include/mqtt/MQTTSubscribe.h b/components/mqtt/include/mqtt/MQTTSubscribe.h
similarity index 100%
rename from include/mqtt/MQTTSubscribe.h
rename to components/mqtt/include/mqtt/MQTTSubscribe.h
diff --git a/include/mqtt/MQTTUnsubscribe.h b/components/mqtt/include/mqtt/MQTTUnsubscribe.h
similarity index 100%
rename from include/mqtt/MQTTUnsubscribe.h
rename to components/mqtt/include/mqtt/MQTTUnsubscribe.h
diff --git a/include/mqtt/StackTrace.h b/components/mqtt/include/mqtt/StackTrace.h
similarity index 100%
rename from include/mqtt/StackTrace.h
rename to components/mqtt/include/mqtt/StackTrace.h
diff --git a/third_party/mqtt/Makefile b/components/mqtt/source/Makefile
similarity index 100%
rename from third_party/mqtt/Makefile
rename to components/mqtt/source/Makefile
diff --git a/third_party/mqtt/library/MQTTClient.c b/components/mqtt/source/library/MQTTClient.c
similarity index 100%
rename from third_party/mqtt/library/MQTTClient.c
rename to components/mqtt/source/library/MQTTClient.c
diff --git a/third_party/mqtt/library/MQTTConnectClient.c b/components/mqtt/source/library/MQTTConnectClient.c
similarity index 100%
rename from third_party/mqtt/library/MQTTConnectClient.c
rename to components/mqtt/source/library/MQTTConnectClient.c
diff --git a/third_party/mqtt/library/MQTTConnectServer.c b/components/mqtt/source/library/MQTTConnectServer.c
similarity index 100%
rename from third_party/mqtt/library/MQTTConnectServer.c
rename to components/mqtt/source/library/MQTTConnectServer.c
diff --git a/third_party/mqtt/library/MQTTDeserializePublish.c b/components/mqtt/source/library/MQTTDeserializePublish.c
similarity index 100%
rename from third_party/mqtt/library/MQTTDeserializePublish.c
rename to components/mqtt/source/library/MQTTDeserializePublish.c
diff --git a/third_party/mqtt/library/MQTTFormat.c b/components/mqtt/source/library/MQTTFormat.c
similarity index 100%
rename from third_party/mqtt/library/MQTTFormat.c
rename to components/mqtt/source/library/MQTTFormat.c
diff --git a/third_party/mqtt/library/MQTTPacket.c b/components/mqtt/source/library/MQTTPacket.c
similarity index 100%
rename from third_party/mqtt/library/MQTTPacket.c
rename to components/mqtt/source/library/MQTTPacket.c
diff --git a/third_party/mqtt/library/MQTTSerializePublish.c b/components/mqtt/source/library/MQTTSerializePublish.c
similarity index 100%
rename from third_party/mqtt/library/MQTTSerializePublish.c
rename to components/mqtt/source/library/MQTTSerializePublish.c
diff --git a/third_party/mqtt/library/MQTTSubscribeClient.c b/components/mqtt/source/library/MQTTSubscribeClient.c
similarity index 100%
rename from third_party/mqtt/library/MQTTSubscribeClient.c
rename to components/mqtt/source/library/MQTTSubscribeClient.c
diff --git a/third_party/mqtt/library/MQTTSubscribeServer.c b/components/mqtt/source/library/MQTTSubscribeServer.c
similarity index 100%
rename from third_party/mqtt/library/MQTTSubscribeServer.c
rename to components/mqtt/source/library/MQTTSubscribeServer.c
diff --git a/third_party/mqtt/library/MQTTUnsubscribeClient.c b/components/mqtt/source/library/MQTTUnsubscribeClient.c
similarity index 100%
rename from third_party/mqtt/library/MQTTUnsubscribeClient.c
rename to components/mqtt/source/library/MQTTUnsubscribeClient.c
diff --git a/third_party/mqtt/library/MQTTUnsubscribeServer.c b/components/mqtt/source/library/MQTTUnsubscribeServer.c
similarity index 100%
rename from third_party/mqtt/library/MQTTUnsubscribeServer.c
rename to components/mqtt/source/library/MQTTUnsubscribeServer.c
diff --git a/third_party/mqtt/library/Makefile b/components/mqtt/source/library/Makefile
similarity index 100%
rename from third_party/mqtt/library/Makefile
rename to components/mqtt/source/library/Makefile
diff --git a/third_party/mqtt/platform/MQTTFreeRTOS.c b/components/mqtt/source/platform/MQTTFreeRTOS.c
similarity index 100%
rename from third_party/mqtt/platform/MQTTFreeRTOS.c
rename to components/mqtt/source/platform/MQTTFreeRTOS.c
diff --git a/third_party/mqtt/platform/Makefile b/components/mqtt/source/platform/Makefile
similarity index 100%
rename from third_party/mqtt/platform/Makefile
rename to components/mqtt/source/platform/Makefile