updated setup.py to new module structure