Fix import statements in __init__.py files

Fix import statements in __init__.py files #49