Some updates.
Moved old spc/confusibles to cf/...