Pypi-ification w/change of dir-strcture, setup.py less confusing like this