Change; fix; feature

* Remove some classes
* Rename some classes
* Add new classes