Enormous cleanup of code base and class names, to prevent code
duplication and such.