Move a few more routes to models