Change organisation of parts, and a lot of changes

Signed-off-by: Axel Davy <axel.davy@ens.fr>