move some stuff around [ci skip]