Rename a few classes
Rename class
Reorganize