Server/Provisioning refactor