Reorganization of gui classes complete