For a long long time I did not any space for fabric, but that has changed so I have lots of space now.
I would suggest to empty your tubs, sort your fabric by color. Fold evenly,set your tub on end and pack your neatly folded fabric in each tub. I think you will amazed what you can get into one tub. And, use one tub for misc. Good luck! :