v1.11 Minor changes to directory structure.