some adjustments, added new __init__.py files