Until we have discussed this in person - with the entire team and hopefully daniel as well - I'd stay with the way every C++ Project I have so far worked on does it: members are instances.