I think estranged suggestion for the File->New menu need only be as long as the current File->Stubs menu, i.e. 6 entries, + Empty File and a separator.
Rather than merge the File->Stubs menu with File -> New, how about:
File -> New Empty File
New File from Template -> ... contents of stubs menu ...
A "New File from Template", IMHO, would logically have the property that it has a new name, and be ready to save into the Arduino folder.
This might also reduce a source of frustration for the kids when I work in school.
The Examples are on a read-only network drive, so they kids have to save in their Arduino folder before they can compile. It is okay to explain that the examples are shared. It is even okay that this explanation makes sense while Stubs is in the Examples menu, but it always felt a bit hokey.
IMHO the purpose of the Stubs sketches seemed to be to make a new sketch to start work on. Pulling it out into a different menu, also offers the opportunity to have different semantics: a new sketch, with a new name, ready to save into Arduino folder. This seems 'right'.
I should admit, I don't like the word 'Stubs'. Like many others, I didn't notice it for a while. I suppose, it sounds a bit old techy. My mind skipped over it for weeks, imagining it was a technology category, like EEPROM or Analog, I suppose :-/.
I feel Template has a meaning of 'not the actual thing, but a way to make an actual thing', whereas Stubs doesn't.
HTH
GB-)