Combined to one class

renamed to a more suitable title