More setup.py rework