File and folder restructuring