Updated setup.py to include nested packages