[PATCH 1/3] In attempting to breakout the content into subdirectories I broke the XCCDF to OVAL mappings, and I can't seem to piece them back together again. Reverting my changes by