restructure modeling with uml