That folderising script is finally pretty much usable.

And I did indeed just use it. >1600 files moved into 779 folders, all as properly named as the source data allowed.

Immense satisfaction.