Added setup.py and moved import paths around
Remove some traces of old/broken expects