Reorganization of code.  More additions to simulation/evaluation.