How do you store cut yardage vs uncut fabric? My system is completely falling apart.

I used to fold everything onto comic book boards which worked great until I had more fabric than boards. Now I have a pile. Does anyone have a system that actually scales as the stash grows? Im particularly struggling with cut remnants and partial yards that are too good to throw away.