Moved some nove/compute code around, updated cinder