Move uuid to root fields