diff --git a/contrib/analyzers/src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java b/src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java
similarity index 100%
rename from contrib/analyzers/src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java
rename to src/java/org/apache/lucene/analysis/ISOLatin1AccentFilter.java
diff --git a/contrib/analyzers/src/java/org/apache/lucene/analysis/KeywordAnalyzer.java b/src/java/org/apache/lucene/analysis/KeywordAnalyzer.java
similarity index 100%
rename from contrib/analyzers/src/java/org/apache/lucene/analysis/KeywordAnalyzer.java
rename to src/java/org/apache/lucene/analysis/KeywordAnalyzer.java
diff --git a/contrib/analyzers/src/java/org/apache/lucene/analysis/KeywordTokenizer.java b/src/java/org/apache/lucene/analysis/KeywordTokenizer.java
similarity index 100%
rename from contrib/analyzers/src/java/org/apache/lucene/analysis/KeywordTokenizer.java
rename to src/java/org/apache/lucene/analysis/KeywordTokenizer.java
diff --git a/contrib/analyzers/src/java/org/apache/lucene/analysis/LengthFilter.java b/src/java/org/apache/lucene/analysis/LengthFilter.java
similarity index 100%
rename from contrib/analyzers/src/java/org/apache/lucene/analysis/LengthFilter.java
rename to src/java/org/apache/lucene/analysis/LengthFilter.java
diff --git a/contrib/analyzers/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java b/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
similarity index 100%
rename from contrib/analyzers/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
rename to src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
diff --git a/contrib/analyzers/src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java b/src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java
similarity index 100%
rename from contrib/analyzers/src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java
rename to src/test/org/apache/lucene/analysis/TestKeywordAnalyzer.java