Cleaned up install file import path
Fixed up setup.py in prep for pypi