Source file restructuring