Reorganize uml