Restructuring files in source folder