Structure up, ajout notoin HashMap
Merge branch 'structure' into develop