Fix merge issues. Complete organization CRUD methods