New structure of classes.
A single include works better.