Added mantle, moved clients and utils