I have a few bundles but started putting my fabrics on "boards" (foam-core) and sorting them strictly by color. If I need a color, it is easy to find. Also have a couple of clear totes for "squares". I stack them up in the totes; like a yellow/orange stack, a brown/beige stack, a green stack, a blue stack, a red stack, etc. Then I have just a big bag of scraps of no particular size or shape. Seems to work the best for me to sort by color...