* Fix Pypi setup.py
* Rework code organization