Move things to a better location