Revert "Minor cleanup, condensed some routines, mobed some parameters into modules."

This reverts commit c409a4b82966acd951b0d1609eccc520a1833d7e.