More classes

Added some more terminology.
Removes/moved

Moved