Refactoring further; screens are packaged.