Move more perfdata-related functionality into relevant package