Ui class, reorganization