Broken out classes

All 4 classes, broken out ready to be written.
Fixed class names

I forgot to change the class names in the declarations when I
copied/pasted.