Restructured core routes