rearrange buffers around new hiearchy of Policy classes