new setup.py to go with re-organized file layout