Rearranged stuff to make the config flow less confusing