moved things back in place.
Fixed package dir in setup.py