refactoring, simplified builder, fieldmap
moving base fix data types out of message package