Revert "Revert "separation code/rapport""

This reverts commit dd9b2a3a7b74d55b8268c382cf0b803e7406ce08.