I bought a pile of funky blue-stripey boxes from Freedom, and they are in there. One box for nights, one for AIOs/Pockets etc and one for fitteds + covers. I tend to put the fitted in covers when I fold them .. I also bought a matching shelving thingy which I keep my terry flats & swims in, and on top there is a 3-section thingy which is sorta shaped like oversized magazine holder and I keep wipes & liners in that, and put his pants in while I change him.
Im planning on something like this. I have a boori change table/drawers and it has a large shelf that will fit 3 boxes or baskets. They will need to be sorted so that Im not going insane in the middle of the night, and so that DH will use them.

Theres no way he'll use a OSFM, so might have a stash of "easy" sized nappies for him.