update user service dans organization service to match with controller
update nearly all controller to work with new service