Changing source folder structure - preparing for refactoring.