partial refactor to augeas

more to come...