Change routing screen models to match api 

The models should match what we planned out in #334