I am using Apple Photos. It handles all that. I used to use Lightroom and that allowed me to organize photos in any way on file system and I had similar setup.

I am using Apple Photos. It handles all that. I used to use Lightroom and that allowed me to organize photos in any way on file system and I had similar setup. I really want to move to Linux but lack of a few key applications makes it hard for me.