Core reorganisation.
Remove dependency on fixed module names.
Remove dependency on fixed module names.