I’ve been using Immich, but with my photos as external media. That lets me keep my directory structure too, but with the Immich features 🙂