Move message classes into their own package and fix imports