move some internal compoents