Refactored UML code in its own module