Moved the rest of the error classes

All of the rest of the error classes used in exceptions have been moved
into the class that they are paired with.