Hardening/more cpp xml json to separate file 04

### Description
Last batch of XML/JSON separate files