Moved config-related into a separate file
Merge pull request #37 from riobard/refactor/config

Moved config-related into a separate file