I've heard some discussion around reclassifying certain mental illness into clusters - things like depression and anxiety have extremely high levels of comorbidity.