Fix archive folder structure