Improve source file organization