I would do as Andy says and start over and reorganize how you like. If you make a plan of orgainization and stick with it you shouldn't have any problems. For instance I separate runtime by figure. Just makes it easier for me to find stuff ;). But you can also do it by vendor, store, etc.

Laurie