refactor iotmain
Merge branch 'master' of https://github.com/ibm-messaging/iot-raspberrypi