Moving Components of the Interface to the Class