Improving setup.py and manifest