Add more options to "subfolder names as"

In the preferences, under Download, right at the bottom where you have 2 checkboxes that say "place in subfolder named as playlist title" - can we please have another option that says "place in subfolder named as video author or channel owner or channel name?

In my main download folder, I want to be able to create subfolders of the channel name or owner first, then inside that, subfolders of the playlists, then inside those will come the videos.

Also, when downloading an entire channel, if there are videos in the channel that are not part of any playlist, then create a special folder for those and call the folder "General Videos" or something better.

Thanks and keep up the great work!
Ketan