Move stuff around in setup.py