Files restructuring