Core re-organization