Rename Report classes - prepare to move each class to its own file