More consistent use of import
Set version in __init__.py