Réorg

Signed-off-by: Méril <meril.pilon@gmail.com>