Updating and reorganizing yaml

wow such organization