added/renamed classes