Sorting out directory structure as per #7.