I ruler-fold my fabrics so they are all the same and stack well.. I keep holiday fabrics like Christmas and Easter, fall, Halloween and like that separate. All the others I sort by color. Since I had to completely start over after the tornado, I also measure each piece and staple a tag to the salvage with the important information about that piece on it, usually just the yardage, but also if there is a flaw to consider, more than one piece, that sort of thing. Then I stack it on shelves that are in a closet out of light and dust. I think it will be perfect!
I also ruler-fold fat quarters and half yard pieces and stack them separately, also by color. I don't tag fat quarters or the half yard pieces unless there is something different about that particular piece.