major folder restructuring