Broke out core classes per StyleCop