cleanup/reorganization of stepwise code to prepare for rosetta dev meeting. merge from branch rhiju/swm_cleanup. integration tests checked -- all changes cosmetic or recurrent floating point deviations on my mac (e.g. in match).

• Summary