Revert "MQTTRF X10 Refactoring"

This reverts commit 98d73702d6132b1107befbebcb85e306f639deac.