Further refinement of directory structure