Suggestions for organizing Movies?

Newbie here. My collection of Movies currently is by folder named for the movie, with the contents of the folder inclusive of the main video for the movies, but including alternate scenes, interviews, trailers, cover art, etc.

I've come to the conclusion that I need to abandon this folder approach and do something different so that Channels can present the movies for browsing (with thumbnails) featuring only the main titles, and the extra content per movie not showing at all, or only show when I choose to see all content.

Here are a couple ideas I've thought of ..

  1. Have branch of my Movies folder containing only the main title and have a separate shadow directory of just the extras. Import only the main titles folder.

  2. Leave the folders as they are but mark all the main titles as Favorite. Then use a Favorite filter most of the time, but clear that filter if I do want to see everything.

Other ideas? Something maybe to do with metadata to facilitate displaying only the main titles? What has worked well for you?