Mine was a 60 gig mess. Took me about 2 days to sort it out too. I wish I did this from the start tho, Having every kick drum sample in a kick drum folder sounds like common sense, bits soo dam easy to drag and drop a drum kit folder full of all kindsa of samples and not realy have a sound where you exepect it to be.
If I was you i would stop everything and take some time out to do just that.
Put everything where you expect it to be when you come back. Then when you on with a project and you think this needs a ...
hey presto you know where to look and your working faster.