Made setup.py work.  Added package to setup.py, and re-organized into actual package.