reorganising the folder structure