Move as much as possible into the Dang namespace