Adjust setup.py and top-level __init__.py to reduce conflicts