Some simpleification and a package rename.
Removed unused argument from the http handler.