move some stuff around, updating container templates