reorganised and cleaned up
convenient imports in __init__.py