RIPD-672:  Eliminate CKey

I suggest checking out the branch so you can see the structure of the individual component branches.