Metadata issues: how to I correctly store information offline?

I have issues with metadata fetching. There are movies (with clearly the right filename and year) that are not found and in the shows section it is a bigger mess. So I want to store my information locally (so I don’t have to edit the information on Apple TV, iPad and iPhone). But I cannot find how.

Movies
My movies are stored like this:
/Movies/Movie.title.(year).something.ext

Do I add local information (exported from Kodi) like this?
/Movies/Movie.title.(year).something.nfo
/Movies/Movie.title.(year).something.jpg
/Movies/Movie.title.(year).something-fanart.jpg

Shows
My series are stored like this:
/Shows/Show Name/Season XX/Show.name.sXXeXX.something.ext

Do I add local information (exported from Kodi) like this?
/Shows/Show Name/tvshow.nfo
/Shows/Show Name/folder.jpg
/Shows/Show Name/folder-fanart.jpg
/Shows/Show Name/Season XX/folder.jpg
/Shows/Show Name/Season XX/Show.name.sXXeXX.something.nfo

And is that enough, or do I need to erase previous metadata and let Infuse scan everything again?