140521 Minor fixes to directory structure