Restructure ModelNode