Code reorganisation (multiple files for Caillou).