rearranged some files
Converted CColorData.
incorporating Alyosha’s changes.
Merge remote-tracking branch 'veris/master'
incorporating Alyosha’s changes