Remove classes. Rename classes. Rework methods. Add documentation