Peter,
I'd definitely go with Vadim's proposal, for simplicity's sake.
I'd definitely like a clear hierarchy of objects, although I'm having problems visualizing how this'd work in practice in the interface. Can you give an example of what you're thinking here?