I always keep any parts from upgrades and any spare parts (recoil springs, etc) in labeled baggies. Makes it easy to identify when selling, maintaining, and fixing a gun.
That's about it for me to.
My SHTF strategy is for spare guns, not spare parts.