Relocate some stuff