* Check for tar.bz2 and set tar.gz if not found

* Move check for tarfile after it is extracted