Revert "separation code/rapport"

This reverts commit 60ee9fc832829f08f525ac8560063cb196def847.