move some blocks to more appropriate places