Reorganized the core system