Code Re-Org in prep for parameterization