Further splitting of the previous screens package