Update directory structure to match current.

Fixes #1693.