Diagnostics needs to use new directory pattern.