v18 - Scraping media in different languages and structuring files/folders

Apologies if this has been asked in some sort of form already, but after an absence for a few years since Kodi 14, I recently purchased a new Media PC and NAS where I have set up my TV series and Movie collection from scratch again. Currently, I have just have two folders "media/movies" and "media/tv-shows", however both contain media files from german and english sources.

To be more precise, I have movie folders which have a german title and some which have an english title:

"media/movies/german movie title/german movie file.avi"
"media/movies/english movie title/english movie file.avi"

This is basically the same for the TV shows (around 90% are english TV series, the rest is german).

I want to use the standard TVDB and TheMovieDB scrapers, but I would like to have the english files scraped (and displayed in Kodi) with the english title and - vice versa - the german titles scraped and displayed in german.

What is the best approach to handle that? And if this is a manual process - moving forward when adding new files - would it be better (I think I read this somewhere ...) to have my files sorted differently? Something like this maybe?

"media/movies/ger/german movie title/german movie file.avi"
"media/movies/en/english movie title/english movie file.avi"

Would love to hear how other users have successfully solved this. Many thanks in advance!