You agreed this was a good idea, and we thought a mapping table would be a good solution to it.
This is pretty strait-forward to do. Is anybody using organizations? Do you want me to provide upgrade scripts? I don't know think anyone else is using it, and it's easier not to provide the scripts if so... Please let me know if you are using it, by posting here.