Use shutil.move so that cross filesystem moves work
Fixed loading of archive queue