IDE-1554 source refactoring