Cosmet

Signed-off-by: Stéphane Depierrepont <toorop@toorop.fr>
Reorg

Signed-off-by: Stéphane Depierrepont <toorop@toorop.fr>