Classes interaction refactoring