Split the configuration definition
Merge pull request #736 from K-Phoen/split-config

Split the configuration definition