diff --git a/.gitmodules b/.gitmodules
index 010acc2..cf8e64b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "oss-internship-2020/sapi_libarchive/libarchive"]
-	path = oss-internship-2020/sapi_libarchive/libarchive
+	path = oss-internship-2020/libarchive/libarchive
 	url = https://github.com/libarchive/libarchive
 [submodule "oss-internship-2020/openjpeg/openjpeg"]
 	path = oss-internship-2020/openjpeg/openjpeg
diff --git a/oss-internship-2020/sapi_libarchive/.clang-format b/oss-internship-2020/libarchive/.clang-format
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/.clang-format
rename to oss-internship-2020/libarchive/.clang-format
diff --git a/oss-internship-2020/sapi_libarchive/.gitignore b/oss-internship-2020/libarchive/.gitignore
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/.gitignore
rename to oss-internship-2020/libarchive/.gitignore
diff --git a/oss-internship-2020/sapi_libarchive/CMakeLists.txt b/oss-internship-2020/libarchive/CMakeLists.txt
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/CMakeLists.txt
rename to oss-internship-2020/libarchive/CMakeLists.txt
diff --git a/oss-internship-2020/sapi_libarchive/README.md b/oss-internship-2020/libarchive/README.md
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/README.md
rename to oss-internship-2020/libarchive/README.md
diff --git a/oss-internship-2020/sapi_libarchive/examples/CMakeLists.txt b/oss-internship-2020/libarchive/examples/CMakeLists.txt
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/examples/CMakeLists.txt
rename to oss-internship-2020/libarchive/examples/CMakeLists.txt
diff --git a/oss-internship-2020/sapi_libarchive/examples/orig/minitar.cc b/oss-internship-2020/libarchive/examples/orig/minitar.cc
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/examples/orig/minitar.cc
rename to oss-internship-2020/libarchive/examples/orig/minitar.cc
diff --git a/oss-internship-2020/sapi_libarchive/examples/orig/tarfilter.cc b/oss-internship-2020/libarchive/examples/orig/tarfilter.cc
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/examples/orig/tarfilter.cc
rename to oss-internship-2020/libarchive/examples/orig/tarfilter.cc
diff --git a/oss-internship-2020/sapi_libarchive/examples/orig/untar.cc b/oss-internship-2020/libarchive/examples/orig/untar.cc
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/examples/orig/untar.cc
rename to oss-internship-2020/libarchive/examples/orig/untar.cc
diff --git a/oss-internship-2020/sapi_libarchive/examples/sandbox.h b/oss-internship-2020/libarchive/examples/sandbox.h
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/examples/sandbox.h
rename to oss-internship-2020/libarchive/examples/sandbox.h
diff --git a/oss-internship-2020/sapi_libarchive/examples/sapi_minitar.cc b/oss-internship-2020/libarchive/examples/sapi_minitar.cc
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/examples/sapi_minitar.cc
rename to oss-internship-2020/libarchive/examples/sapi_minitar.cc
diff --git a/oss-internship-2020/sapi_libarchive/examples/sapi_minitar.h b/oss-internship-2020/libarchive/examples/sapi_minitar.h
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/examples/sapi_minitar.h
rename to oss-internship-2020/libarchive/examples/sapi_minitar.h
diff --git a/oss-internship-2020/sapi_libarchive/examples/sapi_minitar_main.cc b/oss-internship-2020/libarchive/examples/sapi_minitar_main.cc
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/examples/sapi_minitar_main.cc
rename to oss-internship-2020/libarchive/examples/sapi_minitar_main.cc
diff --git a/oss-internship-2020/sapi_libarchive/files_diff/archive.h b/oss-internship-2020/libarchive/files_diff/archive.h
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/files_diff/archive.h
rename to oss-internship-2020/libarchive/files_diff/archive.h
diff --git a/oss-internship-2020/sapi_libarchive/files_diff/archive2.h b/oss-internship-2020/libarchive/files_diff/archive2.h
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/files_diff/archive2.h
rename to oss-internship-2020/libarchive/files_diff/archive2.h
diff --git a/oss-internship-2020/sapi_libarchive/files_diff/archive_virtual.c b/oss-internship-2020/libarchive/files_diff/archive_virtual.c
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/files_diff/archive_virtual.c
rename to oss-internship-2020/libarchive/files_diff/archive_virtual.c
diff --git a/oss-internship-2020/sapi_libarchive/files_diff/archive_virtual2.c b/oss-internship-2020/libarchive/files_diff/archive_virtual2.c
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/files_diff/archive_virtual2.c
rename to oss-internship-2020/libarchive/files_diff/archive_virtual2.c
diff --git a/oss-internship-2020/sapi_libarchive/functions_to_sandbox.txt b/oss-internship-2020/libarchive/functions_to_sandbox.txt
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/functions_to_sandbox.txt
rename to oss-internship-2020/libarchive/functions_to_sandbox.txt
diff --git a/oss-internship-2020/sapi_libarchive/libarchive b/oss-internship-2020/libarchive/libarchive
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/libarchive
rename to oss-internship-2020/libarchive/libarchive
diff --git a/oss-internship-2020/sapi_libarchive/patches/archive_virtual.patch b/oss-internship-2020/libarchive/patches/archive_virtual.patch
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/patches/archive_virtual.patch
rename to oss-internship-2020/libarchive/patches/archive_virtual.patch
diff --git a/oss-internship-2020/sapi_libarchive/patches/header.patch b/oss-internship-2020/libarchive/patches/header.patch
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/patches/header.patch
rename to oss-internship-2020/libarchive/patches/header.patch
diff --git a/oss-internship-2020/sapi_libarchive/test/normal.tar b/oss-internship-2020/libarchive/test/normal.tar
similarity index 100%
rename from oss-internship-2020/sapi_libarchive/test/normal.tar
rename to oss-internship-2020/libarchive/test/normal.tar