added __init__.py and some corrections on import