Rewrite archives to suit different folder structure