diff --git a/pub/copy-alpha-to-draft.sh b/pub/copy-alpha-to-draft.sh
index e388c1d37..f601e68ab 100755
--- a/pub/copy-alpha-to-draft.sh
+++ b/pub/copy-alpha-to-draft.sh
@@ -11,7 +11,7 @@ DRAFT=$2
 UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
-COPY_YEAR=2024
+COPY_YEAR=2025
 UNI_VER=17.0.0
 EMOJI_VER=17.0
 
@@ -26,15 +26,13 @@ s/PUB_STATUS/draft/
 s/UNI_VER/$UNI_VER/
 s/EMOJI_VER/$EMOJI_VER/
 s%PUBLIC_EMOJI%Public/draft/emoji%
-s%PUBLIC_UCD%Public/draft/UCD%
+s%PUBLIC_UCD%Public/draft%
 eof
 
-mkdir -p $DRAFT/UCD/ucd
-mkdir -p $DRAFT/zipped
-cp -r $UNITOOLS_DATA/ucd/dev/* $DRAFT/UCD/ucd
-rm -r $DRAFT/UCD/ucd/Unihan
-mv $DRAFT/UCD/ucd/version-ReadMe.txt $DRAFT/UCD/ReadMe.txt
-mv $DRAFT/UCD/ucd/zipped-ReadMe.txt $DRAFT/zipped/ReadMe.txt
+mkdir -p $DRAFT/ucd
+cp -r $UNITOOLS_DATA/ucd/dev/* $DRAFT/ucd
+rm -r $DRAFT/ucd/Unihan
+mv $DRAFT/ucd/version-ReadMe.txt $DRAFT/ReadMe.txt
 
 mkdir -p $DRAFT/emoji
 cp $UNITOOLS_DATA/emoji/dev/* $DRAFT/emoji
@@ -54,8 +52,8 @@ chmod a+rX -R $DRAFT
 find $DRAFT -name '*ReadMe.txt' | xargs sed -i -f $DRAFT/sed-readmes.txt
 
 # Zip files for some types of data, after fixing permissions
-rm $DRAFT/UCD/ucd/UCD.zip
-(cd $DRAFT/UCD/ucd; zip -r UCD.zip * && mv UCD.zip $DRAFT/zipped)
+rm $DRAFT/ucd/UCD.zip
+(cd $DRAFT/ucd; zip -r UCD.zip *)
 
 # Cleanup
 rm $DRAFT/sed-readmes.txt
@@ -65,7 +63,6 @@ rm $DRAFT/alpha.zip
 
 echo "--------------------"
 echo "Copy files from elsewhere:"
-echo "- Unihan.zip to $DRAFT/UCD/ucd"
-echo "- Unihan.zip to $DRAFT/zipped"
-echo "- alpha charts to $DRAFT/UCD/charts"
+echo "- Unihan.zip to $DRAFT/ucd"
+echo "- alpha charts to $DRAFT/charts"
 
diff --git a/pub/copy-beta-to-draft.sh b/pub/copy-beta-to-draft.sh
index 99677da2e..077d86ef8 100755
--- a/pub/copy-beta-to-draft.sh
+++ b/pub/copy-beta-to-draft.sh
@@ -11,7 +11,7 @@ DRAFT=$2
 UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
-COPY_YEAR=2024
+COPY_YEAR=2025
 UNI_VER=17.0.0
 EMOJI_VER=17.0
 
@@ -26,15 +26,13 @@ s/PUB_STATUS/draft/
 s/UNI_VER/$UNI_VER/
 s/EMOJI_VER/$EMOJI_VER/
 s%PUBLIC_EMOJI%Public/draft/emoji%
-s%PUBLIC_UCD%Public/draft/UCD%
+s%PUBLIC_UCD%Public/draft%
 eof
 
-mkdir -p $DRAFT/UCD/ucd
-mkdir -p $DRAFT/zipped
-cp -r $UNITOOLS_DATA/ucd/dev/* $DRAFT/UCD/ucd
-rm -r $DRAFT/UCD/ucd/Unihan
-mv $DRAFT/UCD/ucd/version-ReadMe.txt $DRAFT/UCD/ReadMe.txt
-mv $DRAFT/UCD/ucd/zipped-ReadMe.txt $DRAFT/zipped/ReadMe.txt
+mkdir -p $DRAFT/ucd
+cp -r $UNITOOLS_DATA/ucd/dev/* $DRAFT/ucd
+rm -r $DRAFT/ucd/Unihan
+mv $DRAFT/ucd/version-ReadMe.txt $DRAFT/ReadMe.txt
 
 mkdir -p $DRAFT/UCA
 cp -r $UNITOOLS_DATA/uca/dev/* $DRAFT/UCA
@@ -60,8 +58,8 @@ chmod a+rX -R $DRAFT
 find $DRAFT -name '*ReadMe.txt' | xargs sed -i -f $DRAFT/sed-readmes.txt
 
 # Zip files for some types of data, after fixing permissions
-rm $DRAFT/UCD/ucd/UCD.zip
-(cd $DRAFT/UCD/ucd; zip -r UCD.zip * && mv UCD.zip $DRAFT/zipped)
+rm $DRAFT/ucd/UCD.zip
+(cd $DRAFT/ucd; zip -r UCD.zip *)
 
 rm $DRAFT/UCA/CollationTest.zip
 (cd $DRAFT/UCA; zip -r CollationTest.zip CollationTest && rm -r CollationTest)
@@ -81,8 +79,7 @@ rm $DRAFT/beta.zip
 
 echo "--------------------"
 echo "Copy files from elsewhere:"
-echo "- Unihan.zip to $DRAFT/UCD/ucd"
-echo "- Unihan.zip to $DRAFT/zipped"
-echo "- UCDXML files to $DRAFT/UCD/ucdxml"
-echo "- beta charts to $DRAFT/UCD/charts"
+echo "- Unihan.zip to $DRAFT/ucd"
+echo "- UCDXML files to $DRAFT/ucdxml"
+echo "- beta charts to $DRAFT/charts"
 
diff --git a/pub/copy-ucd-to-draft.sh b/pub/copy-ucd-to-draft.sh
index 041cd042c..33a3cd9c2 100755
--- a/pub/copy-ucd-to-draft.sh
+++ b/pub/copy-ucd-to-draft.sh
@@ -11,7 +11,7 @@ DRAFT=$2
 UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
-COPY_YEAR=2024
+COPY_YEAR=2025
 UNI_VER=17.0.0
 EMOJI_VER=17.0
 
@@ -26,16 +26,14 @@ s/PUB_STATUS/draft/
 s/UNI_VER/$UNI_VER/
 s/EMOJI_VER/$EMOJI_VER/
 s%PUBLIC_EMOJI%Public/draft/emoji%
-s%PUBLIC_UCD%Public/draft/UCD%
+s%PUBLIC_UCD%Public/draft%
 eof
 
-mkdir -p $DRAFT/UCD/ucd
-mkdir -p $DRAFT/zipped
-cp -r $UNITOOLS_DATA/ucd/dev/* $DRAFT/UCD/ucd
-rm -r $DRAFT/UCD/ucd/Unihan
-rm -r $DRAFT/UCD/ucd/emoji
-mv $DRAFT/UCD/ucd/version-ReadMe.txt $DRAFT/UCD/ReadMe.txt
-mv $DRAFT/UCD/ucd/zipped-ReadMe.txt $DRAFT/zipped/ReadMe.txt
+mkdir -p $DRAFT/ucd
+cp -r $UNITOOLS_DATA/ucd/dev/* $DRAFT/ucd
+rm -r $DRAFT/ucd/Unihan
+rm -r $DRAFT/ucd/emoji
+mv $DRAFT/ucd/version-ReadMe.txt $DRAFT/ReadMe.txt
 
 # Fix permissions. Everyone can read, and search directories.
 chmod a+rX -R $DRAFT
@@ -44,8 +42,8 @@ chmod a+rX -R $DRAFT
 find $DRAFT -name '*ReadMe.txt' | xargs sed -i -f $DRAFT/sed-readmes.txt
 
 # Zip files for some types of data, after fixing permissions
-rm $DRAFT/UCD/ucd/UCD.zip
-(cd $DRAFT/UCD/ucd; zip -r UCD.zip * && mv UCD.zip $DRAFT/zipped)
+rm $DRAFT/ucd/UCD.zip
+(cd $DRAFT/ucd; zip -r UCD.zip *)
 
 # Cleanup
 rm $DRAFT/sed-readmes.txt
@@ -55,6 +53,5 @@ rm $DRAFT/ucd-snapshot.zip
 
 echo "--------------------"
 echo "Copy files from elsewhere:"
-echo "- Unihan.zip to $DRAFT/UCD/ucd"
-echo "- Unihan.zip to $DRAFT/zipped"
+echo "- Unihan.zip to $DRAFT/ucd"
 
diff --git a/unicodetools/data/ucd/dev/ReadMe.txt b/unicodetools/data/ucd/dev/ReadMe.txt
index 23bc4fcdb..3ef71b13f 100644
--- a/unicodetools/data/ucd/dev/ReadMe.txt
+++ b/unicodetools/data/ucd/dev/ReadMe.txt
@@ -7,6 +7,7 @@
 # For documentation, see the following:
 # NamesList.html
 # UAX #38, "Unicode Han Database (Unihan)"
+# UAX #42, "Unicode Character Database in XML"
 # UAX #44, "Unicode Character Database"
 # UTS #51, "Unicode Emoji"
 # UAX #57, "Unicode Egyptian Hieroglyph Database"
diff --git a/unicodetools/data/ucd/dev/version-ReadMe.txt b/unicodetools/data/ucd/dev/version-ReadMe.txt
index 6e011d319..1fc519371 100644
--- a/unicodetools/data/ucd/dev/version-ReadMe.txt
+++ b/unicodetools/data/ucd/dev/version-ReadMe.txt
@@ -17,8 +17,8 @@
 This directory contains the PUB_STATUS data files 
 for Version UNI_VER of the Unicode Standard.
 
-The "ucd" subdirectory contains the Unicode
-Character Database data files.
-
 The "charts" subdirectory contains an archival set of
 pdf code charts corresponding exactly to Version UNI_VER.
+
+The other subdirectories contain the data files for the
+Unicode Character Database and for the synchronized Unicode Technical Standards.
diff --git a/unicodetools/data/ucd/dev/zipped-ReadMe.txt b/unicodetools/data/ucd/dev/zipped-ReadMe.txt
deleted file mode 100644
index 457acc36b..000000000
--- a/unicodetools/data/ucd/dev/zipped-ReadMe.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Unicode Character Database
-# Date: PUB_DATE
-# © COPY_YEAR Unicode®, Inc.
-# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
-# For terms of use and license, see https://www.unicode.org/terms_of_use.html
-#
-# For documentation, see NamesList.html,
-# UAX #38, "Unicode Han Database (Unihan)"
-# UAX #42, "Unicode Character Database in XML"
-# UAX #44, "Unicode Character Database"
-# UTS #51, "Unicode Emoji"
-# UAX #57, "Unicode Egyptian Hieroglyph Database"
-#
-# The UAXes and UTS #51 can be accessed at https://www.unicode.org/versions/UnicodeUNI_VER/
-
-This directory contains zipped versions of the PUB_STATUS data files
-for Version UNI_VER of the Unicode Standard.
-
-Unihan.zip contains the data files for the Unihan Database.
-
-UCD.zip contains the collection of all other UCD data files
-(except for the Unihan Database).
-
-The unzipped collection of UCD data files for Version UNI_VER are posted in:
-
-https://www.unicode.org/PUBLIC_UCD/ucd/