Update to support the current repository structure.

Reviewer: trivial