Complete folder restructuring