diff --git a/libwd-2.3.21.tar.gz b/libwd-2.3.21.tar.gz
index 8551d41..83b861e 100644
Binary files a/libwd-2.3.21.tar.gz and b/libwd-2.3.21.tar.gz differ
diff --git a/warpdrive.spec b/warpdrive.spec
index 5ba36d0..16717d1 100644
--- a/warpdrive.spec
+++ b/warpdrive.spec
@@ -22,54 +22,52 @@ and decryption, asymmetric encryption and decryption.
 
 %prep
 %global debug_package %{nil}
-%autosetup -c -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version} -p1
 
 %build
-cd uadk
 sh autogen.sh
 ./configure
 make
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}/usr/lib64
-install -b -m755 uadk/.libs/libwd.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
-install -b -m755 uadk/.libs/libwd_crypto.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
-install -b -m755 uadk/.libs/libwd_comp.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
-install -b -m755 uadk/.libs/libhisi_sec.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
-install -b -m755 uadk/.libs/libhisi_hpre.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
-install -b -m755 uadk/.libs/libhisi_zip.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
+install -b -m755 .libs/libwd.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
+install -b -m755 .libs/libwd_crypto.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
+install -b -m755 .libs/libwd_comp.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
+install -b -m755 .libs/libhisi_sec.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
+install -b -m755 .libs/libhisi_hpre.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
+install -b -m755 .libs/libhisi_zip.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64
 mkdir -p ${RPM_BUILD_ROOT}/usr/include/warpdrive/include
-cp uadk/v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/warpdrive/include
-cp uadk/v1/wd.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
-cp uadk/v1/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
-cp uadk/v1/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
-cp uadk/v1/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
-cp uadk/v1/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
-cp uadk/v1/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
-cp uadk/v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
+cp v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/warpdrive/include
+cp v1/wd.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
+cp v1/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
+cp v1/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
+cp v1/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
+cp v1/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
+cp v1/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
+cp v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/warpdrive
 mkdir -p ${RPM_BUILD_ROOT}/usr/include/uadk/v1
-cp uadk/include/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_aead.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_ecc.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_ecc_curve.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_alg_common.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_common.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/include/wd_sched.h ${RPM_BUILD_ROOT}/usr/include/uadk
-cp uadk/v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
-cp uadk/v1/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
-cp uadk/v1/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
-cp uadk/v1/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
-cp uadk/v1/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
-cp uadk/v1/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
-cp uadk/v1/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
-cp uadk/v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
-
+cp include/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_aead.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_ecc.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_ecc_curve.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_alg_common.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_common.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp include/wd_sched.h ${RPM_BUILD_ROOT}/usr/include/uadk
+cp v1/uacce.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
+cp v1/wd.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
+cp v1/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
+cp v1/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
+cp v1/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
+cp v1/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
+cp v1/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
+cp v1/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/uadk/v1
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -119,7 +117,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %exclude /usr/lib64/libhisi_hpre.so.2
 %exclude /usr/lib64/libhisi_zip.so.2
 
-
 %pre
 if [ "$1" = "2" ] ; then  #2: update
     rm -rf /usr/lib64/libwd.so   > /dev/null 2>&1 || true