api v2 - initial refactoring fixes
api v2 - org controller