Sample File Organization

So I've got around 60 gigs of drum samples now (got hooked up over the weekend), and I'm having trouble figuring out how to manage all these drum files. I name them and organize them in a way I can remember...so I don't want them just numbered , etc. Any ideas? How do most of you go about doing it?

Also, do you guys organize your folder buy kits? I used to, but I'm starting to have folders such as Street Snares, Funky Kicks, etc. where i organize buy sound.

I used to do it like that but it became a headache when I started fishing for certain sounds.......now I just make kits and name them so I can remember them easily