sample lib arrangemet

[symplectiq]

today i was searching for particular sound and it took 1 hour to find it so i decided to clean up my libraries and was wondering how to arrange samples properly... not the way that every single sample would be in it's own folder and not the way that 1 folder is enough (which i sort of having now)... obvious things like: folder (drums) contains folders (kick) (snare) etc
are sorted but when it comes to sounds like xylofon balafon wood brick conga bongo etc and some of them are good quality sounds but u can hardly hear the difference which is which.. and this is everywhere not only in percussion section... suggestions based on experience?

[Spe3D]

and this for the ones that are good and you keep

http://www.geocities.com/samplecatalog/

order them in a way that makes sense to you - as you are the one who needs to find the samples you kept