Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
it's interesting that you are remapping some tables.  I guess because we don't have good ways to make things optional in KC like KFS has.