Moving __init__.py to the right place