Refactoring of implementation classes and interfaces.