Moved class to __init__.py