Added factory for users
updated organization and user