Updated structure

Signed-off-by: JM Barbier <jm.barbier@solidev.net>