Change; remove; feature

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