File restructure for packaging with setup.py
Merge pull request #1 from moflaher/master

File restructure for packaging with setup.py