AUI-1585 Source refactoring