Adding refactored Classes of the gui