Regrouped config collections and pages. Fixed #1201.
Merge pull request #1210 from normanjaeckel/RegroupConfig

Regrouped config collections and pages. Fixed #1201.