updated setup.py to new module structure
Merge branch 'move_tair' into move_tair_nettests