can't import books since Kindle update 1.19.2 with folders

I'm having trouble importing my Kindle books into Calibre since Kindle did an update.

Yesterday, my Kindle PC app apparently updated itself to version 1.19.2. Since then, all books I download via the Kindle PC app go into folders instead of having just a single AZW file. There is one folder per downloaded book. Each folder contains the AZW file along with AZW.RES, AZW.MD, VOUCHER, and MPBV2 files and a TMP folder.

Any idea how to get the actual book into Calibre? Trying to import either just the AZW file or the entire directory results in an unknown book in Calibre.

For now, I've reverted back to an earlier version of Kindle PC, but at some point, that will no longer be an option.

Thanks.