Improving source file organization"