Merge pull request #18442 from MHBauer/move-configs

move configs structs to remove dependency on deamon