get curr org refactoring