When using hosted chef with multiple organizations (where organization is the right way to differentiate projects as opposed to setting environments) what is the best approach for managing the client configuration files?

I have separate organizations, each with their own validation key, and generated knife.rb configuration. On my workstations I have separate chef repos and chef client configuration directories for each organization.

But, how do I best manage /etc/chef/*?

I was thinking that I could create separate /etc/chef_ORGANIZATION directories to hold the appropriate configuration and validations, then just symlink /etc/chef to the org I’m working with.

Anyone have other suggestions on how to work with multiple orgs?