Giant Rubbermaid tubs with lids---and no, I wouldn't change a thing. Having it as organized as some of you (folded neatly on shelves) would probably make me not want to touch it---so I wouldn't mess it up after doing all the work organizing. I like rummaging through tubs!