Massive folder restructuring