Restructuring of Source Files