Major re-organisation of the structure