Fixed location of using statement.
Deleted unused files and added source for MEF diagnostics instead of depending on a deprecated external binary.