Sampling Workflow & Organising

This is mainly for the folks who still use floppies. I'm an MPC 60 user and I was wondering if people could chime in on how they generally deal with the whole floppy situation in terms of being organised and getting a good flow going. What I mean by this is, do you generally save a kit of different sounds and name it "808 Bass Drum Kit" "Latin Percussion Kit" or do you simply just have a floppy of all kinds of different samples, with hats, claps, snares, kicks and name it Jazz Kit/Funk Kit.

In my situation I have floppies that are just full of 808 bass drums, or a floppy full of different live snare sounds. The trouble I have is the speed of the work flow, I'll normally load up an entire kit of bass drums, then delete the ones I dont like, then load another disk with some snares but this becomes problematic when you start to have drums loaded to your pads and you end up having to go through loading the files individually from the disk, this is a pain because you can't preview the drums before loading! I also need to get in a habit of naming my files.

I've thought about trying to figure if theres a way I could implement Bank 2 as some kind of loading area, but I'm still scratching my head at it, has anyone tried this? I really need to work out a way of getting some organisation in my studio so I can get some ideas down. By all means non 60/3000 give us your input. I think listening to everyonesl workflow/organising/tidying skills would be helpful I know this has perhaps being discussed many a times at some point but thought i'd bring up fresh.

I have an MPC 2000 and I save all my single drums hits on floppies. What I do is sample the hits and name it after the artist I sampled, for example Snare-Meters.
It works well for me because I don't have many drums sampled(I got 7 floppies of drums for the moment) and I remember quite easily how the drums I sampled sound, but I guess if you have a lot of floppies, it's not a good method.