Move some things, update setup.py