some reorganization of setup.py