Changed setup.py to reflect new directory organization.
Merge pull request #16 from jmwooten/setup_fix

Changed setup.py to reflect new directory organization.
bump version to fix broken pip package
Merge commit 'e5b72a8da00f0edcf8b18970441d0ef6201b161a'