minor changes to directory structure