I just sort them into folders either arranged by date if the photos for the day are taken in a hap hazard manner or by event/client/location name +date if its all in one place. Within each folder I have a RAW folder for the unprocessed pics and the rest of the psd/jpgs go into the main one. Naming wise i either stick with the default name for events (sequence is important) or I use names of the subjects.