Re-structuring the source files to be more organized