Rearchitect module and config loading. Comment all the places.