Moving models out of routes