Refactor

-- Put route map in router module and expose a method to add
   a handler to the route map
-- General code cleanup