Moved CPP folder + files into the main bundle.
Removed spurious RECORD/END

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>