Restructuring of source-files