Move local message code to local package

 + cut some helper dependencies