Index: solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
===================================================================
--- solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java	(revision 1329057)
+++ solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java	(working copy)
@@ -25,8 +25,8 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.icu.collation.ICUCollationKeyAnalyzer;
 import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
-import org.apache.lucene.collation.ICUCollationKeyAnalyzer;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.SortField;
Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java
===================================================================
--- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java	(revision 1329057)
+++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java	(working copy)
@@ -21,7 +21,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.collation.ICUCollationKeyFilter;
+import org.apache.lucene.analysis.icu.collation.ICUCollationKeyFilter;
 import org.apache.solr.common.ResourceLoader;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
Index: lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java
===================================================================
--- lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java	(revision 1329057)
+++ lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java	(working copy)
@@ -39,7 +39,7 @@
   public enum Implementation { 
     JDK("org.apache.lucene.collation.CollationKeyAnalyzer", 
         "java.text.Collator"),
-    ICU("org.apache.lucene.collation.ICUCollationKeyAnalyzer", 
+    ICU("org.apache.lucene.analysis.icu.collation.ICUCollationKeyAnalyzer", 
         "com.ibm.icu.text.Collator");
     
     String className;
Index: lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java
===================================================================
--- lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java	(revision 1329057)
+++ lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilter.java	(working copy)
@@ -22,6 +22,7 @@
 
 import org.apache.lucene.analysis.*;
 import org.apache.lucene.analysis.core.KeywordTokenizer;
+import org.apache.lucene.analysis.icu.collation.ICUCollationKeyFilter;
 import org.apache.lucene.util.BytesRef;
 
 import java.io.Reader;
Index: lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
===================================================================
--- lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java	(revision 1329057)
+++ lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java	(working copy)
@@ -22,6 +22,7 @@
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.CollationTestBase;
+import org.apache.lucene.analysis.icu.collation.ICUCollationKeyAnalyzer;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.util.BytesRef;
 
Index: lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/collation/ICUCollationAttributeFactory.java
===================================================================
--- lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/collation/ICUCollationAttributeFactory.java	(working copy)
+++ lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/collation/ICUCollationAttributeFactory.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.collation;
+package org.apache.lucene.analysis.icu.collation;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import org.apache.lucene.collation.tokenattributes.ICUCollatedTermAttributeImpl;
+import org.apache.lucene.analysis.collation.tokenattributes.ICUCollatedTermAttributeImpl;
 import org.apache.lucene.util.Attribute;
 import org.apache.lucene.util.AttributeImpl;
 import org.apache.lucene.util.AttributeSource;
Index: lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/collation/ICUCollationKeyAnalyzer.java
===================================================================
--- lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/collation/ICUCollationKeyAnalyzer.java	(working copy)
+++ lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/collation/ICUCollationKeyAnalyzer.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.collation;
+package org.apache.lucene.analysis.icu.collation;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/collation/ICUCollationKeyFilter.java
===================================================================
--- lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/collation/ICUCollationKeyFilter.java	(working copy)
+++ lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/collation/ICUCollationKeyFilter.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.collation;
+package org.apache.lucene.analysis.icu.collation;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: lucene/analysis/icu/src/java/org/apache/lucene/analysis/collation/tokenattributes/ICUCollatedTermAttributeImpl.java
===================================================================
--- lucene/analysis/icu/src/java/org/apache/lucene/analysis/collation/tokenattributes/ICUCollatedTermAttributeImpl.java	(working copy)
+++ lucene/analysis/icu/src/java/org/apache/lucene/analysis/collation/tokenattributes/ICUCollatedTermAttributeImpl.java	(working copy)
@@ -1,4 +1,4 @@
-package org.apache.lucene.collation.tokenattributes;
+package org.apache.lucene.analysis.collation.tokenattributes;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
Index: lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationAttributeFactory.java (deleted)
===================================================================
Index: lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilter.java (deleted)
===================================================================
Index: lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java (deleted)
===================================================================
Index: lucene/analysis/icu/src/java/org/apache/lucene/collation/tokenattributes/ICUCollatedTermAttributeImpl.java (deleted)
===================================================================