Look to config for require (and some reorg)