PIM-3544 : change namespaces, declare and register new services