CIS pillars specific to Ubuntu.

It looks like the CIS pillars included in the Linux metadata are specific to Ubuntu and very from Redhat el7. I'd like to add the Redhat specific CIS pillars, but was wondering what is the best way to structure the metadata. 

For example should a folder exist for each os family and version? Should the existing pillars be moved to the Ubuntu folder?

Thanks