D3, Shruthi | #1604 | Moved patient-search extensions to ADT and clinical respectively