Fix a regression after serveral changes to directory structures.
Merge pull request #1274 from jmaas/master

Fix a regression after serveral changes to directory structures.