Moved configuration into YAML files
Merge branch 'configuration'