Refactored Facilitators API + small fixes to Organizations API