Add proper structure
Tdpohp UML done