I would recommend lightroom as well. You could import each group as a separate collection to maintain your grouping, and use tags to further organize your photos. It also contains a pretty powerful photo correction/editing system and can export your photos to many different formats. The down side is it is fairly expensive.
|