Reorganizing directory structure as per instructions