Structure change for MQTT project