Changed setup.py to reflect new directory organization.