Reorganising folder structure.