WhiteCoreSim restructured