move stuff and fix setup.py