Bust out classes into own files to fix McV build on CentOS [0]
Lose a couple unneeded method calls [0]