re-arrange the folder structure