I don’t know if this will help, but I’ve been using Plex to manage my music and other audio for more than a decade. It pulls in metadata from online sources and allows me to search or apply filters. That is a lot more versatile than anything I could do directly with the files.

If you aren’t interested in running your own server, look at some of the more sophisticated player apps. Many of them can provide similar metadata features. Then you wouldn’t have to worry about how the files are physically organized.