diff --git a/OAT.xml b/OAT.xml
index 96937ea08644b79312d0ced7c0b3eb1e845108ee..1bc0fe58bb7df9fd76c6bd6a674c77bade1aafdd 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -3,17 +3,18 @@
-
+
-
+
+
diff --git a/thirdparty/libiscsi/check/README.md b/community/libiscsi/check/README.md
similarity index 100%
rename from thirdparty/libiscsi/check/README.md
rename to community/libiscsi/check/README.md
diff --git a/thirdparty/libiscsi/check/client/functions.sh b/community/libiscsi/check/client/functions.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/functions.sh
rename to community/libiscsi/check/client/functions.sh
diff --git a/thirdparty/libiscsi/check/client/test_0100_login.sh b/community/libiscsi/check/client/test_0100_login.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_0100_login.sh
rename to community/libiscsi/check/client/test_0100_login.sh
diff --git a/thirdparty/libiscsi/check/client/test_0300_nop_reply.sh b/community/libiscsi/check/client/test_0300_nop_reply.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_0300_nop_reply.sh
rename to community/libiscsi/check/client/test_0300_nop_reply.sh
diff --git a/thirdparty/libiscsi/check/client/test_0410_read_all_pdus.sh b/community/libiscsi/check/client/test_0410_read_all_pdus.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_0410_read_all_pdus.sh
rename to community/libiscsi/check/client/test_0410_read_all_pdus.sh
diff --git a/thirdparty/libiscsi/check/client/test_0500_header_digest.sh b/community/libiscsi/check/client/test_0500_header_digest.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_0500_header_digest.sh
rename to community/libiscsi/check/client/test_0500_header_digest.sh
diff --git a/thirdparty/libiscsi/check/client/test_1000_chap.sh b/community/libiscsi/check/client/test_1000_chap.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_1000_chap.sh
rename to community/libiscsi/check/client/test_1000_chap.sh
diff --git a/thirdparty/libiscsi/check/client/test_2000_reconnect.sh b/community/libiscsi/check/client/test_2000_reconnect.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_2000_reconnect.sh
rename to community/libiscsi/check/client/test_2000_reconnect.sh
diff --git a/thirdparty/libiscsi/check/client/test_9001_extendedcopy.sh b/community/libiscsi/check/client/test_9001_extendedcopy.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9001_extendedcopy.sh
rename to community/libiscsi/check/client/test_9001_extendedcopy.sh
diff --git a/thirdparty/libiscsi/check/client/test_9004_modesense6.sh b/community/libiscsi/check/client/test_9004_modesense6.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9004_modesense6.sh
rename to community/libiscsi/check/client/test_9004_modesense6.sh
diff --git a/thirdparty/libiscsi/check/client/test_9005_orwrite.sh b/community/libiscsi/check/client/test_9005_orwrite.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9005_orwrite.sh
rename to community/libiscsi/check/client/test_9005_orwrite.sh
diff --git a/thirdparty/libiscsi/check/client/test_9006_prefetch10.sh b/community/libiscsi/check/client/test_9006_prefetch10.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9006_prefetch10.sh
rename to community/libiscsi/check/client/test_9006_prefetch10.sh
diff --git a/thirdparty/libiscsi/check/client/test_9008_prinreadkeys.sh b/community/libiscsi/check/client/test_9008_prinreadkeys.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9008_prinreadkeys.sh
rename to community/libiscsi/check/client/test_9008_prinreadkeys.sh
diff --git a/thirdparty/libiscsi/check/client/test_9009_read6.sh b/community/libiscsi/check/client/test_9009_read6.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9009_read6.sh
rename to community/libiscsi/check/client/test_9009_read6.sh
diff --git a/thirdparty/libiscsi/check/client/test_9013_verify10.sh b/community/libiscsi/check/client/test_9013_verify10.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9013_verify10.sh
rename to community/libiscsi/check/client/test_9013_verify10.sh
diff --git a/thirdparty/libiscsi/check/client/test_9016_write10.sh b/community/libiscsi/check/client/test_9016_write10.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9016_write10.sh
rename to community/libiscsi/check/client/test_9016_write10.sh
diff --git a/thirdparty/libiscsi/check/client/test_9022_testunitready.sh b/community/libiscsi/check/client/test_9022_testunitready.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9022_testunitready.sh
rename to community/libiscsi/check/client/test_9022_testunitready.sh
diff --git a/thirdparty/libiscsi/check/client/test_9027_unmap.sh b/community/libiscsi/check/client/test_9027_unmap.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9027_unmap.sh
rename to community/libiscsi/check/client/test_9027_unmap.sh
diff --git a/thirdparty/libiscsi/check/client/test_9028_readdefectdata10.sh b/community/libiscsi/check/client/test_9028_readdefectdata10.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9028_readdefectdata10.sh
rename to community/libiscsi/check/client/test_9028_readdefectdata10.sh
diff --git a/thirdparty/libiscsi/check/client/test_9030_prinreportcapabilities.sh b/community/libiscsi/check/client/test_9030_prinreportcapabilities.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9030_prinreportcapabilities.sh
rename to community/libiscsi/check/client/test_9030_prinreportcapabilities.sh
diff --git a/thirdparty/libiscsi/check/client/test_9031_proutregister.sh b/community/libiscsi/check/client/test_9031_proutregister.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9031_proutregister.sh
rename to community/libiscsi/check/client/test_9031_proutregister.sh
diff --git a/thirdparty/libiscsi/check/client/test_9034_startstopunit.sh b/community/libiscsi/check/client/test_9034_startstopunit.sh
similarity index 100%
rename from thirdparty/libiscsi/check/client/test_9034_startstopunit.sh
rename to community/libiscsi/check/client/test_9034_startstopunit.sh
diff --git a/thirdparty/libiscsi/check/image/getlinuxIP.png b/community/libiscsi/check/image/getlinuxIP.png
similarity index 100%
rename from thirdparty/libiscsi/check/image/getlinuxIP.png
rename to community/libiscsi/check/image/getlinuxIP.png
diff --git a/thirdparty/libiscsi/check/image/modifiyIP.png b/community/libiscsi/check/image/modifiyIP.png
similarity index 100%
rename from thirdparty/libiscsi/check/image/modifiyIP.png
rename to community/libiscsi/check/image/modifiyIP.png
diff --git a/thirdparty/libiscsi/check/image/network_set.png b/community/libiscsi/check/image/network_set.png
similarity index 100%
rename from thirdparty/libiscsi/check/image/network_set.png
rename to community/libiscsi/check/image/network_set.png
diff --git a/thirdparty/libiscsi/check/image/ping_test.png b/community/libiscsi/check/image/ping_test.png
similarity index 100%
rename from thirdparty/libiscsi/check/image/ping_test.png
rename to community/libiscsi/check/image/ping_test.png
diff --git a/thirdparty/libiscsi/check/libiscsi_test_reference.md b/community/libiscsi/check/libiscsi_test_reference.md
similarity index 100%
rename from thirdparty/libiscsi/check/libiscsi_test_reference.md
rename to community/libiscsi/check/libiscsi_test_reference.md
diff --git a/thirdparty/libiscsi/check/server/functions.sh b/community/libiscsi/check/server/functions.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/functions.sh
rename to community/libiscsi/check/server/functions.sh
diff --git a/thirdparty/libiscsi/check/server/test_0100_login_server.sh b/community/libiscsi/check/server/test_0100_login_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_0100_login_server.sh
rename to community/libiscsi/check/server/test_0100_login_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_0300_nop_reply_server.sh b/community/libiscsi/check/server/test_0300_nop_reply_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_0300_nop_reply_server.sh
rename to community/libiscsi/check/server/test_0300_nop_reply_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_0410_read_all_pdus_server.sh b/community/libiscsi/check/server/test_0410_read_all_pdus_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_0410_read_all_pdus_server.sh
rename to community/libiscsi/check/server/test_0410_read_all_pdus_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_0500_header_digest_server.sh b/community/libiscsi/check/server/test_0500_header_digest_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_0500_header_digest_server.sh
rename to community/libiscsi/check/server/test_0500_header_digest_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_1000_chap_server.sh b/community/libiscsi/check/server/test_1000_chap_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_1000_chap_server.sh
rename to community/libiscsi/check/server/test_1000_chap_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_2000_reconnect_server.sh b/community/libiscsi/check/server/test_2000_reconnect_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_2000_reconnect_server.sh
rename to community/libiscsi/check/server/test_2000_reconnect_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9001_extendedcopy_server.sh b/community/libiscsi/check/server/test_9001_extendedcopy_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9001_extendedcopy_server.sh
rename to community/libiscsi/check/server/test_9001_extendedcopy_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9004_modesense6_server.sh b/community/libiscsi/check/server/test_9004_modesense6_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9004_modesense6_server.sh
rename to community/libiscsi/check/server/test_9004_modesense6_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9005_orwrite_server.sh b/community/libiscsi/check/server/test_9005_orwrite_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9005_orwrite_server.sh
rename to community/libiscsi/check/server/test_9005_orwrite_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9006_prefetch10_server.sh b/community/libiscsi/check/server/test_9006_prefetch10_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9006_prefetch10_server.sh
rename to community/libiscsi/check/server/test_9006_prefetch10_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9008_prinreadkeys_server.sh b/community/libiscsi/check/server/test_9008_prinreadkeys_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9008_prinreadkeys_server.sh
rename to community/libiscsi/check/server/test_9008_prinreadkeys_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9009_read6_server.sh b/community/libiscsi/check/server/test_9009_read6_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9009_read6_server.sh
rename to community/libiscsi/check/server/test_9009_read6_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9013_verify10_server.sh b/community/libiscsi/check/server/test_9013_verify10_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9013_verify10_server.sh
rename to community/libiscsi/check/server/test_9013_verify10_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9016_write10_server.sh b/community/libiscsi/check/server/test_9016_write10_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9016_write10_server.sh
rename to community/libiscsi/check/server/test_9016_write10_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9022_testunitready_server.sh b/community/libiscsi/check/server/test_9022_testunitready_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9022_testunitready_server.sh
rename to community/libiscsi/check/server/test_9022_testunitready_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9027_unmap_server.sh b/community/libiscsi/check/server/test_9027_unmap_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9027_unmap_server.sh
rename to community/libiscsi/check/server/test_9027_unmap_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9028_readdefectdata10_server.sh b/community/libiscsi/check/server/test_9028_readdefectdata10_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9028_readdefectdata10_server.sh
rename to community/libiscsi/check/server/test_9028_readdefectdata10_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9030_prinreportcapabilities_server.sh b/community/libiscsi/check/server/test_9030_prinreportcapabilities_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9030_prinreportcapabilities_server.sh
rename to community/libiscsi/check/server/test_9030_prinreportcapabilities_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9031_proutregister_server.sh b/community/libiscsi/check/server/test_9031_proutregister_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9031_proutregister_server.sh
rename to community/libiscsi/check/server/test_9031_proutregister_server.sh
diff --git a/thirdparty/libiscsi/check/server/test_9034_startstopunit_server.sh b/community/libiscsi/check/server/test_9034_startstopunit_server.sh
similarity index 100%
rename from thirdparty/libiscsi/check/server/test_9034_startstopunit_server.sh
rename to community/libiscsi/check/server/test_9034_startstopunit_server.sh
diff --git a/community/libosip2/OAT.xml b/community/libosip2/OAT.xml
deleted file mode 100644
index 90978a8a397427b9aa784690e96bba986a824e3f..0000000000000000000000000000000000000000
--- a/community/libosip2/OAT.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/community/libosip2/HPKBUILD b/thirdparty/libosip2/HPKBUILD
similarity index 71%
rename from community/libosip2/HPKBUILD
rename to thirdparty/libosip2/HPKBUILD
index 81f11dd9ae827b7c51d60ef6b8ae0aa89080aca7..9ea7ec4778cc78064bdf83f47b0048d7209db19f 100644
--- a/community/libosip2/HPKBUILD
+++ b/thirdparty/libosip2/HPKBUILD
@@ -1,5 +1,19 @@
+# Copyright (c) 2023 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# Contributor: shann
# Maintainer: shann
+
pkgname=libosip2
pkgver=5.3.1
pkgrel=0
diff --git a/community/libosip2/HPKCHECK b/thirdparty/libosip2/HPKCHECK
similarity index 37%
rename from community/libosip2/HPKCHECK
rename to thirdparty/libosip2/HPKCHECK
index 5c932120d432606f1438c2467b088ad023091f46..4c8c6da6082eb33f06ceebb7b0f952977d8b0611 100644
--- a/community/libosip2/HPKCHECK
+++ b/thirdparty/libosip2/HPKCHECK
@@ -1,3 +1,16 @@
+# Copyright (c) 2023 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# Contributor: shann
# Maintainer: shann
diff --git a/community/libosip2/README.OpenSource b/thirdparty/libosip2/README.OpenSource
similarity index 100%
rename from community/libosip2/README.OpenSource
rename to thirdparty/libosip2/README.OpenSource
diff --git a/community/libosip2/README_zh.md b/thirdparty/libosip2/README_zh.md
similarity index 100%
rename from community/libosip2/README_zh.md
rename to thirdparty/libosip2/README_zh.md
diff --git a/community/libosip2/SHA512SUM b/thirdparty/libosip2/SHA512SUM
similarity index 100%
rename from community/libosip2/SHA512SUM
rename to thirdparty/libosip2/SHA512SUM
diff --git a/community/libosip2/docs/hap_integrate.md b/thirdparty/libosip2/docs/hap_integrate.md
similarity index 100%
rename from community/libosip2/docs/hap_integrate.md
rename to thirdparty/libosip2/docs/hap_integrate.md
diff --git a/community/libosip2/docs/pic/osip2_install_dir.jpg b/thirdparty/libosip2/docs/pic/osip2_install_dir.jpg
similarity index 100%
rename from community/libosip2/docs/pic/osip2_install_dir.jpg
rename to thirdparty/libosip2/docs/pic/osip2_install_dir.jpg
diff --git a/community/libosip2/docs/pic/osip2_test.jpg b/thirdparty/libosip2/docs/pic/osip2_test.jpg
similarity index 100%
rename from community/libosip2/docs/pic/osip2_test.jpg
rename to thirdparty/libosip2/docs/pic/osip2_test.jpg
diff --git a/community/libosip2/docs/pic/osip2_usage.jpg b/thirdparty/libosip2/docs/pic/osip2_usage.jpg
similarity index 100%
rename from community/libosip2/docs/pic/osip2_usage.jpg
rename to thirdparty/libosip2/docs/pic/osip2_usage.jpg