The fabric shops around here have oodles of the empty cardboards the fabrics come on and they just bundle them up and garbage them. If you ask, they will GIVE you all you want just so they can get rid of them the easy way.
When you wrap your fabric on them, label the end of each cardboard with the amount of yardage you have on each of them, shelve them by color and you can tell at first glance what you have. Store other smaller fabs in bins labeled scraps, holiday, solids, prints, etc. I have a shortage of space and find this way works the best for me.
Good Luck! Now you can enjoy more time sewing and less time searching.