More modular, with broken out controllers, routes and tests.