diff --git a/UnicodeJsps/pom.xml b/UnicodeJsps/pom.xml
index e09b537c6..efcfee17d 100644
--- a/UnicodeJsps/pom.xml
+++ b/UnicodeJsps/pom.xml
@@ -31,11 +31,6 @@
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>com.ibm.icu</groupId>
-			<artifactId>utilities-for-cldr</artifactId>
-		</dependency>
 		<!-- cldr -->
 		<dependency>
 			<groupId>org.unicode.cldr</groupId>
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/Annotations.java b/UnicodeJsps/src/main/java/org/unicode/jsp/Annotations.java
index 7f1dd0d29..2a53f0d10 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/Annotations.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/Annotations.java
@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Collections;
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/BidiCharMap.java b/UnicodeJsps/src/main/java/org/unicode/jsp/BidiCharMap.java
index 64de10b69..4ca20b040 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/BidiCharMap.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/BidiCharMap.java
@@ -1,7 +1,7 @@
 /** */
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/Confusables.java b/UnicodeJsps/src/main/java/org/unicode/jsp/Confusables.java
index 61d284935..fc66b1d75 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/Confusables.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/Confusables.java
@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.Normalizer;
 import com.ibm.icu.text.Normalizer.Mode;
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/CreateInversions.java b/UnicodeJsps/src/main/java/org/unicode/jsp/CreateInversions.java
index 0e100f25b..753493342 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/CreateInversions.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/CreateInversions.java
@@ -1,7 +1,7 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMapIterator;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMapIterator;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSetIterator;
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/NFM.java b/UnicodeJsps/src/main/java/org/unicode/jsp/NFM.java
index b444de569..7c0d33ad0 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/NFM.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/NFM.java
@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import java.util.regex.Pattern;
 
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester.java b/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester.java
index 6113ecc69..9b25f7985 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester.java
@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.lang.UScript;
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester2.java b/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester2.java
index 52b139afb..cc62ffb97 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester2.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester2.java
@@ -4,7 +4,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Normalizer2;
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/SequenceData.java b/UnicodeJsps/src/main/java/org/unicode/jsp/SequenceData.java
index e858b1e79..2df57f385 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/SequenceData.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/SequenceData.java
@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeDataInput.java b/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeDataInput.java
index 0a84443ab..d187331a9 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeDataInput.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeDataInput.java
@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeUtilities.java b/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeUtilities.java
index 4f2e153ed..74de13503 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeUtilities.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeUtilities.java
@@ -1,7 +1,7 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row.R4;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/XPropertyFactory.java b/UnicodeJsps/src/main/java/org/unicode/jsp/XPropertyFactory.java
index 2f28ab655..eb52f9be0 100644
--- a/UnicodeJsps/src/main/java/org/unicode/jsp/XPropertyFactory.java
+++ b/UnicodeJsps/src/main/java/org/unicode/jsp/XPropertyFactory.java
@@ -3,7 +3,7 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty.NameChoice;
 import com.ibm.icu.text.CollationElementIterator;
diff --git a/UnicodeJsps/src/test/java/org/unicode/jsptest/TestGenerate.java b/UnicodeJsps/src/test/java/org/unicode/jsptest/TestGenerate.java
index ae6a3bc1e..61ab94b8e 100644
--- a/UnicodeJsps/src/test/java/org/unicode/jsptest/TestGenerate.java
+++ b/UnicodeJsps/src/test/java/org/unicode/jsptest/TestGenerate.java
@@ -1,7 +1,7 @@
 package org.unicode.jsptest;
 
 import com.ibm.icu.dev.test.TestFmwk;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.DateFormat;
diff --git a/UnicodeJsps/src/test/java/org/unicode/jsptest/TestJsp.java b/UnicodeJsps/src/test/java/org/unicode/jsptest/TestJsp.java
index c1c917878..108a9541c 100644
--- a/UnicodeJsps/src/test/java/org/unicode/jsptest/TestJsp.java
+++ b/UnicodeJsps/src/test/java/org/unicode/jsptest/TestJsp.java
@@ -1,6 +1,6 @@
 package org.unicode.jsptest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
diff --git a/UnicodeJsps/src/test/java/org/unicode/jsptest/TestProperties.java b/UnicodeJsps/src/test/java/org/unicode/jsptest/TestProperties.java
index 119181ea4..6dc615ec6 100644
--- a/UnicodeJsps/src/test/java/org/unicode/jsptest/TestProperties.java
+++ b/UnicodeJsps/src/test/java/org/unicode/jsptest/TestProperties.java
@@ -1,9 +1,9 @@
 package org.unicode.jsptest;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row.R4;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
diff --git a/pom.xml b/pom.xml
index 31c4ce994..040d5a51a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,14 +24,14 @@
     <properties>
         <!--
             For ICU versions, see https://github.com/orgs/unicode-org/packages?repo_name=icu
-            Note that we can't use the general ICU maven packages, because utilities isn't exported (yet).
-         -->
-        <icu.version>76.0.1-SNAPSHOT</icu.version>
+            or use vanilla *released* ICU versions like 76.1 which come from Maven Central.
+          -->
+        <icu.version>76.1</icu.version>
 
         <!--
              For CLDR versions, see https://github.com/orgs/unicode-org/packages?repo_name=cldr
           -->
-        <cldr.version>0.0.0-SNAPSHOT-880c12f291</cldr.version>
+        <cldr.version>0.0.0-SNAPSHOT-e1d37acce5</cldr.version>
 
 
         <!-- these two set the JDK version for source and target -->
@@ -71,12 +71,6 @@
                 <artifactId>icu4j</artifactId>
                 <version>${icu.version}</version>
             </dependency>
-
-            <dependency>
-                <groupId>com.ibm.icu</groupId>
-                <artifactId>utilities-for-cldr</artifactId>
-                <version>${icu.version}</version>
-            </dependency>
             <!-- cldr -->
             <dependency>
                 <groupId>org.unicode.cldr</groupId>
diff --git a/unicodetools-testutils/pom.xml b/unicodetools-testutils/pom.xml
index 11289fdf3..a9037341e 100644
--- a/unicodetools-testutils/pom.xml
+++ b/unicodetools-testutils/pom.xml
@@ -20,10 +20,6 @@
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.ibm.icu</groupId>
-			<artifactId>utilities-for-cldr</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.unicode.cldr</groupId>
 			<artifactId>cldr-code</artifactId>
diff --git a/unicodetools/pom.xml b/unicodetools/pom.xml
index 5a03813a4..9473dddb9 100644
--- a/unicodetools/pom.xml
+++ b/unicodetools/pom.xml
@@ -20,11 +20,6 @@
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>com.ibm.icu</groupId>
-			<artifactId>utilities-for-cldr</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.unicode.cldr</groupId>
 			<artifactId>cldr-code</artifactId>
diff --git a/unicodetools/src/main/java/org/unicode/draft/CompareCldrUnihanData.java b/unicodetools/src/main/java/org/unicode/draft/CompareCldrUnihanData.java
index ef4c4aeaa..de03dc93e 100644
--- a/unicodetools/src/main/java/org/unicode/draft/CompareCldrUnihanData.java
+++ b/unicodetools/src/main/java/org/unicode/draft/CompareCldrUnihanData.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Objects;
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.List;
 import java.util.TreeSet;
diff --git a/unicodetools/src/main/java/org/unicode/draft/ComparePinyin.java b/unicodetools/src/main/java/org/unicode/draft/ComparePinyin.java
index dfd2b96e3..929cf4786 100644
--- a/unicodetools/src/main/java/org/unicode/draft/ComparePinyin.java
+++ b/unicodetools/src/main/java/org/unicode/draft/ComparePinyin.java
@@ -1,8 +1,8 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.IterableComparator;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.Normalizer;
 import com.ibm.icu.text.Transform;
diff --git a/unicodetools/src/main/java/org/unicode/draft/FindHanSizes.java b/unicodetools/src/main/java/org/unicode/draft/FindHanSizes.java
index ea5ec74ab..3b31311d8 100644
--- a/unicodetools/src/main/java/org/unicode/draft/FindHanSizes.java
+++ b/unicodetools/src/main/java/org/unicode/draft/FindHanSizes.java
@@ -1,6 +1,6 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.Normalizer2;
 import com.ibm.icu.text.Normalizer2.Mode;
diff --git a/unicodetools/src/main/java/org/unicode/draft/FormatSpecialData2.java b/unicodetools/src/main/java/org/unicode/draft/FormatSpecialData2.java
index d4a7c2d5f..3c040dadf 100644
--- a/unicodetools/src/main/java/org/unicode/draft/FormatSpecialData2.java
+++ b/unicodetools/src/main/java/org/unicode/draft/FormatSpecialData2.java
@@ -1,7 +1,7 @@
 package org.unicode.draft;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/draft/FrequencyData2.java b/unicodetools/src/main/java/org/unicode/draft/FrequencyData2.java
index 42047300a..870f68d63 100644
--- a/unicodetools/src/main/java/org/unicode/draft/FrequencyData2.java
+++ b/unicodetools/src/main/java/org/unicode/draft/FrequencyData2.java
@@ -1,7 +1,7 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.text.Normalizer;
diff --git a/unicodetools/src/main/java/org/unicode/draft/GenerateNormalizeForMatch2.java b/unicodetools/src/main/java/org/unicode/draft/GenerateNormalizeForMatch2.java
index 6c256a62f..7fd56eaed 100644
--- a/unicodetools/src/main/java/org/unicode/draft/GenerateNormalizeForMatch2.java
+++ b/unicodetools/src/main/java/org/unicode/draft/GenerateNormalizeForMatch2.java
@@ -5,7 +5,7 @@
  */
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.DateFormat;
 import com.ibm.icu.text.DecimalFormat;
diff --git a/unicodetools/src/main/java/org/unicode/draft/GenerateUnihanCollators.java b/unicodetools/src/main/java/org/unicode/draft/GenerateUnihanCollators.java
index 739fb484c..b8981203b 100644
--- a/unicodetools/src/main/java/org/unicode/draft/GenerateUnihanCollators.java
+++ b/unicodetools/src/main/java/org/unicode/draft/GenerateUnihanCollators.java
@@ -2,12 +2,12 @@
 
 import com.google.common.base.Splitter;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
 import com.ibm.icu.impl.Row.R4;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.RuleBasedCollator;
 import com.ibm.icu.text.Transform;
diff --git a/unicodetools/src/main/java/org/unicode/draft/HanFrequencies.java b/unicodetools/src/main/java/org/unicode/draft/HanFrequencies.java
index 15f3b3a91..b0f13005d 100644
--- a/unicodetools/src/main/java/org/unicode/draft/HanFrequencies.java
+++ b/unicodetools/src/main/java/org/unicode/draft/HanFrequencies.java
@@ -1,8 +1,8 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.BufferedReader;
diff --git a/unicodetools/src/main/java/org/unicode/draft/IdnaLabelTester2.java b/unicodetools/src/main/java/org/unicode/draft/IdnaLabelTester2.java
index 8820ef556..912c4754b 100644
--- a/unicodetools/src/main/java/org/unicode/draft/IdnaLabelTester2.java
+++ b/unicodetools/src/main/java/org/unicode/draft/IdnaLabelTester2.java
@@ -1,11 +1,11 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMapIterator;
 import com.ibm.icu.impl.Punycode;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
 import com.ibm.icu.impl.Row.R5;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMapIterator;
 import com.ibm.icu.impl.UnicodeRegex;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
diff --git a/unicodetools/src/main/java/org/unicode/draft/Ids2.java b/unicodetools/src/main/java/org/unicode/draft/Ids2.java
index e4493031f..57eae7156 100644
--- a/unicodetools/src/main/java/org/unicode/draft/Ids2.java
+++ b/unicodetools/src/main/java/org/unicode/draft/Ids2.java
@@ -1,7 +1,7 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Collator;
diff --git a/unicodetools/src/main/java/org/unicode/draft/RadicalStroke2.java b/unicodetools/src/main/java/org/unicode/draft/RadicalStroke2.java
index 0f137c63b..ed3ccd21b 100644
--- a/unicodetools/src/main/java/org/unicode/draft/RadicalStroke2.java
+++ b/unicodetools/src/main/java/org/unicode/draft/RadicalStroke2.java
@@ -1,6 +1,6 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.BufferedReader;
 import java.io.FileReader;
diff --git a/unicodetools/src/main/java/org/unicode/draft/UnicodeDataInput.java b/unicodetools/src/main/java/org/unicode/draft/UnicodeDataInput.java
index b8f60ff64..2ab17c6cf 100644
--- a/unicodetools/src/main/java/org/unicode/draft/UnicodeDataInput.java
+++ b/unicodetools/src/main/java/org/unicode/draft/UnicodeDataInput.java
@@ -1,6 +1,6 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.DataInput;
 import java.io.IOException;
diff --git a/unicodetools/src/main/java/org/unicode/draft/UnicodeDataOutput.java b/unicodetools/src/main/java/org/unicode/draft/UnicodeDataOutput.java
index 05bf502c4..ef61bb4f8 100644
--- a/unicodetools/src/main/java/org/unicode/draft/UnicodeDataOutput.java
+++ b/unicodetools/src/main/java/org/unicode/draft/UnicodeDataOutput.java
@@ -1,6 +1,6 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSetIterator;
 import java.io.DataOutput;
diff --git a/unicodetools/src/main/java/org/unicode/draft/UnicodeIntMap.java b/unicodetools/src/main/java/org/unicode/draft/UnicodeIntMap.java
index 179740842..b7623e7dc 100644
--- a/unicodetools/src/main/java/org/unicode/draft/UnicodeIntMap.java
+++ b/unicodetools/src/main/java/org/unicode/draft/UnicodeIntMap.java
@@ -6,7 +6,7 @@
  */
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.StringTransform;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/idna/CheckIdna2008.java b/unicodetools/src/main/java/org/unicode/idna/CheckIdna2008.java
index 6a0f20a45..1e9313d04 100644
--- a/unicodetools/src/main/java/org/unicode/idna/CheckIdna2008.java
+++ b/unicodetools/src/main/java/org/unicode/idna/CheckIdna2008.java
@@ -1,6 +1,6 @@
 package org.unicode.idna;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import org.unicode.cldr.draft.FileUtilities;
 import org.unicode.props.IndexUnicodeProperties;
diff --git a/unicodetools/src/main/java/org/unicode/idna/GenerateIdna.java b/unicodetools/src/main/java/org/unicode/idna/GenerateIdna.java
index e16c498e9..ade5820c4 100644
--- a/unicodetools/src/main/java/org/unicode/idna/GenerateIdna.java
+++ b/unicodetools/src/main/java/org/unicode/idna/GenerateIdna.java
@@ -1,9 +1,9 @@
 package org.unicode.idna;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
 import com.ibm.icu.impl.Row.R3;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.DateFormat;
 import com.ibm.icu.text.SimpleDateFormat;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/idna/GenerateIdnaTest.java b/unicodetools/src/main/java/org/unicode/idna/GenerateIdnaTest.java
index ff79c14a8..d37060c4f 100644
--- a/unicodetools/src/main/java/org/unicode/idna/GenerateIdnaTest.java
+++ b/unicodetools/src/main/java/org/unicode/idna/GenerateIdnaTest.java
@@ -1,7 +1,7 @@
 package org.unicode.idna;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.DateFormat;
diff --git a/unicodetools/src/main/java/org/unicode/idna/Idna.java b/unicodetools/src/main/java/org/unicode/idna/Idna.java
index 68951bab0..444ba6f2c 100644
--- a/unicodetools/src/main/java/org/unicode/idna/Idna.java
+++ b/unicodetools/src/main/java/org/unicode/idna/Idna.java
@@ -1,6 +1,6 @@
 package org.unicode.idna;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.StringPrepParseException;
 import com.ibm.icu.text.StringTransform;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/idna/Idna2008.java b/unicodetools/src/main/java/org/unicode/idna/Idna2008.java
index 657dece84..43bd8aa1a 100644
--- a/unicodetools/src/main/java/org/unicode/idna/Idna2008.java
+++ b/unicodetools/src/main/java/org/unicode/idna/Idna2008.java
@@ -1,6 +1,6 @@
 package org.unicode.idna;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 
diff --git a/unicodetools/src/main/java/org/unicode/idna/Idna2008t.java b/unicodetools/src/main/java/org/unicode/idna/Idna2008t.java
index 720171a78..eb723fc83 100644
--- a/unicodetools/src/main/java/org/unicode/idna/Idna2008t.java
+++ b/unicodetools/src/main/java/org/unicode/idna/Idna2008t.java
@@ -1,6 +1,6 @@
 package org.unicode.idna;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
diff --git a/unicodetools/src/main/java/org/unicode/idna/StringPrepData.java b/unicodetools/src/main/java/org/unicode/idna/StringPrepData.java
index a17c398b6..bf8ef971b 100644
--- a/unicodetools/src/main/java/org/unicode/idna/StringPrepData.java
+++ b/unicodetools/src/main/java/org/unicode/idna/StringPrepData.java
@@ -1,7 +1,7 @@
 /** */
 package org.unicode.idna;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/jsp/ICUPropertyFactory.java b/unicodetools/src/main/java/org/unicode/jsp/ICUPropertyFactory.java
index 7e80548d0..2e2cd597f 100644
--- a/unicodetools/src/main/java/org/unicode/jsp/ICUPropertyFactory.java
+++ b/unicodetools/src/main/java/org/unicode/jsp/ICUPropertyFactory.java
@@ -6,9 +6,9 @@
  */
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.text.Normalizer;
diff --git a/unicodetools/src/main/java/org/unicode/jsp/XIDModifications.java b/unicodetools/src/main/java/org/unicode/jsp/XIDModifications.java
index 3b6320061..df4a2e1ad 100644
--- a/unicodetools/src/main/java/org/unicode/jsp/XIDModifications.java
+++ b/unicodetools/src/main/java/org/unicode/jsp/XIDModifications.java
@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 
 public class XIDModifications {
diff --git a/unicodetools/src/main/java/org/unicode/props/DefaultValues.java b/unicodetools/src/main/java/org/unicode/props/DefaultValues.java
index 6a8ec9356..8e50c08d3 100644
--- a/unicodetools/src/main/java/org/unicode/props/DefaultValues.java
+++ b/unicodetools/src/main/java/org/unicode/props/DefaultValues.java
@@ -1,6 +1,6 @@
 package org.unicode.props;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.VersionInfo;
 import org.unicode.props.UcdPropertyValues.Bidi_Class_Values;
diff --git a/unicodetools/src/main/java/org/unicode/props/IndexUnicodeProperties.java b/unicodetools/src/main/java/org/unicode/props/IndexUnicodeProperties.java
index ad1479668..99a07d908 100644
--- a/unicodetools/src/main/java/org/unicode/props/IndexUnicodeProperties.java
+++ b/unicodetools/src/main/java/org/unicode/props/IndexUnicodeProperties.java
@@ -4,8 +4,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.Normalizer2;
 import com.ibm.icu.text.Transform;
diff --git a/unicodetools/src/main/java/org/unicode/props/NormalizationDataIUP.java b/unicodetools/src/main/java/org/unicode/props/NormalizationDataIUP.java
index db95f1418..b5ee40f4c 100644
--- a/unicodetools/src/main/java/org/unicode/props/NormalizationDataIUP.java
+++ b/unicodetools/src/main/java/org/unicode/props/NormalizationDataIUP.java
@@ -1,6 +1,6 @@
 package org.unicode.props;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.VersionInfo;
diff --git a/unicodetools/src/main/java/org/unicode/props/PropNormalizationData.java b/unicodetools/src/main/java/org/unicode/props/PropNormalizationData.java
index 0c220ca02..631424724 100644
--- a/unicodetools/src/main/java/org/unicode/props/PropNormalizationData.java
+++ b/unicodetools/src/main/java/org/unicode/props/PropNormalizationData.java
@@ -1,6 +1,6 @@
 package org.unicode.props;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.BitSet;
diff --git a/unicodetools/src/main/java/org/unicode/props/PropertyLister.java b/unicodetools/src/main/java/org/unicode/props/PropertyLister.java
index 583d0fd6e..04e5ac221 100644
--- a/unicodetools/src/main/java/org/unicode/props/PropertyLister.java
+++ b/unicodetools/src/main/java/org/unicode/props/PropertyLister.java
@@ -1,8 +1,8 @@
 package org.unicode.props;
 
 import com.google.common.base.Objects;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/props/PropertyParsingInfo.java b/unicodetools/src/main/java/org/unicode/props/PropertyParsingInfo.java
index 6c794380e..7698cc914 100644
--- a/unicodetools/src/main/java/org/unicode/props/PropertyParsingInfo.java
+++ b/unicodetools/src/main/java/org/unicode/props/PropertyParsingInfo.java
@@ -1,8 +1,8 @@
 package org.unicode.props;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Normalizer2;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/props/PropertyUtilities.java b/unicodetools/src/main/java/org/unicode/props/PropertyUtilities.java
index 9b8019062..383420ccd 100644
--- a/unicodetools/src/main/java/org/unicode/props/PropertyUtilities.java
+++ b/unicodetools/src/main/java/org/unicode/props/PropertyUtilities.java
@@ -1,6 +1,6 @@
 package org.unicode.props;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Collection;
 import java.util.Map;
diff --git a/unicodetools/src/main/java/org/unicode/props/PropertyValueSets.java b/unicodetools/src/main/java/org/unicode/props/PropertyValueSets.java
index 2c0658e01..03e389ca2 100644
--- a/unicodetools/src/main/java/org/unicode/props/PropertyValueSets.java
+++ b/unicodetools/src/main/java/org/unicode/props/PropertyValueSets.java
@@ -1,7 +1,7 @@
 package org.unicode.props;
 
 import com.google.common.collect.ImmutableSortedSet;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/unicodetools/src/main/java/org/unicode/props/RandomStringGenerator.java b/unicodetools/src/main/java/org/unicode/props/RandomStringGenerator.java
index b93e4ee52..aed733d00 100644
--- a/unicodetools/src/main/java/org/unicode/props/RandomStringGenerator.java
+++ b/unicodetools/src/main/java/org/unicode/props/RandomStringGenerator.java
@@ -8,7 +8,7 @@
  */
 package org.unicode.props;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.ArrayList;
diff --git a/unicodetools/src/main/java/org/unicode/props/ScriptInfo.java b/unicodetools/src/main/java/org/unicode/props/ScriptInfo.java
index 9c1ee309d..93e17d71f 100644
--- a/unicodetools/src/main/java/org/unicode/props/ScriptInfo.java
+++ b/unicodetools/src/main/java/org/unicode/props/ScriptInfo.java
@@ -1,6 +1,6 @@
 package org.unicode.props;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Collections;
 import java.util.EnumMap;
diff --git a/unicodetools/src/main/java/org/unicode/props/ShimUnicodePropertyFactory.java b/unicodetools/src/main/java/org/unicode/props/ShimUnicodePropertyFactory.java
index 86eb5c2db..b8c0d0bed 100644
--- a/unicodetools/src/main/java/org/unicode/props/ShimUnicodePropertyFactory.java
+++ b/unicodetools/src/main/java/org/unicode/props/ShimUnicodePropertyFactory.java
@@ -1,6 +1,6 @@
 package org.unicode.props;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.locale.XCldrStub.Splitter;
 import com.ibm.icu.text.NumberFormat;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java b/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
index b0bd5c892..26e36651c 100644
--- a/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
+++ b/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
@@ -7,7 +7,7 @@
 package org.unicode.props;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.SymbolTable;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/props/UnicodeRelation.java b/unicodetools/src/main/java/org/unicode/props/UnicodeRelation.java
index 75e5d9e83..3642b86cb 100644
--- a/unicodetools/src/main/java/org/unicode/props/UnicodeRelation.java
+++ b/unicodetools/src/main/java/org/unicode/props/UnicodeRelation.java
@@ -1,7 +1,7 @@
 package org.unicode.props;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.Freezable;
 import java.util.Collection;
diff --git a/unicodetools/src/main/java/org/unicode/temp/UnicodePropertyX.java b/unicodetools/src/main/java/org/unicode/temp/UnicodePropertyX.java
index a640b2531..cb16e493c 100644
--- a/unicodetools/src/main/java/org/unicode/temp/UnicodePropertyX.java
+++ b/unicodetools/src/main/java/org/unicode/temp/UnicodePropertyX.java
@@ -6,7 +6,7 @@
  */
 package org.unicode.temp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.List;
 import org.unicode.props.UnicodeProperty;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCA/RadicalStroke.java b/unicodetools/src/main/java/org/unicode/text/UCA/RadicalStroke.java
index 79b011211..fb69d90bb 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCA/RadicalStroke.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCA/RadicalStroke.java
@@ -1,6 +1,6 @@
 package org.unicode.text.UCA;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSetIterator;
 import java.io.IOException;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCA/Validity.java b/unicodetools/src/main/java/org/unicode/text/UCA/Validity.java
index 67c9a9f25..a9894edaa 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCA/Validity.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCA/Validity.java
@@ -1,7 +1,7 @@
 package org.unicode.text.UCA;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.CanonicalIterator;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/DerivedProperty.java b/unicodetools/src/main/java/org/unicode/text/UCD/DerivedProperty.java
index 62a6e3ecf..3595200be 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/DerivedProperty.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/DerivedProperty.java
@@ -9,7 +9,7 @@
  */
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.PrintWriter;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateBreakTest.java b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateBreakTest.java
index 651ad8ded..3b9f2f61b 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateBreakTest.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateBreakTest.java
@@ -9,7 +9,7 @@
  */
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Transliterator;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateConfusables.java b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateConfusables.java
index f3001ed3f..c19e670cc 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateConfusables.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateConfusables.java
@@ -11,9 +11,9 @@
 package org.unicode.text.UCD;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.Transform;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateConfusablesCopy.java b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateConfusablesCopy.java
index 0c42217fe..98223af55 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateConfusablesCopy.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateConfusablesCopy.java
@@ -11,10 +11,10 @@
 package org.unicode.text.UCD;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.Transform;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateHanTransliterator.java b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateHanTransliterator.java
index 2d2715e12..acc94105d 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateHanTransliterator.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateHanTransliterator.java
@@ -9,7 +9,7 @@
  */
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.Replaceable;
 import com.ibm.icu.text.ReplaceableString;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateStringPrep.java b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateStringPrep.java
index b7b788192..5733c5e1e 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/GenerateStringPrep.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/GenerateStringPrep.java
@@ -1,7 +1,7 @@
 package org.unicode.text.UCD;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.IDNA;
 import com.ibm.icu.text.StringPrepParseException;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/GetTypology.java b/unicodetools/src/main/java/org/unicode/text/UCD/GetTypology.java
index 82ba1a083..e9468e560 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/GetTypology.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/GetTypology.java
@@ -1,7 +1,7 @@
 package org.unicode.text.UCD;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/IdentifierInfo.java b/unicodetools/src/main/java/org/unicode/text/UCD/IdentifierInfo.java
index aa80c7fd3..872c148d0 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/IdentifierInfo.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/IdentifierInfo.java
@@ -4,7 +4,7 @@
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.locale.XCldrStub.ImmutableSet;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/MakeUnicodeFiles.java b/unicodetools/src/main/java/org/unicode/text/UCD/MakeUnicodeFiles.java
index faf7eb73c..7eabf498c 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/MakeUnicodeFiles.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/MakeUnicodeFiles.java
@@ -1,8 +1,8 @@
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R3;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.NumberFormat;
 import com.ibm.icu.text.RuleBasedCollator;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/NamesList.java b/unicodetools/src/main/java/org/unicode/text/UCD/NamesList.java
index abacb9753..ebf5136d1 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/NamesList.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/NamesList.java
@@ -1,7 +1,7 @@
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Transform;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/Normalizer.java b/unicodetools/src/main/java/org/unicode/text/UCD/Normalizer.java
index 77a39c308..e27edf5cd 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/Normalizer.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/Normalizer.java
@@ -9,7 +9,7 @@
  */
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Transform;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/QuickTest.java b/unicodetools/src/main/java/org/unicode/text/UCD/QuickTest.java
index 6a54b204f..ffab9f1fd 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/QuickTest.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/QuickTest.java
@@ -9,7 +9,7 @@
  */
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/ScriptExtensions.java b/unicodetools/src/main/java/org/unicode/text/UCD/ScriptExtensions.java
index 4188863a6..c15ec0638 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/ScriptExtensions.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/ScriptExtensions.java
@@ -1,7 +1,7 @@
 package org.unicode.text.UCD;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.BitSet;
 import java.util.Collection;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/TestData.java b/unicodetools/src/main/java/org/unicode/text/UCD/TestData.java
index 462cae972..9586f3df4 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/TestData.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/TestData.java
@@ -9,7 +9,7 @@
  */
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.DecimalFormat;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/TestIdentifiers.java b/unicodetools/src/main/java/org/unicode/text/UCD/TestIdentifiers.java
index 59916a2d5..a7713830f 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/TestIdentifiers.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/TestIdentifiers.java
@@ -1,6 +1,6 @@
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UScript;
 import com.ibm.icu.text.Normalizer;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/TestUnicodeInvariants.java b/unicodetools/src/main/java/org/unicode/text/UCD/TestUnicodeInvariants.java
index d2306ef2c..a379034d3 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/TestUnicodeInvariants.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/TestUnicodeInvariants.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Strings;
 import com.ibm.icu.dev.tool.UOption;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.NumberFormat;
 import com.ibm.icu.text.Transliterator;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/ToolUnicodePropertySource.java b/unicodetools/src/main/java/org/unicode/text/UCD/ToolUnicodePropertySource.java
index ef3e215a6..e9b28d088 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/ToolUnicodePropertySource.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/ToolUnicodePropertySource.java
@@ -1,7 +1,7 @@
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.IDNA;
 import com.ibm.icu.text.NumberFormat;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/UCD.java b/unicodetools/src/main/java/org/unicode/text/UCD/UCD.java
index aea58d0b2..80bafc9f4 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/UCD.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/UCD.java
@@ -9,7 +9,7 @@
  */
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Transliterator;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/UnicodeMapParser.java b/unicodetools/src/main/java/org/unicode/text/UCD/UnicodeMapParser.java
index f9eb8a92e..b527fbfdc 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/UnicodeMapParser.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/UnicodeMapParser.java
@@ -1,7 +1,7 @@
 package org.unicode.text.UCD;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSet.XSymbolTable;
 import com.ibm.icu.util.Output;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/CLDRCharacterUtility.java b/unicodetools/src/main/java/org/unicode/text/tools/CLDRCharacterUtility.java
index ad50854d4..3160a6634 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/CLDRCharacterUtility.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/CLDRCharacterUtility.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Collections;
 import java.util.LinkedHashSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/CheckFonts.java b/unicodetools/src/main/java/org/unicode/text/tools/CheckFonts.java
index 5f70ffa51..13696f18c 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/CheckFonts.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/CheckFonts.java
@@ -1,7 +1,7 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.UnicodeSet;
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/CheckHan.java b/unicodetools/src/main/java/org/unicode/text/tools/CheckHan.java
index ea697f096..31215863c 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/CheckHan.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/CheckHan.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/CheckSecurityProposals.java b/unicodetools/src/main/java/org/unicode/text/tools/CheckSecurityProposals.java
index 0acfd59e2..c79c77adc 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/CheckSecurityProposals.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/CheckSecurityProposals.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.LinkedHashMultimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/CompareIDNA.java b/unicodetools/src/main/java/org/unicode/text/tools/CompareIDNA.java
index 23b66707d..3ab8cea1e 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/CompareIDNA.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/CompareIDNA.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.VersionInfo;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/CompareProperties.java b/unicodetools/src/main/java/org/unicode/text/tools/CompareProperties.java
index a0aa5f6cc..4ec387110 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/CompareProperties.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/CompareProperties.java
@@ -1,8 +1,8 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.HashMap;
 import java.util.List;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/CompareScriptExtensions.java b/unicodetools/src/main/java/org/unicode/text/tools/CompareScriptExtensions.java
index bd9b2ed2d..39d834e3b 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/CompareScriptExtensions.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/CompareScriptExtensions.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UScript;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.TreeSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/GenerateRadicals.java b/unicodetools/src/main/java/org/unicode/text/tools/GenerateRadicals.java
index 857f7d200..850748a0c 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/GenerateRadicals.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/GenerateRadicals.java
@@ -1,8 +1,8 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row.R5;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.Normalizer2;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/IcannMsr.java b/unicodetools/src/main/java/org/unicode/text/tools/IcannMsr.java
index 6dd475ee4..22a2f92b9 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/IcannMsr.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/IcannMsr.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.text.Collator;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/NamesListPrint.java b/unicodetools/src/main/java/org/unicode/text/tools/NamesListPrint.java
index 8967d2be3..cd868f3da 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/NamesListPrint.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/NamesListPrint.java
@@ -1,7 +1,7 @@
 package org.unicode.text.tools;
 
 import com.google.common.base.Objects;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.HashSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/NotoCoverage.java b/unicodetools/src/main/java/org/unicode/text/tools/NotoCoverage.java
index b711fc5f7..6b75f9828 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/NotoCoverage.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/NotoCoverage.java
@@ -1,7 +1,7 @@
 package org.unicode.text.tools;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.List;
 import org.unicode.cldr.draft.FileUtilities;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/OldEmojiProcessing.java b/unicodetools/src/main/java/org/unicode/text/tools/OldEmojiProcessing.java
index 3094e5934..beab83e12 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/OldEmojiProcessing.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/OldEmojiProcessing.java
@@ -1,7 +1,7 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row;
+import com.ibm.icu.impl.UnicodeMap;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/PropertyChanges.java b/unicodetools/src/main/java/org/unicode/text/tools/PropertyChanges.java
index 3eb2e2b78..68ef9a63f 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/PropertyChanges.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/PropertyChanges.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/RegexBuilder.java b/unicodetools/src/main/java/org/unicode/text/tools/RegexBuilder.java
index c5e119436..b95eeb019 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/RegexBuilder.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/RegexBuilder.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/ScriptPopulation.java b/unicodetools/src/main/java/org/unicode/text/tools/ScriptPopulation.java
index 2e4803e68..bc0f56025 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/ScriptPopulation.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/ScriptPopulation.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.lang.UScript;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/ShowCharacterFrequency.java b/unicodetools/src/main/java/org/unicode/text/tools/ShowCharacterFrequency.java
index ca5b76e59..23e1d2e02 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/ShowCharacterFrequency.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/ShowCharacterFrequency.java
@@ -1,7 +1,7 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Locale;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/ShowCharacters.java b/unicodetools/src/main/java/org/unicode/text/tools/ShowCharacters.java
index c9e2cf8db..c8980ad08 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/ShowCharacters.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/ShowCharacters.java
@@ -1,9 +1,9 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R3;
 import com.ibm.icu.impl.Row.R5;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSetIterator;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/SimplifiedAndTraditional.java b/unicodetools/src/main/java/org/unicode/text/tools/SimplifiedAndTraditional.java
index ee2e257e0..07c069311 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/SimplifiedAndTraditional.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/SimplifiedAndTraditional.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/StringTree.java b/unicodetools/src/main/java/org/unicode/text/tools/StringTree.java
index 62e52015c..ef8c1de6f 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/StringTree.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/StringTree.java
@@ -2,8 +2,8 @@
 
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.Transliterator;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSetIterator;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/VerifyIdna.java b/unicodetools/src/main/java/org/unicode/text/tools/VerifyIdna.java
index c397ab3e9..562873707 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/VerifyIdna.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/VerifyIdna.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Normalizer;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/VerifyUCD.java b/unicodetools/src/main/java/org/unicode/text/tools/VerifyUCD.java
index 1ba6179fa..4a95c9b9b 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/VerifyUCD.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/VerifyUCD.java
@@ -1,6 +1,6 @@
 package org.unicode.text.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSetIterator;
diff --git a/unicodetools/src/main/java/org/unicode/text/tools/XIDModifications.java b/unicodetools/src/main/java/org/unicode/text/tools/XIDModifications.java
index 7dec54db8..3970a33b4 100644
--- a/unicodetools/src/main/java/org/unicode/text/tools/XIDModifications.java
+++ b/unicodetools/src/main/java/org/unicode/text/tools/XIDModifications.java
@@ -1,7 +1,7 @@
 package org.unicode.text.tools;
 
 import com.google.common.collect.ImmutableSet;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.util.VersionInfo;
 import java.io.File;
 import java.util.Collections;
diff --git a/unicodetools/src/main/java/org/unicode/text/utility/ComparisonNormalizer.java b/unicodetools/src/main/java/org/unicode/text/utility/ComparisonNormalizer.java
index 51a9ec393..a0d7dd534 100644
--- a/unicodetools/src/main/java/org/unicode/text/utility/ComparisonNormalizer.java
+++ b/unicodetools/src/main/java/org/unicode/text/utility/ComparisonNormalizer.java
@@ -1,7 +1,7 @@
 package org.unicode.text.utility;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.CollationElementIterator;
 import com.ibm.icu.text.Collator;
diff --git a/unicodetools/src/main/java/org/unicode/text/utility/TestUtility.java b/unicodetools/src/main/java/org/unicode/text/utility/TestUtility.java
index 83fcb07a5..5b066978a 100644
--- a/unicodetools/src/main/java/org/unicode/text/utility/TestUtility.java
+++ b/unicodetools/src/main/java/org/unicode/text/utility/TestUtility.java
@@ -9,8 +9,8 @@
  */
 package org.unicode.text.utility;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMapIterator;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMapIterator;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSetIterator;
diff --git a/unicodetools/src/main/java/org/unicode/text/utility/Utility.java b/unicodetools/src/main/java/org/unicode/text/utility/Utility.java
index 7f9d238c4..3db496604 100644
--- a/unicodetools/src/main/java/org/unicode/text/utility/Utility.java
+++ b/unicodetools/src/main/java/org/unicode/text/utility/Utility.java
@@ -10,7 +10,7 @@
 package org.unicode.text.utility;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.Replaceable;
 import com.ibm.icu.text.Transliterator;
diff --git a/unicodetools/src/main/java/org/unicode/tools/AacOrder.java b/unicodetools/src/main/java/org/unicode/tools/AacOrder.java
index f3e5080db..cfd7fd075 100644
--- a/unicodetools/src/main/java/org/unicode/tools/AacOrder.java
+++ b/unicodetools/src/main/java/org/unicode/tools/AacOrder.java
@@ -1,7 +1,7 @@
 package org.unicode.tools;
 
 import com.google.common.collect.ImmutableSet;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/tools/CheckEmojiProps.java b/unicodetools/src/main/java/org/unicode/tools/CheckEmojiProps.java
index f87119081..d0042054a 100644
--- a/unicodetools/src/main/java/org/unicode/tools/CheckEmojiProps.java
+++ b/unicodetools/src/main/java/org/unicode/tools/CheckEmojiProps.java
@@ -1,6 +1,6 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSet.EntryRange;
diff --git a/unicodetools/src/main/java/org/unicode/tools/CollatorEquivalences.java b/unicodetools/src/main/java/org/unicode/tools/CollatorEquivalences.java
index 5bd64e25b..19daf845d 100644
--- a/unicodetools/src/main/java/org/unicode/tools/CollatorEquivalences.java
+++ b/unicodetools/src/main/java/org/unicode/tools/CollatorEquivalences.java
@@ -1,7 +1,7 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
diff --git a/unicodetools/src/main/java/org/unicode/tools/CollatorEquivalencesNew.java b/unicodetools/src/main/java/org/unicode/tools/CollatorEquivalencesNew.java
index e537f1e90..278bd1a52 100644
--- a/unicodetools/src/main/java/org/unicode/tools/CollatorEquivalencesNew.java
+++ b/unicodetools/src/main/java/org/unicode/tools/CollatorEquivalencesNew.java
@@ -1,7 +1,7 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 // import com.ibm.icu.text.CollationElementIterator;
 // import com.ibm.icu.text.Collator;
diff --git a/unicodetools/src/main/java/org/unicode/tools/Confusables.java b/unicodetools/src/main/java/org/unicode/tools/Confusables.java
index ce6afed0d..5c9225be9 100644
--- a/unicodetools/src/main/java/org/unicode/tools/Confusables.java
+++ b/unicodetools/src/main/java/org/unicode/tools/Confusables.java
@@ -1,7 +1,7 @@
 package org.unicode.tools;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.Freezable;
diff --git a/unicodetools/src/main/java/org/unicode/tools/ExtendedPictographic.java b/unicodetools/src/main/java/org/unicode/tools/ExtendedPictographic.java
index 367cd4b30..879a77958 100644
--- a/unicodetools/src/main/java/org/unicode/tools/ExtendedPictographic.java
+++ b/unicodetools/src/main/java/org/unicode/tools/ExtendedPictographic.java
@@ -1,6 +1,6 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSet.EntryRange;
diff --git a/unicodetools/src/main/java/org/unicode/tools/FixedProps.java b/unicodetools/src/main/java/org/unicode/tools/FixedProps.java
index 9bf9ce253..511a6f6ad 100644
--- a/unicodetools/src/main/java/org/unicode/tools/FixedProps.java
+++ b/unicodetools/src/main/java/org/unicode/tools/FixedProps.java
@@ -1,7 +1,7 @@
 package org.unicode.tools;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/tools/GenerateNormalizeForMatch.java b/unicodetools/src/main/java/org/unicode/tools/GenerateNormalizeForMatch.java
index 4a1673b3f..67566074c 100644
--- a/unicodetools/src/main/java/org/unicode/tools/GenerateNormalizeForMatch.java
+++ b/unicodetools/src/main/java/org/unicode/tools/GenerateNormalizeForMatch.java
@@ -5,8 +5,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/tools/GenerateRadicalEnum.java b/unicodetools/src/main/java/org/unicode/tools/GenerateRadicalEnum.java
index 904bfc8ac..fc2806078 100644
--- a/unicodetools/src/main/java/org/unicode/tools/GenerateRadicalEnum.java
+++ b/unicodetools/src/main/java/org/unicode/tools/GenerateRadicalEnum.java
@@ -1,6 +1,6 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.RuleBasedCollator;
 import com.ibm.icu.util.ULocale;
diff --git a/unicodetools/src/main/java/org/unicode/tools/GenerateXIDModSets.java b/unicodetools/src/main/java/org/unicode/tools/GenerateXIDModSets.java
index a25fb7c8c..afacae414 100644
--- a/unicodetools/src/main/java/org/unicode/tools/GenerateXIDModSets.java
+++ b/unicodetools/src/main/java/org/unicode/tools/GenerateXIDModSets.java
@@ -1,6 +1,6 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Locale;
 import org.unicode.jsp.XIDModifications;
diff --git a/unicodetools/src/main/java/org/unicode/tools/Ids.java b/unicodetools/src/main/java/org/unicode/tools/Ids.java
index 6980657b1..fc8996538 100644
--- a/unicodetools/src/main/java/org/unicode/tools/Ids.java
+++ b/unicodetools/src/main/java/org/unicode/tools/Ids.java
@@ -2,11 +2,11 @@
 
 import com.google.common.collect.ComparisonChain;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.lang.UCharacter;
diff --git a/unicodetools/src/main/java/org/unicode/tools/IdsFileData.java b/unicodetools/src/main/java/org/unicode/tools/IdsFileData.java
index de98567ac..bd5ba1795 100644
--- a/unicodetools/src/main/java/org/unicode/tools/IdsFileData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/IdsFileData.java
@@ -2,8 +2,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.ICUException;
diff --git a/unicodetools/src/main/java/org/unicode/tools/ListProps.java b/unicodetools/src/main/java/org/unicode/tools/ListProps.java
index 8efacca79..cef92cb71 100644
--- a/unicodetools/src/main/java/org/unicode/tools/ListProps.java
+++ b/unicodetools/src/main/java/org/unicode/tools/ListProps.java
@@ -5,7 +5,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.File;
diff --git a/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatch.java b/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatch.java
index 83ee4cd8a..7d59ccfeb 100644
--- a/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatch.java
+++ b/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatch.java
@@ -1,7 +1,7 @@
 package org.unicode.tools;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.util.ICUUncheckedIOException;
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/unicodetools/src/main/java/org/unicode/tools/Normalizer3.java b/unicodetools/src/main/java/org/unicode/tools/Normalizer3.java
index 42d7fcd28..b26197639 100644
--- a/unicodetools/src/main/java/org/unicode/tools/Normalizer3.java
+++ b/unicodetools/src/main/java/org/unicode/tools/Normalizer3.java
@@ -1,6 +1,6 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Transform;
 import org.unicode.props.IndexUnicodeProperties;
 import org.unicode.props.UcdProperty;
diff --git a/unicodetools/src/main/java/org/unicode/tools/Quick.java b/unicodetools/src/main/java/org/unicode/tools/Quick.java
index dda018140..b2faae2b8 100644
--- a/unicodetools/src/main/java/org/unicode/tools/Quick.java
+++ b/unicodetools/src/main/java/org/unicode/tools/Quick.java
@@ -1,6 +1,6 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/unicodetools/src/main/java/org/unicode/tools/RadicalStroke.java b/unicodetools/src/main/java/org/unicode/tools/RadicalStroke.java
index a1340dfca..f9c0d1552 100644
--- a/unicodetools/src/main/java/org/unicode/tools/RadicalStroke.java
+++ b/unicodetools/src/main/java/org/unicode/tools/RadicalStroke.java
@@ -1,6 +1,6 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.BufferedReader;
 import java.io.FileReader;
diff --git a/unicodetools/src/main/java/org/unicode/tools/ScriptDetector.java b/unicodetools/src/main/java/org/unicode/tools/ScriptDetector.java
index 640df0649..125be3af8 100644
--- a/unicodetools/src/main/java/org/unicode/tools/ScriptDetector.java
+++ b/unicodetools/src/main/java/org/unicode/tools/ScriptDetector.java
@@ -1,7 +1,7 @@
 package org.unicode.tools;
 
 import com.google.common.base.Joiner;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Collections;
diff --git a/unicodetools/src/main/java/org/unicode/tools/Segmenter.java b/unicodetools/src/main/java/org/unicode/tools/Segmenter.java
index 261787838..9fc1c24a8 100644
--- a/unicodetools/src/main/java/org/unicode/tools/Segmenter.java
+++ b/unicodetools/src/main/java/org/unicode/tools/Segmenter.java
@@ -11,7 +11,7 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.NumberFormat;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/tools/ShowScriptCategories.java b/unicodetools/src/main/java/org/unicode/tools/ShowScriptCategories.java
index f1073e22b..0599d11b3 100644
--- a/unicodetools/src/main/java/org/unicode/tools/ShowScriptCategories.java
+++ b/unicodetools/src/main/java/org/unicode/tools/ShowScriptCategories.java
@@ -1,7 +1,7 @@
 package org.unicode.tools;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.LocaleDisplayNames;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.ULocale;
diff --git a/unicodetools/src/main/java/org/unicode/tools/Unilex.java b/unicodetools/src/main/java/org/unicode/tools/Unilex.java
index 725d85369..cc640e08e 100644
--- a/unicodetools/src/main/java/org/unicode/tools/Unilex.java
+++ b/unicodetools/src/main/java/org/unicode/tools/Unilex.java
@@ -10,8 +10,8 @@
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.Normalizer2;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/BirthInfo.java b/unicodetools/src/main/java/org/unicode/tools/emoji/BirthInfo.java
index bc41e8148..476a317bf 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/BirthInfo.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/BirthInfo.java
@@ -1,7 +1,7 @@
 package org.unicode.tools.emoji;
 
 import com.google.common.collect.ImmutableMap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.VersionInfo;
 import java.util.Collections;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/CandidateData.java b/unicodetools/src/main/java/org/unicode/tools/emoji/CandidateData.java
index 7a2ba3ed2..6311dca9e 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/CandidateData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/CandidateData.java
@@ -8,7 +8,7 @@
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.locale.XCldrStub.ImmutableMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.lang.UCharacter;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/CarrierGlyphs.java b/unicodetools/src/main/java/org/unicode/tools/emoji/CarrierGlyphs.java
index bfd0b1d31..96e929ac7 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/CarrierGlyphs.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/CarrierGlyphs.java
@@ -1,6 +1,6 @@
 package org.unicode.tools.emoji;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Transform;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/CountEmoji.java b/unicodetools/src/main/java/org/unicode/tools/emoji/CountEmoji.java
index 024a485dc..43433ef5f 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/CountEmoji.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/CountEmoji.java
@@ -6,7 +6,7 @@
 import com.google.common.collect.Ordering;
 import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.PrintWriter;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/Emoji.java b/unicodetools/src/main/java/org/unicode/tools/emoji/Emoji.java
index 3f0bdecf1..c96ceaa0b 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/Emoji.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/Emoji.java
@@ -3,8 +3,8 @@
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.LocaleDisplayNames;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java
index 798f497c2..a6e500b8a 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java
@@ -1,7 +1,7 @@
 package org.unicode.tools.emoji;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.SimpleFormatter;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiData.java b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiData.java
index 72fd6442c..2868f58eb 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiData.java
@@ -7,7 +7,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.BreakIterator;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiDataSource.java b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiDataSource.java
index 5471591f4..cee534d6e 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiDataSource.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiDataSource.java
@@ -1,6 +1,6 @@
 package org.unicode.tools.emoji;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import org.unicode.tools.emoji.Emoji.Qualified;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiDataSourceCombined.java b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiDataSourceCombined.java
index f0d05ac1b..5f92448f0 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiDataSourceCombined.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiDataSourceCombined.java
@@ -1,6 +1,6 @@
 package org.unicode.tools.emoji;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.ICUException;
 import com.ibm.icu.util.ICUUncheckedIOException;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiFrequencyOld.java b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiFrequencyOld.java
index b565b935f..202c1f4b3 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiFrequencyOld.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiFrequencyOld.java
@@ -1,7 +1,7 @@
 package org.unicode.tools.emoji;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.NumberFormat;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiImageData.java b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiImageData.java
index e3d813cfa..1bb742980 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiImageData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiImageData.java
@@ -1,7 +1,7 @@
 package org.unicode.tools.emoji;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.Output;
 import com.ibm.icu.util.VersionInfo;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiOrder.java b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiOrder.java
index 7144f22e1..b67272e07 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiOrder.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiOrder.java
@@ -7,7 +7,7 @@
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UTF16.StringComparator;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateCldrData.java b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateCldrData.java
index c93b225a6..41b4ce42d 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateCldrData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateCldrData.java
@@ -3,7 +3,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.locale.XCldrStub.ImmutableSet;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.NumberFormat;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmoji.java b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmoji.java
index 074629a23..2e0b62fe4 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmoji.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmoji.java
@@ -10,10 +10,10 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Collator;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmojiData.java b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmojiData.java
index 391158d02..d6328f355 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmojiData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmojiData.java
@@ -1,7 +1,7 @@
 package org.unicode.tools.emoji;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.DateFormat;
 import com.ibm.icu.text.SimpleDateFormat;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateExtPict.java b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateExtPict.java
index 005a155da..560cf21d8 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateExtPict.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateExtPict.java
@@ -1,7 +1,7 @@
 package org.unicode.tools.emoji;
 
 import com.google.common.base.Objects;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateMissingAnnotations.java b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateMissingAnnotations.java
index b4ff79082..bd2efa20c 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateMissingAnnotations.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateMissingAnnotations.java
@@ -6,8 +6,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/GmailEmoji.java b/unicodetools/src/main/java/org/unicode/tools/emoji/GmailEmoji.java
index b23189007..d8b6455ca 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/GmailEmoji.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/GmailEmoji.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.ComparisonChain;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.IOException;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/ListAnnotations.java b/unicodetools/src/main/java/org/unicode/tools/emoji/ListAnnotations.java
index 53618f823..ea265d70c 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/ListAnnotations.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/ListAnnotations.java
@@ -1,6 +1,6 @@
 package org.unicode.tools.emoji;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import java.util.Set;
 import java.util.TreeSet;
 import org.unicode.cldr.util.Annotations;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/ListSegmentation.java b/unicodetools/src/main/java/org/unicode/tools/emoji/ListSegmentation.java
index c28d40cca..e149ad7c8 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/ListSegmentation.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/ListSegmentation.java
@@ -1,7 +1,7 @@
 package org.unicode.tools.emoji;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Arrays;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/OldAnnotationData.java b/unicodetools/src/main/java/org/unicode/tools/emoji/OldAnnotationData.java
index 60b0cafea..a81a0a627 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/OldAnnotationData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/OldAnnotationData.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Splitter;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.LocaleDisplayNames;
 import com.ibm.icu.text.LocaleDisplayNames.DialectHandling;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/ParseSpreadsheetAnnotations.java b/unicodetools/src/main/java/org/unicode/tools/emoji/ParseSpreadsheetAnnotations.java
index 52f648a2c..2708698f6 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/ParseSpreadsheetAnnotations.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/ParseSpreadsheetAnnotations.java
@@ -7,7 +7,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Normalizer2;
 import com.ibm.icu.text.Transform;
 import com.ibm.icu.text.Transliterator;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/ProposalData.java b/unicodetools/src/main/java/org/unicode/tools/emoji/ProposalData.java
index 665d63a5b..285010f0c 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/ProposalData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/ProposalData.java
@@ -6,7 +6,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/UnicodeFontData.java b/unicodetools/src/main/java/org/unicode/tools/emoji/UnicodeFontData.java
index 33b73439a..d523541d8 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/UnicodeFontData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/UnicodeFontData.java
@@ -1,6 +1,6 @@
 package org.unicode.tools.emoji;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
diff --git a/unicodetools/src/main/java/org/unicode/unused/CheckSystemFonts.java b/unicodetools/src/main/java/org/unicode/unused/CheckSystemFonts.java
index cc16535f5..42c19ba2e 100644
--- a/unicodetools/src/main/java/org/unicode/unused/CheckSystemFonts.java
+++ b/unicodetools/src/main/java/org/unicode/unused/CheckSystemFonts.java
@@ -8,11 +8,11 @@
  */
 package org.unicode.unused;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.Composer;
-import com.ibm.icu.dev.util.UnicodeMapIterator;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.Composer;
+import com.ibm.icu.impl.UnicodeMapIterator;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UScript;
diff --git a/unicodetools/src/main/java/org/unicode/unused/DataOutputCompressor.java b/unicodetools/src/main/java/org/unicode/unused/DataOutputCompressor.java
index d4151de8d..0ba8ae5f8 100644
--- a/unicodetools/src/main/java/org/unicode/unused/DataOutputCompressor.java
+++ b/unicodetools/src/main/java/org/unicode/unused/DataOutputCompressor.java
@@ -6,7 +6,7 @@
  */
 package org.unicode.unused;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import java.io.DataOutput;
 import java.io.IOException;
diff --git a/unicodetools/src/main/java/org/unicode/unused/GenerateUcaDecompositions.java b/unicodetools/src/main/java/org/unicode/unused/GenerateUcaDecompositions.java
index e36a51e51..aca903da4 100644
--- a/unicodetools/src/main/java/org/unicode/unused/GenerateUcaDecompositions.java
+++ b/unicodetools/src/main/java/org/unicode/unused/GenerateUcaDecompositions.java
@@ -1,7 +1,7 @@
 // Obsolete code. Moved here from org.unicode.text.UCA on 2014-apr-23 after svn r642.
 package org.unicode.unused;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.lang.UProperty.NameChoice;
diff --git a/unicodetools/src/test/java/org/unicode/draft/TestCompressed.java b/unicodetools/src/test/java/org/unicode/draft/TestCompressed.java
index 7a5c8dae5..3aea9efe0 100644
--- a/unicodetools/src/test/java/org/unicode/draft/TestCompressed.java
+++ b/unicodetools/src/test/java/org/unicode/draft/TestCompressed.java
@@ -1,6 +1,6 @@
 package org.unicode.draft;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.NumberFormat;
diff --git a/unicodetools/src/test/java/org/unicode/idna/TestIdna.java b/unicodetools/src/test/java/org/unicode/idna/TestIdna.java
index 51bfa3522..08648e7af 100644
--- a/unicodetools/src/test/java/org/unicode/idna/TestIdna.java
+++ b/unicodetools/src/test/java/org/unicode/idna/TestIdna.java
@@ -1,6 +1,6 @@
 package org.unicode.idna;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Normalizer2;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckCombiningMarks.java b/unicodetools/src/test/java/org/unicode/propstest/CheckCombiningMarks.java
index 2bf15cdac..ea36254d5 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckCombiningMarks.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckCombiningMarks.java
@@ -1,7 +1,7 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.ULocale;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckFaces.java b/unicodetools/src/test/java/org/unicode/propstest/CheckFaces.java
index 1b1129d30..b376342d0 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckFaces.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckFaces.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckGCB.java b/unicodetools/src/test/java/org/unicode/propstest/CheckGCB.java
index 1c0306043..fdc866094 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckGCB.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckGCB.java
@@ -2,7 +2,7 @@
 
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableSet;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.locale.XCldrStub.ImmutableMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckIndexVsToolUnicodeProperties.java b/unicodetools/src/test/java/org/unicode/propstest/CheckIndexVsToolUnicodeProperties.java
index 0e2ed455e..6719b3ddf 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckIndexVsToolUnicodeProperties.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckIndexVsToolUnicodeProperties.java
@@ -4,8 +4,8 @@
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Pair;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckNames.java b/unicodetools/src/test/java/org/unicode/propstest/CheckNames.java
index f50c71830..a4a2f4386 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckNames.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckNames.java
@@ -1,7 +1,7 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.HashMap;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckOtherPropsWithLineBreak.java b/unicodetools/src/test/java/org/unicode/propstest/CheckOtherPropsWithLineBreak.java
index 8bdc38e1e..1efb7f31e 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckOtherPropsWithLineBreak.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckOtherPropsWithLineBreak.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import org.unicode.props.IndexUnicodeProperties;
 import org.unicode.props.UcdProperty;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckProperties.java b/unicodetools/src/test/java/org/unicode/propstest/CheckProperties.java
index 629faa948..aa4624f5e 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckProperties.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckProperties.java
@@ -1,10 +1,10 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.Transliterator;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckPropertyStability.java b/unicodetools/src/test/java/org/unicode/propstest/CheckPropertyStability.java
index 8c9faa8ae..79e33784f 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckPropertyStability.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckPropertyStability.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Arrays;
 import org.unicode.props.IndexUnicodeProperties;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckRadicals.java b/unicodetools/src/test/java/org/unicode/propstest/CheckRadicals.java
index 28381ff07..3eb6fe04d 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckRadicals.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckRadicals.java
@@ -1,7 +1,7 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckScriptExtensions.java b/unicodetools/src/test/java/org/unicode/propstest/CheckScriptExtensions.java
index 807f08f13..ecef3f02e 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckScriptExtensions.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckScriptExtensions.java
@@ -1,8 +1,8 @@
 package org.unicode.propstest;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.EnumMap;
 import java.util.Map;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckXidmod.java b/unicodetools/src/test/java/org/unicode/propstest/CheckXidmod.java
index af43d7008..9856daa2c 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckXidmod.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckXidmod.java
@@ -1,7 +1,7 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.lang.UScript;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CheckXmlProperties.java b/unicodetools/src/test/java/org/unicode/propstest/CheckXmlProperties.java
index 56e5375e2..7223a15fc 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CheckXmlProperties.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CheckXmlProperties.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import org.unicode.cldr.util.Timer;
 import org.unicode.props.IndexUnicodeProperties;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/Collisions.java b/unicodetools/src/test/java/org/unicode/propstest/Collisions.java
index 9997f5bf8..acb2aef2b 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/Collisions.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/Collisions.java
@@ -2,7 +2,7 @@
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import java.util.Collection;
 import java.util.Set;
 import java.util.TreeSet;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CompareExemplarsToIdmod.java b/unicodetools/src/test/java/org/unicode/propstest/CompareExemplarsToIdmod.java
index da453d74f..abc67f7a6 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CompareExemplarsToIdmod.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CompareExemplarsToIdmod.java
@@ -1,7 +1,7 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.Normalizer2;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CompareSegmentationProperties.java b/unicodetools/src/test/java/org/unicode/propstest/CompareSegmentationProperties.java
index fdd089cdd..812ddea41 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CompareSegmentationProperties.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CompareSegmentationProperties.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import org.unicode.props.IndexUnicodeProperties;
 import org.unicode.props.UcdProperty;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/CompareVersionedProps.java b/unicodetools/src/test/java/org/unicode/propstest/CompareVersionedProps.java
index 456c372e6..51e5a7ed5 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/CompareVersionedProps.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/CompareVersionedProps.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.VersionInfo;
 import java.util.ArrayList;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/Emoji.java b/unicodetools/src/test/java/org/unicode/propstest/Emoji.java
index c2b193fbc..c85937fd4 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/Emoji.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/Emoji.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.EnumSet;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/FindProps.java b/unicodetools/src/test/java/org/unicode/propstest/FindProps.java
index 78494db31..a929f2fd0 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/FindProps.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/FindProps.java
@@ -1,7 +1,7 @@
 package org.unicode.propstest;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.Transform;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/ListAssignedWithDefaultValues.java b/unicodetools/src/test/java/org/unicode/propstest/ListAssignedWithDefaultValues.java
index a3df20a38..a683c3d9d 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/ListAssignedWithDefaultValues.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/ListAssignedWithDefaultValues.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Objects;
 import org.unicode.props.IndexUnicodeProperties;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/ListPropsNfcDiff.java b/unicodetools/src/test/java/org/unicode/propstest/ListPropsNfcDiff.java
index de4e8b41e..443336385 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/ListPropsNfcDiff.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/ListPropsNfcDiff.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Objects;
 import com.google.common.collect.TreeMultimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Collection;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/ListVariants.java b/unicodetools/src/test/java/org/unicode/propstest/ListVariants.java
index 8084feee4..35b665904 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/ListVariants.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/ListVariants.java
@@ -1,7 +1,7 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 import org.unicode.cldr.util.With;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/PropertyDemo.java b/unicodetools/src/test/java/org/unicode/propstest/PropertyDemo.java
index cf6071f2c..5405182fc 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/PropertyDemo.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/PropertyDemo.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.LinkedHashSet;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/PropertyGrowth.java b/unicodetools/src/test/java/org/unicode/propstest/PropertyGrowth.java
index 1bd6d941a..8f2437b72 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/PropertyGrowth.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/PropertyGrowth.java
@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.VersionInfo;
 import java.util.Collection;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/RegexWordBreak.java b/unicodetools/src/test/java/org/unicode/propstest/RegexWordBreak.java
index 4e9a742d0..f86b4acec 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/RegexWordBreak.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/RegexWordBreak.java
@@ -5,7 +5,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.TreeMultimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/ShowDifferences.java b/unicodetools/src/test/java/org/unicode/propstest/ShowDifferences.java
index f411ca394..805f31ff2 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/ShowDifferences.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/ShowDifferences.java
@@ -1,8 +1,8 @@
 package org.unicode.propstest;
 
 import com.google.common.base.Objects;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/ShowDuplicatePropertyValues.java b/unicodetools/src/test/java/org/unicode/propstest/ShowDuplicatePropertyValues.java
index 6836f0161..fdd27aab4 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/ShowDuplicatePropertyValues.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/ShowDuplicatePropertyValues.java
@@ -3,8 +3,8 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSet.EntryRange;
 import java.util.Collection;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/ShowScripts.java b/unicodetools/src/test/java/org/unicode/propstest/ShowScripts.java
index b401f3bd2..0ff989796 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/ShowScripts.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/ShowScripts.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/ShowStats.java b/unicodetools/src/test/java/org/unicode/propstest/ShowStats.java
index 2ddd8b701..a04658f24 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/ShowStats.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/ShowStats.java
@@ -1,8 +1,8 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.EnumMap;
 import java.util.EnumSet;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/ShowUnicodeSet.java b/unicodetools/src/test/java/org/unicode/propstest/ShowUnicodeSet.java
index fa1c2d5aa..3d55fbfb4 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/ShowUnicodeSet.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/ShowUnicodeSet.java
@@ -2,7 +2,7 @@
 
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.Ordering;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.locale.XCldrStub.Splitter;
 import com.ibm.icu.text.Normalizer2;
 import com.ibm.icu.text.Transliterator;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/TestCodePointMap.java b/unicodetools/src/test/java/org/unicode/propstest/TestCodePointMap.java
index 0e31d9c4b..335b48226 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/TestCodePointMap.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/TestCodePointMap.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import org.junit.jupiter.api.Test;
 import org.unicode.props.IndexUnicodeProperties;
 import org.unicode.props.UcdProperty;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/TestImmutableUnicodeMap.java b/unicodetools/src/test/java/org/unicode/propstest/TestImmutableUnicodeMap.java
index 601c1f15e..c59a9d0e7 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/TestImmutableUnicodeMap.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/TestImmutableUnicodeMap.java
@@ -1,8 +1,8 @@
 package org.unicode.propstest;
 
 import com.google.common.base.Objects;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.CodePointMap;
 import com.ibm.icu.util.CodePointMap.Range;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/TestInvariants.java b/unicodetools/src/test/java/org/unicode/propstest/TestInvariants.java
index 9548c6fc4..0150a0e23 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/TestInvariants.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/TestInvariants.java
@@ -1,7 +1,7 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/TestProperties.java b/unicodetools/src/test/java/org/unicode/propstest/TestProperties.java
index f1dff00ac..f341644cd 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/TestProperties.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/TestProperties.java
@@ -1,8 +1,8 @@
 package org.unicode.propstest;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.NumberFormat;
 import com.ibm.icu.text.Transform;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/TestPropertyAccess.java b/unicodetools/src/test/java/org/unicode/propstest/TestPropertyAccess.java
index a4e7aaef5..cd2253888 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/TestPropertyAccess.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/TestPropertyAccess.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import java.util.Collection;
 import org.junit.jupiter.api.Test;
 import org.unicode.props.GenerateEnums;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/TestScriptMetadata.java b/unicodetools/src/test/java/org/unicode/propstest/TestScriptMetadata.java
index 9cbabbde0..dd6212767 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/TestScriptMetadata.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/TestScriptMetadata.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.BitSet;
diff --git a/unicodetools/src/test/java/org/unicode/propstest/XMLProperties.java b/unicodetools/src/test/java/org/unicode/propstest/XMLProperties.java
index b89bd08c5..836d1d63e 100644
--- a/unicodetools/src/test/java/org/unicode/propstest/XMLProperties.java
+++ b/unicodetools/src/test/java/org/unicode/propstest/XMLProperties.java
@@ -1,6 +1,6 @@
 package org.unicode.propstest;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/unicodetools/src/test/java/org/unicode/test/CaseBitTest.java b/unicodetools/src/test/java/org/unicode/test/CaseBitTest.java
index 7b5875f66..3de40862d 100644
--- a/unicodetools/src/test/java/org/unicode/test/CaseBitTest.java
+++ b/unicodetools/src/test/java/org/unicode/test/CaseBitTest.java
@@ -1,9 +1,9 @@
 package org.unicode.test;
 
-import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row;
 import com.ibm.icu.impl.Row.R2;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import java.io.IOException;
diff --git a/unicodetools/src/test/java/org/unicode/test/CompareBoundaries.java b/unicodetools/src/test/java/org/unicode/test/CompareBoundaries.java
index 37774bf1a..77f62ac14 100644
--- a/unicodetools/src/test/java/org/unicode/test/CompareBoundaries.java
+++ b/unicodetools/src/test/java/org/unicode/test/CompareBoundaries.java
@@ -3,7 +3,7 @@
 // (i.e., "Mr.Hamster" problems).
 package org.unicode.test;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/unicodetools/src/test/java/org/unicode/test/TestSecurity.java b/unicodetools/src/test/java/org/unicode/test/TestSecurity.java
index 465a1e92a..d53a3ea98 100644
--- a/unicodetools/src/test/java/org/unicode/test/TestSecurity.java
+++ b/unicodetools/src/test/java/org/unicode/test/TestSecurity.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Objects;
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UTF16;
diff --git a/unicodetools/src/test/java/org/unicode/test/TestSegment.java b/unicodetools/src/test/java/org/unicode/test/TestSegment.java
index 719f3cf14..a47f443fa 100644
--- a/unicodetools/src/test/java/org/unicode/test/TestSegment.java
+++ b/unicodetools/src/test/java/org/unicode/test/TestSegment.java
@@ -1,8 +1,8 @@
 package org.unicode.test;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.Composer;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.Composer;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSet.XSymbolTable;
 import java.util.ArrayList;
diff --git a/unicodetools/src/test/java/org/unicode/test/TestUnicodeMapParser.java b/unicodetools/src/test/java/org/unicode/test/TestUnicodeMapParser.java
index c4e163dc9..aba78176e 100644
--- a/unicodetools/src/test/java/org/unicode/test/TestUnicodeMapParser.java
+++ b/unicodetools/src/test/java/org/unicode/test/TestUnicodeMapParser.java
@@ -1,7 +1,7 @@
 package org.unicode.test;
 
 import com.google.common.base.Objects;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UnicodeSet;
 import java.text.ParsePosition;
 import org.junit.jupiter.api.Disabled;
diff --git a/unicodetools/src/test/java/org/unicode/text/UCD/TestCodeInvariants.java b/unicodetools/src/test/java/org/unicode/text/UCD/TestCodeInvariants.java
index 601354451..84ffd3c73 100644
--- a/unicodetools/src/test/java/org/unicode/text/UCD/TestCodeInvariants.java
+++ b/unicodetools/src/test/java/org/unicode/text/UCD/TestCodeInvariants.java
@@ -2,7 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.Normalizer2;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
diff --git a/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestEmojiData.java b/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestEmojiData.java
index 02a90acf3..af3cd8289 100644
--- a/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestEmojiData.java
+++ b/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestEmojiData.java
@@ -6,7 +6,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.CollationElementIterator;
 import com.ibm.icu.text.RuleBasedCollator;
diff --git a/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestEmojiDataConsistency.java b/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestEmojiDataConsistency.java
index 5be5a14cb..b26511791 100644
--- a/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestEmojiDataConsistency.java
+++ b/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestEmojiDataConsistency.java
@@ -1,7 +1,7 @@
 package org.unicode.tools.emoji.unittest;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSetIterator;
diff --git a/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestProposalData.java b/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestProposalData.java
index b3626de97..adfae1349 100644
--- a/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestProposalData.java
+++ b/unicodetools/src/test/java/org/unicode/tools/emoji/unittest/TestProposalData.java
@@ -1,8 +1,8 @@
 package org.unicode.tools.emoji.unittest;
 
 import com.ibm.icu.dev.util.CollectionUtilities;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.VersionInfo;
 import java.util.Set;
diff --git a/unicodetools/src/test/java/org/unicode/unittest/TestIdentifierInfo.java b/unicodetools/src/test/java/org/unicode/unittest/TestIdentifierInfo.java
index 560f8d567..137287f40 100644
--- a/unicodetools/src/test/java/org/unicode/unittest/TestIdentifierInfo.java
+++ b/unicodetools/src/test/java/org/unicode/unittest/TestIdentifierInfo.java
@@ -1,8 +1,8 @@
 package org.unicode.unittest;
 
 import com.google.common.collect.ImmutableSet;
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMap.EntryRange;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap.EntryRange;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Collections;
 import java.util.Set;
diff --git a/unicodetools/src/test/java/org/unicode/unittest/TestIdnaTest.java b/unicodetools/src/test/java/org/unicode/unittest/TestIdnaTest.java
index d7e8ba448..d78e04285 100644
--- a/unicodetools/src/test/java/org/unicode/unittest/TestIdnaTest.java
+++ b/unicodetools/src/test/java/org/unicode/unittest/TestIdnaTest.java
@@ -1,7 +1,7 @@
 package org.unicode.unittest;
 
 import com.google.common.base.Splitter;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.IDNA;