Reorganize, refactor for Configure/ConfigureServices, etc.