Rework source file structure.