Restructure into package

This should install with:

setup.py develop

or 

setup.py install