[mosq] include hostname in client id
[layout] shuffle repository layout