Merge pull request #1 from kordero/19490

19490: code cleanup
Worklist Revamp - 2nd stage - first cut: code cleaning / moving to MVC