Reorganized config readers, added support for YAML configs, added tests,