Refactoring of screen adapters is finished