PLG-65-JO-namespace: put the plugin related code in a namespace + minor corrections.