Revert "MQTT_Logic and new structure"

Not on this branch, right now...
This reverts commit d16b3ec03c7c93c9346b142a3635305608e2fa4d.