Move more archive stuff into the correct file.