Task #360389
Rewrite modelmaper to guava and manual
Change strucutre packeges
Change entity name