Move configuration into runtime config file
Merge branch 'refactor_config'