Read Naming video files for more information.
When I started to set up my media library for the Popcorn Hour A-400, I decided to create folders with the main actor, and put all related movies there. I also ignored to add the year to each movie title. This is a bad idea, as all scrapers struggle with automatic movie identification. See the previous paragraph how it's done properly.
The conversion is rather time consuming, but I generated a few shell scripts to make the task easier. Most scripts run under “sh” shell which is available on every Linux system and on Synology's DSM, a few only run under “bash” shell which is not available for DSM.
find -name '*.mkv' -exec echo "mv " \"{}\" \"{}\" \;