Reorganising the folder structure.