setup.py fixes; reorg
.