Refactored / renamed some classes [skip ci]