Move more routes and general code cleanup