refactored some non service model to a new dir

in preparation to maybe move to gevent
include the model file
refactored the properites names of upbmessage
fixed tests to reflect new code