Code reorganisation
Missing header