Be self-consistent on repository layout.
Update __init__.py files.