Re-organized the core.