Reorganising skeleton
Reorganising the skeleton so that it more closely reflects the organisation of the core