Reordering of directory structure