Folderized vanilla CBs

Decided not to preserve the order of vanilla CBs, as it's much more handy to be able to see an alphabetic listing by vanilla CB name, and there is no particular reason to preserve CB definition order (unless one was redefining a CB, I suppose).