move some stuff around in packages