change back folder structure, again