minor tweaks
reorg and lot less moving on the python side