Refactor routes, naming, clean up requires