Move stuff around to more logical locations