Fix big containers losing files: When we move a file to an archive ("ext...

This should be reviewed/tested further and merged.