One container, please. Two container-like things on the sidebar with different powers confuses everyone. One container, with suggestions.

Shelf first, then room. A shelf is exactly what retroactive grouping should be; rooms require intent. Promotion is the v2 bridge; the shelf is its prerequisite.