Reorganisation.

Reorganised classes.