Modularize routes, update tests
modularize server side routes