Update Clay environment infos + fix router
Clean Yaml parser files