Rearranged UML package