Code re-org for diag module
Diag module review changes.
Merge pull request #171 from vdatla/master

diag module changes