Regrouped config collections and pages. Fixed #1201.