Moving the combine script again, also updating the setup.py