Bit of refactoring; add local untar of the archives