Reordering the directory structure