Remade the core structure from scratch.