Reworked setup.py to make stuff work again