moved users auth info out of user model and into json schemas, updated services model and included that for user model