rearrage the directory structure