Rearranged stuff to make the config flow less confusing
Rearranged stuff to make the config flow less confusing

janj-su/sukat-cxf-svc,stockholmuniversity/sukat-cxf-svc,stockholmuniversity/sukat-cxf-svc,janj-su/sukat-cxf-svc