created users and usertypes

also cleaned up some models