Why has everyone forgotten about Picasa? I've been using it for over 10 years and still using it, tho Google in it's stupidity is not supporting it any more. It is free and works for both PC and MAC. I'm pretty sure it is still available, tho I could be proven wrong. It is still the best IMHO for both storing photos, making albums and simple editing with some neat filters which I use all the time. The only problem is that one has to be careful to make sure it doesn't download all your photos and take over your hard drive. Make sure you only download those files you want and you have to choose which files you want Picasa to list. I must admit that I only use JPEGS, tho in the past I shot both JPGS + Raw. But left the Raws on my external drive and downloaded only the JPGs into Picasa.
I download my photo files (JPEGs + Raw) from my SD card onto my hard drive, usually an external drive, and then import the files I want into Picasa, usually just JPEGs. Then I make albums with the categories I choose, but make sure that these albums and any editing are saved into my external hard drive. Occasionally I use Lightroom, tho usually just for editing B&W, and import the Raws and process them into B&W using my NIK filters.