reorganization (tests directory and __init__.py)