made tho obvious changes to __init__.py to simplify imports