Separate Router and http-handler