re-structure the folder