Move to 'diagnosticss' organization