Restructuring files