A few more re-structuring in the estimate-sat3d program.