I dream of being that organized! I think you are a genium for idea of bundling the pieces you want to use together.
I get myself into trouble by repurposing something I bought with a "set" and then not having what I need when it comes time to use the set. Love your labeling system.