Star Trek: TNG Extras

[RSF04]

I finally bought the Star Trek: The Next Generation Blu-Ray set. I don't usually get into extra/bonus features because I don't usually watch them and consequently, I usually see it as a massive waste of time. But it's different with Star Trek.

More to the point, I noticed that there are 30-second episode promos which would have aired shortly before their respective episodes. I kinda want to keep them. Should I just toss them in the Extras folder or can I name them so they'll be picked up for what they are or something like that?

I also noticed that for at least one episode, there's are a couple of alternative versions. Both are extended, but one was extended with footage from tape are is consequently called the "Extended Hybrid" version.How should I name and file it (main season folder or extras folder)?

[TheDreadPirate]

In version 10.9 it will support "versions" of an episode like 10.8 currently does for movies. IMO, that would be the ideal scenario for these different extended versions. For now, I keep non-standard episodes like this in a "Specials" folder. You could also just give them similar file names. There will be duplicate listings and you can distinguish them by their run time or something. This is very much a "up to you" kind of thing.