Move manual relays to RelayConfig