Move some stuff around for Newrelic->NewRelic