Cleaned imports
Changed setup.py to use find_packages()