Revise setup.py to include correct components in the package