Altered the archive handling and existing extracted directory