Make Collections folderish.

This includes an upgrade step.

There is more work to be done if we want this.  See the notes in the upgrade step.