Structure change

Updated UML