Using distutils for packaging.
Moved module in __init__.py