Extract some more classes and interfaces