Started cleanup for moving all sub mods to separate binaries.