Shuffle recursive folder in the files section

The shuffle function does currently not shuffle recursive folder which is unfortunate since most video collections (at least mine) is set up with a folder system. I am not asking about shuffling parsed movies or tv shows (since i know that you can at least shuffle tv shows). It would be great if it was possible to shuffle the contents of a folder INCLUDING the subfolders. Maybe if the shuffle had two modes: with or without subfolders?

Would be great if that was possible