With this commit all required changes for having the configuration in
two separate files should be completed.

Fixes #18