misc reorg on router
typo / copy-paste fixes
misc renaming