File and folder restructure.