Rearrangement of source files