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

Changed setup.py to reflect new directory organization.