Cleaning up the way that routes are generated + added to the server app