rename last reference to Metrixd to Metrix
start moving collector handling to Metrix