cleanup
renamed some classes