Restruct part 2

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