Folder restructure.