Refactor routes

Move routes into their own files, plus a little additional clean-up.