Changed structure of the NomNomSource to match the deployment system.