modify setup.py and package structure