Moving all util classes into yaml util to avoid namespace collisions