small refactor: removed everything from __init__.py. demo.py more friendly too