Use new module layout.
Merge branch 'merge-repositories'