refactored yml adapter
Merge pull request #1 from stage1/feature/stage1-yml

Refactored yml adapter