Well, for vanilla you should have the BSAs. What I do is I archive my non-optimized BSAs in a 7z archive called Vanilla BSAs and my optimized ones in one called Optimized. The BSAs should be the same name, though, for the vanilla resources. And, yes, they should be BSAs if I recall correctly.
Edit:
I hope that makes sense. I just realized it may not make too much sense to by roundabout way of saying things at times.
Better wording:
Optimize
Archive original BSAs
Take files and repack into BSAs with same name as original
Archive optimized
Use new ones
And, as I recall, this needs to be done for the vanilla ones. However, I could very well be wrong. Probably best to be on the safe side, though, and make sure it is done for the vanilla stuff.