Re-factor

StyleCOP, Re-Factored various interfaces and classes.