Improved Routing

Routes now use express 4.x style routers