Added Message/Destination class
Fixed up include paths to be sane