Class name changes

Getting the hang of it mayhap
class name changes and reordered

changed class names and alpha ordered declarations