Betty-I pretty much have mine organized the way you do. Everything under 2 yards is folded and stacked on my shelves and separated by color. I also have stacks of theme fabrics--Christmas, I spy, Fall and Halloween, chicken, 30s repros, etc. Anything over 2 yards I have on a bolt. That way I know I have enough for borders or backs. My stash is not nearly as large as a lot of these ladies and this method works for me.