Congratulations on making calm out of chaos! Been there and I seem to create chaos too. Sorting fabric is hard work. So much to think about. I've sorted two ways. Bookshelf has folded, kinda, by color and containers by size and scrappy. Rolled 2.5 strips into jelly rolls by color and secured them using either pretty scraps of ribbon that came with jelly rolls or rubber bands. They have a container of their own. I decided not to keep anything smaller than 2" (I hear the gasps!...lol) because I don't make crumb quilts so why keep them. I retired a year ago and sometimes I think I'm working harder with my quilting than I did at work...lol. Have fun getting reacquainted with your stash.