move things around and change setup.py
change setup.py more