big change in setup.py, fix broken pip installation
moving stuff around for ease of running interactive