Finished config infrastructure and some structural changes