Reorginize the folder structure.