HEROIC restructure