Tidy up namespacing of extensions, merge product and category controllers into catalogue controller and tidy up catalogue admin