setup.py update
moving code around