Moved around some classes and fixed lots of stylecop issues