Move setup.py
More setup.py edits