Updating and reorganizing yaml

wow such organization
Merge pull request #92 from lle6138/master

Updating and reorganizing yaml