Fabrics on shelves, but I also have quite a bit in plastic bins. I use the Bonnie Hunter method for scraps and right now those are also on shelves, but I will be using those clear plastic bins that fit under beds soon (about 6 inches high and long and flat), and those scraps will be tucked in there in the different sizes. Those I'll keep under my table I sew on, so its close by to use to piece quilt tops. Congratulations on your move to a place where you have your own sewing room again!