Add server primary org and user
Add functions to handle adding and removing server org