Added controllers for organizer and locations