lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From synhers...@apache.org
Subject [6/7] git commit: Namespace rename Lucene.Net.Document -> Documents
Date Wed, 10 Sep 2014 01:48:07 GMT
Namespace rename Lucene.Net.Document -> Documents

This to avoid conflict between class name and namespace name, like done in previous versions as well


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/273b9fdb
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/273b9fdb
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/273b9fdb

Branch: refs/heads/master
Commit: 273b9fdb1523d6a042f30ecb6760e46ccf685925
Parents: 78e4bb7
Author: Itamar Syn-Hershko <itamar@code972.com>
Authored: Wed Sep 10 04:46:30 2014 +0300
Committer: Itamar Syn-Hershko <itamar@code972.com>
Committed: Wed Sep 10 04:46:30 2014 +0300

----------------------------------------------------------------------
 .../CompressingStoredFieldsWriter.cs            |  2 +-
 .../Lucene40/Lucene40StoredFieldsWriter.cs      |  2 +-
 .../Codecs/StoredFieldsWriter.cs                |  2 +-
 .../Document/BinaryDocValuesField.cs            | 10 +++---
 .../Document/ByteDocValuesField.cs              |  3 +-
 .../Document/CompressionTools.cs                | 13 +++----
 src/Lucene.Net.Core/Document/DateTools.cs       | 10 +++---
 .../Document/DerefBytesDocValuesField.cs        |  8 ++---
 src/Lucene.Net.Core/Document/Document.cs        | 31 +++++++---------
 .../Document/DocumentStoredFieldVisitor.cs      | 12 +++----
 .../Document/DoubleDocValuesField.cs            |  9 +++--
 src/Lucene.Net.Core/Document/DoubleField.cs     | 17 +++++----
 src/Lucene.Net.Core/Document/Field.cs           | 37 +++++++++-----------
 src/Lucene.Net.Core/Document/FieldType.cs       | 18 +++++-----
 .../Document/FloatDocValuesField.cs             |  8 +++--
 src/Lucene.Net.Core/Document/FloatField.cs      | 17 +++++----
 .../Document/IntDocValuesField.cs               |  4 ++-
 src/Lucene.Net.Core/Document/IntField.cs        | 16 ++++-----
 .../Document/LongDocValuesField.cs              |  7 ++--
 src/Lucene.Net.Core/Document/LongField.cs       | 13 +++----
 .../Document/NumericDocValuesField.cs           |  7 ++--
 .../Document/PackedLongDocValuesField.cs        |  7 ++--
 .../Document/ShortDocValuesField.cs             |  7 ++--
 .../Document/SortedBytesDocValuesField.cs       |  8 ++---
 .../Document/SortedDocValuesField.cs            | 11 +++---
 .../Document/SortedSetDocValuesField.cs         | 10 +++---
 src/Lucene.Net.Core/Document/StoredField.cs     |  8 +++--
 .../Document/StraightBytesDocValuesField.cs     |  7 ++--
 src/Lucene.Net.Core/Document/StringField.cs     |  2 +-
 src/Lucene.Net.Core/Document/TextField.cs       |  9 +++--
 .../Index/BinaryDocValuesFieldUpdates.cs        |  3 +-
 src/Lucene.Net.Core/Index/CheckIndex.cs         |  2 +-
 src/Lucene.Net.Core/Index/DocValuesUpdate.cs    |  4 ++-
 src/Lucene.Net.Core/Index/IndexReader.cs        |  5 +--
 src/Lucene.Net.Core/Index/IndexableFieldType.cs |  3 +-
 .../Index/NumericDocValuesFieldUpdates.cs       |  3 +-
 src/Lucene.Net.Core/Index/ReadersAndUpdates.cs  |  5 +--
 src/Lucene.Net.Core/Search/FieldCache.cs        | 11 +++---
 src/Lucene.Net.Core/Search/IndexSearcher.cs     |  2 +-
 src/Lucene.Net.Core/Search/NumericRangeQuery.cs |  3 +-
 .../Search/Similarities/TFIDFSimilarity.cs      |  4 ++-
 src/Lucene.Net.Core/Util/NumericUtils.cs        |  8 +++--
 .../Analysis/BaseTokenStreamTestCase.cs         |  9 ++---
 .../Analysis/CollationTestBase.cs               | 11 +++---
 .../BaseCompressingDocValuesFormatTestCase.cs   |  5 +--
 .../Index/BaseDocValuesFormatTestCase.cs        | 21 +++++------
 .../Index/BaseIndexFileFormatTestCase.cs        |  2 +-
 .../Index/BaseMergePolicyTestCase.cs            |  2 +-
 .../Index/BasePostingsFormatTestCase.cs         |  7 ++--
 .../Index/BaseStoredFieldsFormatTestCase.cs     | 21 +++++------
 .../Index/BaseTermVectorsFormatTestCase.cs      | 11 +++---
 src/Lucene.Net.TestFramework/Index/DocHelper.cs | 13 +++----
 .../ThreadedIndexingAndSearchingTestCase.cs     |  5 +--
 .../Search/QueryUtils.cs                        |  2 +-
 .../Search/SearchEquivalenceTestBase.cs         |  9 ++---
 .../Util/LineFileDocs.cs                        | 13 +++----
 .../Util/LuceneTestCase.cs                      | 13 +++----
 src/Lucene.Net.TestFramework/Util/TestUtil.cs   | 23 ++++++------
 .../core/Analysis/TestCachingTokenFilter.cs     |  5 +--
 .../core/Analysis/TestMockAnalyzer.cs           |  7 ++--
 .../TestCompressingStoredFieldsFormat.cs        | 11 +++---
 .../TestCompressingTermVectorsFormat.cs         | 10 +++---
 .../core/Codecs/Lucene3x/TestSurrogates.cs      |  5 +--
 .../Codecs/Lucene3x/TestTermInfosReaderIndex.cs |  5 +--
 .../Lucene40/TestLucene40PostingsReader.cs      | 11 +++---
 .../Codecs/Lucene41/TestBlockPostingsFormat2.cs |  9 ++---
 .../Codecs/Lucene41/TestBlockPostingsFormat3.cs |  9 ++---
 .../Perfield/TestPerFieldDocValuesFormat.cs     |  9 ++---
 .../Perfield/TestPerFieldPostingsFormat2.cs     |  9 ++---
 .../core/Document/TestBinaryDocument.cs         |  9 ++---
 .../core/Document/TestDateTools.cs              |  1 +
 .../core/Document/TestDocument.cs               | 23 ++++++------
 src/Lucene.Net.Tests/core/Document/TestField.cs |  1 +
 .../core/Index/Test2BBinaryDocValues.cs         |  5 +--
 src/Lucene.Net.Tests/core/Index/Test2BDocs.cs   |  2 +-
 .../core/Index/Test2BNumericDocValues.cs        |  5 +--
 .../core/Index/Test2BPositions.cs               |  9 ++---
 .../core/Index/Test2BPostings.cs                |  9 ++---
 .../core/Index/Test2BPostingsBytes.cs           |  9 ++---
 .../core/Index/Test2BSortedDocValues.cs         |  5 +--
 src/Lucene.Net.Tests/core/Index/Test2BTerms.cs  |  5 +--
 .../core/Index/Test4GBStoredFields.cs           |  7 ++--
 .../core/Index/TestAddIndexes.cs                | 11 +++---
 .../Index/TestAllFilesHaveChecksumFooter.cs     |  7 ++--
 .../core/Index/TestAllFilesHaveCodecHeader.cs   |  7 ++--
 .../core/Index/TestAtomicUpdate.cs              |  7 ++--
 .../core/Index/TestBagOfPositions.cs            |  7 ++--
 .../core/Index/TestBagOfPostings.cs             |  5 +--
 .../core/Index/TestBinaryDocValuesUpdates.cs    | 15 ++++----
 .../core/Index/TestBinaryTerms.cs               | 10 +++---
 .../core/Index/TestCheckIndex.cs                |  9 ++---
 .../core/Index/TestCodecHoldsOpenFiles.cs       |  5 +--
 src/Lucene.Net.Tests/core/Index/TestCodecs.cs   | 11 +++---
 .../core/Index/TestCompoundFile.cs              |  5 +--
 .../core/Index/TestConcurrentMergeScheduler.cs  |  9 ++---
 .../core/Index/TestConsistentFieldNumbers.cs    | 13 +++----
 src/Lucene.Net.Tests/core/Index/TestCrash.cs    |  5 +--
 .../core/Index/TestCrashCausesCorruptIndex.cs   |  5 +--
 .../core/Index/TestCustomNorms.cs               |  7 ++--
 .../core/Index/TestDeletionPolicy.cs            |  5 +--
 .../core/Index/TestDirectoryReader.cs           | 13 +++----
 .../core/Index/TestDirectoryReaderReopen.cs     |  9 ++---
 src/Lucene.Net.Tests/core/Index/TestDoc.cs      |  5 +--
 src/Lucene.Net.Tests/core/Index/TestDocCount.cs |  5 +--
 .../Index/TestDocInverterPerFieldErrorInfo.cs   |  7 ++--
 .../core/Index/TestDocTermOrds.cs               |  9 ++---
 .../core/Index/TestDocValuesIndexing.cs         | 17 ++++-----
 .../core/Index/TestDocValuesWithThreads.cs      |  9 ++---
 .../core/Index/TestDocsAndPositions.cs          |  9 ++---
 .../core/Index/TestDocumentWriter.cs            | 11 +++---
 .../core/Index/TestDuelingCodecs.cs             |  7 ++--
 .../core/Index/TestExceedMaxTermLength.cs       |  7 ++--
 .../core/Index/TestFieldInfos.cs                |  2 +-
 .../core/Index/TestFieldsReader.cs              |  7 ++--
 .../core/Index/TestFilterAtomicReader.cs        |  5 +--
 src/Lucene.Net.Tests/core/Index/TestFlex.cs     |  8 +++--
 .../core/Index/TestForTooMuchCloning.cs         |  7 ++--
 .../core/Index/TestIndexFileDeleter.cs          |  5 +--
 .../core/Index/TestIndexWriter.cs               | 21 +++++------
 .../core/Index/TestIndexWriterCommit.cs         |  5 +--
 .../core/Index/TestIndexWriterConfig.cs         |  5 +--
 .../core/Index/TestIndexWriterDelete.cs         | 11 +++---
 .../core/Index/TestIndexWriterExceptions.cs     | 19 +++++-----
 .../core/Index/TestIndexWriterForceMerge.cs     |  5 +--
 .../core/Index/TestIndexWriterMergePolicy.cs    |  6 ++--
 .../core/Index/TestIndexWriterMerging.cs        |  9 ++---
 .../core/Index/TestIndexWriterNRTIsCurrent.cs   |  7 ++--
 .../core/Index/TestIndexWriterOnDiskFull.cs     | 11 +++---
 .../core/Index/TestIndexWriterReader.cs         |  7 ++--
 .../core/Index/TestIndexWriterUnicode.cs        |  5 +--
 .../core/Index/TestIndexWriterWithThreads.cs    | 11 +++---
 .../core/Index/TestIndexableField.cs            |  7 ++--
 .../core/Index/TestIsCurrent.cs                 |  6 ++--
 .../core/Index/TestLazyProxSkipping.cs          |  6 ++--
 .../core/Index/TestLongPostings.cs              |  9 ++---
 .../core/Index/TestMaxTermFrequency.cs          |  5 +--
 .../core/Index/TestMixedCodecs.cs               |  5 +--
 .../core/Index/TestMixedDocValuesUpdates.cs     | 11 +++---
 .../core/Index/TestMultiDocValues.cs            | 13 +++----
 .../core/Index/TestMultiFields.cs               |  9 ++---
 .../core/Index/TestMultiLevelSkipList.cs        |  5 +--
 .../core/Index/TestNRTReaderWithThreads.cs      |  2 +-
 .../core/Index/TestNeverDelete.cs               |  5 +--
 .../core/Index/TestNoDeletionPolicy.cs          |  5 +--
 src/Lucene.Net.Tests/core/Index/TestNorms.cs    |  7 ++--
 .../core/Index/TestNumericDocValuesUpdates.cs   | 15 ++++----
 .../core/Index/TestOmitNorms.cs                 | 10 +++---
 .../core/Index/TestOmitPositions.cs             | 10 +++---
 src/Lucene.Net.Tests/core/Index/TestOmitTf.cs   |  9 ++---
 .../core/Index/TestParallelAtomicReader.cs      |  5 +--
 .../core/Index/TestParallelCompositeReader.cs   |  5 +--
 .../core/Index/TestParallelReaderEmptyIndex.cs  |  9 ++---
 .../core/Index/TestParallelTermEnum.cs          |  5 +--
 src/Lucene.Net.Tests/core/Index/TestPayloads.cs |  7 ++--
 .../core/Index/TestPayloadsOnVectors.cs         |  9 ++---
 .../TestPersistentSnapshotDeletionPolicy.cs     |  2 +-
 .../core/Index/TestPostingsOffsets.cs           | 13 +++----
 .../core/Index/TestReaderClosed.cs              |  6 ++--
 src/Lucene.Net.Tests/core/Index/TestRollback.cs |  5 +--
 .../core/Index/TestRollingUpdates.cs            |  7 ++--
 .../core/Index/TestSameTokenSamePosition.cs     |  5 +--
 .../core/Index/TestSegmentMerger.cs             |  2 +-
 .../core/Index/TestSegmentReader.cs             |  2 +-
 .../core/Index/TestSegmentTermDocs.cs           |  6 ++--
 .../core/Index/TestSegmentTermEnum.cs           |  6 ++--
 .../core/Index/TestSizeBoundedForceMerge.cs     |  8 +++--
 .../core/Index/TestSnapshotDeletionPolicy.cs    |  7 ++--
 .../core/Index/TestStressAdvance.cs             |  5 +--
 .../core/Index/TestStressIndexing.cs            |  5 +--
 .../core/Index/TestStressIndexing2.cs           |  9 ++---
 .../core/Index/TestStressNRT.cs                 | 11 +++---
 .../core/Index/TestSumDocFreq.cs                |  5 +--
 .../core/Index/TestTermVectorsReader.cs         |  9 ++---
 .../core/Index/TestTermVectorsWriter.cs         | 12 ++++---
 .../core/Index/TestTermdocPerf.cs               |  5 +--
 .../core/Index/TestTermsEnum.cs                 |  7 ++--
 .../core/Index/TestTermsEnum2.cs                |  5 +--
 .../core/Index/TestThreadedForceMerge.cs        |  7 ++--
 .../core/Index/TestTieredMergePolicy.cs         |  5 +--
 .../core/Index/TestTransactionRollback.cs       |  5 +--
 .../core/Index/TestTransactions.cs              |  9 ++---
 .../core/Index/TestTryDelete.cs                 |  7 ++--
 .../core/Search/BaseTestRangeFilter.cs          |  5 +--
 .../core/Search/FuzzyTermOnShortTermsTest.cs    |  6 ++--
 .../core/Search/Payloads/PayloadHelper.cs       |  7 ++--
 .../Search/Payloads/TestPayloadNearQuery.cs     |  5 +--
 .../Search/Payloads/TestPayloadTermQuery.cs     |  5 +--
 .../core/Search/Similarities/TestSimilarity2.cs |  9 ++---
 .../Search/Similarities/TestSimilarityBase.cs   |  9 ++---
 .../core/Search/Spans/TestBasics.cs             |  5 +--
 .../Search/Spans/TestFieldMaskingSpanQuery.cs   |  5 +--
 .../core/Search/Spans/TestNearSpansOrdered.cs   |  6 ++--
 .../core/Search/Spans/TestPayloadSpans.cs       |  7 ++--
 .../core/Search/Spans/TestSpanFirstQuery.cs     |  6 ++--
 .../Spans/TestSpanMultiTermQueryWrapper.cs      |  6 ++--
 .../core/Search/Spans/TestSpans.cs              |  5 +--
 .../core/Search/Spans/TestSpansAdvanced.cs      |  5 +--
 .../core/Search/TestAutomatonQuery.cs           |  5 +--
 .../core/Search/TestAutomatonQueryUnicode.cs    |  6 ++--
 .../core/Search/TestBoolean2.cs                 |  5 +--
 .../core/Search/TestBooleanMinShouldMatch.cs    |  5 +--
 .../core/Search/TestBooleanOr.cs                |  6 ++--
 .../core/Search/TestBooleanQuery.cs             |  7 ++--
 .../Search/TestBooleanQueryVisitSubscorers.cs   |  7 ++--
 .../core/Search/TestBooleanScorer.cs            |  7 ++--
 .../core/Search/TestCachingWrapperFilter.cs     |  7 ++--
 .../core/Search/TestConjunctions.cs             | 10 +++---
 .../core/Search/TestConstantScoreQuery.cs       |  5 +--
 .../core/Search/TestCustomSearcherSort.cs       |  7 ++--
 .../core/Search/TestDateFilter.cs               |  7 ++--
 .../core/Search/TestDateSort.cs                 |  8 +++--
 .../core/Search/TestDisjunctionMaxQuery.cs      |  9 ++---
 .../core/Search/TestDocBoost.cs                 |  7 ++--
 .../core/Search/TestDocIdSet.cs                 |  5 +--
 .../core/Search/TestDocTermOrdsRangeFilter.cs   |  7 ++--
 .../core/Search/TestDocTermOrdsRewriteMethod.cs |  7 ++--
 .../core/Search/TestDocValuesScoring.cs         |  8 +++--
 .../core/Search/TestEarlyTermination.cs         |  2 +-
 .../core/Search/TestElevationComparator.cs      |  5 +--
 .../core/Search/TestExplanations.cs             |  5 +--
 .../core/Search/TestFieldCacheRangeFilter.cs    |  5 +--
 .../core/Search/TestFieldCacheTermsFilter.cs    |  5 +--
 .../core/Search/TestFieldValueFilter.cs         |  6 ++--
 .../core/Search/TestFilteredQuery.cs            |  5 +--
 .../core/Search/TestFilteredSearch.cs           |  6 ++--
 .../core/Search/TestFuzzyQuery.cs               |  5 +--
 .../core/Search/TestIndexSearcher.cs            |  5 +--
 .../core/Search/TestLiveFieldValues.cs          |  9 ++---
 .../core/Search/TestMatchAllDocsQuery.cs        |  6 ++--
 .../core/Search/TestMinShouldMatch2.cs          |  9 ++---
 .../core/Search/TestMultiPhraseQuery.cs         |  7 ++--
 .../core/Search/TestMultiTermConstantScore.cs   |  9 ++---
 .../core/Search/TestMultiTermQueryRewrites.cs   |  5 +--
 .../core/Search/TestMultiThreadTermVectors.cs   |  5 +--
 .../Search/TestMultiValuedNumericRangeQuery.cs  |  7 ++--
 src/Lucene.Net.Tests/core/Search/TestNot.cs     |  6 ++--
 .../core/Search/TestNumericRangeQuery32.cs      | 11 +++---
 .../core/Search/TestNumericRangeQuery64.cs      | 11 +++---
 .../core/Search/TestPhrasePrefixQuery.cs        |  5 +--
 .../core/Search/TestPhraseQuery.cs              | 29 +++++++--------
 .../core/Search/TestPositionIncrement.cs        |  7 ++--
 .../core/Search/TestPrefixFilter.cs             |  6 ++--
 .../core/Search/TestPrefixInBooleanQuery.cs     |  6 ++--
 .../core/Search/TestPrefixQuery.cs              |  6 ++--
 .../core/Search/TestPrefixRandom.cs             |  6 ++--
 .../core/Search/TestQueryRescorer.cs            |  7 ++--
 .../core/Search/TestQueryWrapperFilter.cs       |  5 +--
 .../core/Search/TestRegexpQuery.cs              |  6 ++--
 .../core/Search/TestRegexpRandom.cs             |  9 ++---
 .../core/Search/TestRegexpRandom2.cs            |  5 +--
 .../core/Search/TestSameScoresWithThreads.cs    |  2 +-
 .../core/Search/TestScorerPerf.cs               |  5 +--
 .../core/Search/TestSearchAfter.cs              | 23 ++++++------
 .../core/Search/TestSearchWithThreads.cs        |  5 +--
 .../core/Search/TestSearcherManager.cs          |  2 +-
 .../core/Search/TestSimilarity.cs               |  6 ++--
 .../core/Search/TestSimilarityProvider.cs       |  6 ++--
 .../core/Search/TestSloppyPhraseQuery.cs        |  9 ++---
 src/Lucene.Net.Tests/core/Search/TestSort.cs    |  7 ++--
 .../core/Search/TestSortDocValues.cs            | 16 +++++----
 .../core/Search/TestSortRandom.cs               | 11 +++---
 .../core/Search/TestSortRescorer.cs             |  7 ++--
 .../core/Search/TestSubScorerFreqs.cs           |  7 ++--
 .../core/Search/TestTermRangeQuery.cs           |  5 +--
 .../core/Search/TestTermScorer.cs               |  5 +--
 .../core/Search/TestTermVectors.cs              | 10 +++---
 .../core/Search/TestTopDocsCollector.cs         |  2 +-
 .../core/Search/TestTopDocsMerge.cs             |  9 ++---
 .../core/Search/TestTopFieldCollector.cs        |  2 +-
 .../core/Search/TestTopScoreDocCollector.cs     |  2 +-
 .../core/Search/TestTotalHitCountCollector.cs   |  8 +++--
 .../core/Search/TestWildcard.cs                 |  5 +--
 .../core/Search/TestWildcardRandom.cs           |  5 +--
 .../core/Store/TestBufferedIndexInput.cs        |  5 +--
 .../core/Store/TestLockFactory.cs               |  5 +--
 .../core/Store/TestMultiMMap.cs                 |  5 +--
 .../core/Store/TestNRTCachingDirectory.cs       |  2 +-
 .../core/Store/TestRAMDirectory.cs              |  5 +--
 .../core/Store/TestWindowsMMap.cs               |  5 +--
 .../core/TestMergeSchedulerExternal.cs          |  5 +--
 .../core/Util/TestFieldCacheSanityChecker.cs    |  5 +--
 281 files changed, 1202 insertions(+), 927 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
index bb91237..28ba659 100644
--- a/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/Compressing/CompressingStoredFieldsWriter.cs
@@ -9,7 +9,7 @@ using System.Diagnostics;
 
 namespace Lucene.Net.Codecs.Compressing
 {
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
 
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
index a985f81..d54dae7 100644
--- a/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/Lucene40/Lucene40StoredFieldsWriter.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.Codecs.Lucene40
     /// the License.
     /// </summary>
 
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
     using FieldInfo = Lucene.Net.Index.FieldInfo;
     using FieldInfos = Lucene.Net.Index.FieldInfos;
     using IndexableField = Lucene.Net.Index.IndexableField;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs b/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
index 50232fa..d1a3ff4 100644
--- a/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
+++ b/src/Lucene.Net.Core/Codecs/StoredFieldsWriter.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Codecs
     /// the License.
     /// </summary>
 
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
     using FieldInfo = Lucene.Net.Index.FieldInfo;
     using FieldInfos = Lucene.Net.Index.FieldInfos;
     using IndexableField = Lucene.Net.Index.IndexableField;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs b/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs
index b9694af..0001003 100644
--- a/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/BinaryDocValuesField.cs
@@ -1,7 +1,9 @@
-namespace Lucene.Net.Document
-{
-    using BytesRef = Lucene.Net.Util.BytesRef;
 
+using Lucene.Net.Index;
+using Lucene.Net.Util;
+
+namespace Lucene.Net.Documents
+{
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +21,6 @@ namespace Lucene.Net.Document
          * limitations under the License.
          */
 
-    using FieldInfo = Lucene.Net.Index.FieldInfo;
-
     /// <summary>
     /// Field that stores a per-document <seealso cref="BytesRef"/> value.
     /// <p>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/ByteDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/ByteDocValuesField.cs b/src/Lucene.Net.Core/Document/ByteDocValuesField.cs
index b34c066..316c555 100644
--- a/src/Lucene.Net.Core/Document/ByteDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/ByteDocValuesField.cs
@@ -1,6 +1,7 @@
 using System;
 
-namespace Lucene.Net.Document
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/CompressionTools.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/CompressionTools.cs b/src/Lucene.Net.Core/Document/CompressionTools.cs
index 77451ba..567c522 100644
--- a/src/Lucene.Net.Core/Document/CompressionTools.cs
+++ b/src/Lucene.Net.Core/Document/CompressionTools.cs
@@ -1,8 +1,9 @@
-namespace Lucene.Net.Document
-{
-    using Lucene.Net.Support;
-    using System;
+using System;
+using Lucene.Net.Support;
+using Lucene.Net.Util;
 
+namespace Lucene.Net.Documents
+{
     /*
                  * Licensed to the Apache Software Foundation (ASF) under one or more
                  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,10 +21,6 @@ namespace Lucene.Net.Document
                  * limitations under the License.
                  */
 
-    using BytesRef = Lucene.Net.Util.BytesRef;
-    using CharsRef = Lucene.Net.Util.CharsRef;
-    using UnicodeUtil = Lucene.Net.Util.UnicodeUtil;
-
     /// <summary>
     /// Simple utility class providing static methods to
     ///  compress and decompress binary data for stored fields.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/DateTools.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/DateTools.cs b/src/Lucene.Net.Core/Document/DateTools.cs
index f83854f..d4334d9 100644
--- a/src/Lucene.Net.Core/Document/DateTools.cs
+++ b/src/Lucene.Net.Core/Document/DateTools.cs
@@ -1,4 +1,9 @@
-namespace Lucene.Net.Document
+using System;
+using System.Globalization;
+using Lucene.Net.Search;
+using Lucene.Net.Util;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,9 +21,6 @@ namespace Lucene.Net.Document
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-
-    using System;
-
     // for javadocs
     // for javadocs
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/DerefBytesDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/DerefBytesDocValuesField.cs b/src/Lucene.Net.Core/Document/DerefBytesDocValuesField.cs
index bffc9fb..2b91e3d 100644
--- a/src/Lucene.Net.Core/Document/DerefBytesDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/DerefBytesDocValuesField.cs
@@ -1,4 +1,7 @@
-namespace Lucene.Net.Document
+
+using Lucene.Net.Util;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,9 +19,6 @@ namespace Lucene.Net.Document
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-
-    using BytesRef = Lucene.Net.Util.BytesRef;
-
     /// <summary>
     /// <p>
     /// Field that stores

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/Document.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/Document.cs b/src/Lucene.Net.Core/Document/Document.cs
index ce7c148..9546cc1 100644
--- a/src/Lucene.Net.Core/Document/Document.cs
+++ b/src/Lucene.Net.Core/Document/Document.cs
@@ -1,13 +1,12 @@
-namespace Lucene.Net.Document
-{
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Text;
-
-    // for javadoc
-    // for javadoc
-    using BytesRef = Lucene.Net.Util.BytesRef;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using Lucene.Net.Index;
+using Lucene.Net.Search;
+using Lucene.Net.Util;
 
+namespace Lucene.Net.Documents
+{
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed with
@@ -25,9 +24,6 @@ namespace Lucene.Net.Document
          * limitations under the License.
          */
 
-    // for javadoc
-    using IndexableField = Lucene.Net.Index.IndexableField;
-
     /// <summary>
     /// Documents are the unit of indexing and search.
     ///
@@ -39,9 +35,8 @@ namespace Lucene.Net.Document
     ///
     /// <p>Note that fields which are <i>not</i> <seealso cref="Lucene.Net.Index.IndexableFieldType#stored() stored"/> are
     /// <i>not</i> available in documents retrieved from the index, e.g. with {@link
-    /// ScoreDoc#doc} or <seealso cref="IndexReader#document(int)"/>.
+    /// ScoreDoc#doc} or <seealso cref="IndexReader#document(int)"/>.</p>
     /// </summary>
-
     public sealed class Document : IEnumerable<IndexableField>
     {
         private readonly List<IndexableField> Fields_Renamed = new List<IndexableField>();
@@ -133,7 +128,7 @@ namespace Lucene.Net.Document
         /// <returns> a <code>BytesRef[]</code> of binary field values </returns>
         public BytesRef[] GetBinaryValues(string name)
         {
-            List<BytesRef> result = new List<BytesRef>();
+            var result = new List<BytesRef>();
 
             foreach (IndexableField field in Fields_Renamed)
             {
@@ -201,7 +196,7 @@ namespace Lucene.Net.Document
         /// <returns> a <code>IndexableField[]</code> array </returns>
         public IndexableField[] GetFields(string name)
         {
-            List<IndexableField> result = new List<IndexableField>();
+            var result = new List<IndexableField>();
             foreach (IndexableField field in Fields_Renamed)
             {
                 if (field.Name().Equals(name))
@@ -241,7 +236,7 @@ namespace Lucene.Net.Document
         /// <returns> a <code>String[]</code> of field values </returns>
         public string[] GetValues(string name)
         {
-            List<string> result = new List<string>();
+            var result = new List<string>();
             foreach (IndexableField field in Fields_Renamed)
             {
                 if (field.Name().Equals(name) && field.StringValue != null)
@@ -283,7 +278,7 @@ namespace Lucene.Net.Document
         /// Prints the fields of a document for human consumption. </summary>
         public override string ToString()
         {
-            StringBuilder buffer = new StringBuilder();
+            var buffer = new StringBuilder();
             buffer.Append("Document<");
             for (int i = 0; i < Fields_Renamed.Count; i++)
             {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/DocumentStoredFieldVisitor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/DocumentStoredFieldVisitor.cs b/src/Lucene.Net.Core/Document/DocumentStoredFieldVisitor.cs
index 4db94e3..e316d20 100644
--- a/src/Lucene.Net.Core/Document/DocumentStoredFieldVisitor.cs
+++ b/src/Lucene.Net.Core/Document/DocumentStoredFieldVisitor.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 
-namespace Lucene.Net.Document
+using Lucene.Net.Index;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,10 +20,6 @@ namespace Lucene.Net.Document
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-
-    using FieldInfo = Lucene.Net.Index.FieldInfo;
-    using StoredFieldVisitor = Lucene.Net.Index.StoredFieldVisitor;
-
     /// <summary>
     /// A <seealso cref="StoredFieldVisitor"/> that creates a {@link
     ///  Document} containing all stored fields, or only specific
@@ -35,7 +33,7 @@ namespace Lucene.Net.Document
 
     public class DocumentStoredFieldVisitor : StoredFieldVisitor
     {
-        private readonly Document Doc = new Document();
+        private readonly Documents.Document Doc = new Documents.Document();
         private readonly ISet<string> FieldsToAdd;
 
         /// <summary>
@@ -110,7 +108,7 @@ namespace Lucene.Net.Document
         ///         the stored information in the field instances is valid,
         ///         data such as boosts, indexing options, term vector options,
         ///         etc is not set. </returns>
-        public virtual Document Document
+        public virtual Documents.Document Document
         {
             get
             {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/DoubleDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/DoubleDocValuesField.cs b/src/Lucene.Net.Core/Document/DoubleDocValuesField.cs
index edde691..a74f852 100644
--- a/src/Lucene.Net.Core/Document/DoubleDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/DoubleDocValuesField.cs
@@ -1,4 +1,8 @@
-namespace Lucene.Net.Document
+using System;
+
+using Lucene.Net.Search;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,8 +23,7 @@ namespace Lucene.Net.Document
 
     // javadocs
     // javadocs
-    using System;
-
+    
     /// <summary>
     /// Syntactic sugar for encoding doubles as NumericDocValues
     /// via <seealso cref="Double#doubleToRawLongBits(double)"/>.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/DoubleField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/DoubleField.cs b/src/Lucene.Net.Core/Document/DoubleField.cs
index 166c972..45c07ae 100644
--- a/src/Lucene.Net.Core/Document/DoubleField.cs
+++ b/src/Lucene.Net.Core/Document/DoubleField.cs
@@ -1,4 +1,9 @@
-namespace Lucene.Net.Document
+using System;
+
+using Lucene.Net.Index;
+using Lucene.Net.Search;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,9 +25,7 @@ namespace Lucene.Net.Document
     // javadocs
     // javadocs
     // javadocs
-    using Lucene.Net.Index;
-    using System;
-
+    
     /// <summary>
     /// <p>
     /// Field that indexes <code>double</code> values
@@ -131,14 +134,14 @@ namespace Lucene.Net.Document
             TYPE_NOT_STORED.Tokenized = true;
             TYPE_NOT_STORED.OmitNorms = true;
             TYPE_NOT_STORED.IndexOptionsValue = FieldInfo.IndexOptions.DOCS_ONLY;
-            TYPE_NOT_STORED.NumericTypeValue = Lucene.Net.Document.FieldType.NumericType.DOUBLE;
+            TYPE_NOT_STORED.NumericTypeValue = Documents.FieldType.NumericType.DOUBLE;
             TYPE_NOT_STORED.Freeze();
 
             TYPE_STORED.Indexed = true;
             TYPE_STORED.Tokenized = true;
             TYPE_STORED.OmitNorms = true;
             TYPE_STORED.IndexOptionsValue = FieldInfo.IndexOptions.DOCS_ONLY;
-            TYPE_STORED.NumericTypeValue = Lucene.Net.Document.FieldType.NumericType.DOUBLE;
+            TYPE_STORED.NumericTypeValue = Documents.FieldType.NumericType.DOUBLE;
             TYPE_STORED.Stored = true;
             TYPE_STORED.Freeze();
         }
@@ -169,7 +172,7 @@ namespace Lucene.Net.Document
         public DoubleField(string name, double value, FieldType type)
             : base(name, type)
         {
-            if (type.NumericTypeValue != Lucene.Net.Document.FieldType.NumericType.DOUBLE)
+            if (type.NumericTypeValue != Documents.FieldType.NumericType.DOUBLE)
             {
                 throw new System.ArgumentException("type.numericType() must be DOUBLE but got " + type.NumericTypeValue);
             }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/Field.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/Field.cs b/src/Lucene.Net.Core/Document/Field.cs
index fdd10d5..1c656bf 100644
--- a/src/Lucene.Net.Core/Document/Field.cs
+++ b/src/Lucene.Net.Core/Document/Field.cs
@@ -1,11 +1,16 @@
-namespace Lucene.Net.Document
-{
-    using Lucene.Net.Analysis.Tokenattributes;
-    using Lucene.Net.Support; // javadocs
-    using System;
-    using System.IO;
-    using System.Text;
+using System;
+using System.IO;
+using System.Text;
+using Lucene.Net.Analysis;
+using Lucene.Net.Analysis.Tokenattributes;
+
+using Lucene.Net.Index;
+using Lucene.Net.Support;
+using Lucene.Net.Util;
 
+namespace Lucene.Net.Documents
+{
+    // javadocs
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed with
@@ -23,15 +28,7 @@ namespace Lucene.Net.Document
          * limitations under the License.
          */
 
-    using Analyzer = Lucene.Net.Analysis.Analyzer;
-    using BytesRef = Lucene.Net.Util.BytesRef;
-
     // javadocs
-    using IndexableField = Lucene.Net.Index.IndexableField;
-    using IndexableFieldType = Lucene.Net.Index.IndexableFieldType;
-    using NumericTokenStream = Lucene.Net.Analysis.NumericTokenStream;
-    using NumericType = Lucene.Net.Document.FieldType.NumericType;
-    using TokenStream = Lucene.Net.Analysis.TokenStream;
 
     /// <summary>
     /// Expert: directly create a field for a document.  Most
@@ -608,7 +605,7 @@ namespace Lucene.Net.Document
                 return null;
             }
             Number n = new Number();
-            NumericType? numericType = ((FieldType)FieldType()).NumericTypeValue;
+            FieldType.NumericType? numericType = ((FieldType)FieldType()).NumericTypeValue;
             if (numericType != null)
             {
                 if (!(InternalTokenStream is NumericTokenStream))
@@ -622,19 +619,19 @@ namespace Lucene.Net.Document
                 object val = FieldsData;
                 switch (numericType)
                 {
-                    case NumericType.INT:
+                    case Documents.FieldType.NumericType.INT:
                         nts.SetIntValue(Convert.ToInt32(val));
                         break;
 
-                    case NumericType.LONG:
+                    case Documents.FieldType.NumericType.LONG:
                         nts.SetLongValue(Convert.ToInt64(val));
                         break;
 
-                    case NumericType.FLOAT:
+                    case Documents.FieldType.NumericType.FLOAT:
                         nts.SetFloatValue(Convert.ToSingle(val));
                         break;
 
-                    case NumericType.DOUBLE:
+                    case Documents.FieldType.NumericType.DOUBLE:
                         nts.SetDoubleValue(Convert.ToDouble(val));
                         break;
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/FieldType.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/FieldType.cs b/src/Lucene.Net.Core/Document/FieldType.cs
index d43af2a..2eaa5f4 100644
--- a/src/Lucene.Net.Core/Document/FieldType.cs
+++ b/src/Lucene.Net.Core/Document/FieldType.cs
@@ -1,9 +1,10 @@
-namespace Lucene.Net.Document
-{
-    using Lucene.Net.Index;
-    using System;
-    using System.Text;
+using System;
+using System.Text;
+using Lucene.Net.Index;
+using Lucene.Net.Util;
 
+namespace Lucene.Net.Documents
+{
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed with
@@ -22,11 +23,8 @@ namespace Lucene.Net.Document
          */
 
     // javadocs
-    using DocValuesType_e = Lucene.Net.Index.FieldInfo.DocValuesType_e;
-    using IndexableFieldType = Lucene.Net.Index.IndexableFieldType;
 
     // javadocs
-    using NumericUtils = Lucene.Net.Util.NumericUtils;
 
     /// <summary>
     /// Describes the properties of a field.
@@ -68,7 +66,7 @@ namespace Lucene.Net.Document
         private NumericType? numericType;
         private bool Frozen;
         private int NumericPrecisionStep_Renamed = NumericUtils.PRECISION_STEP_DEFAULT;
-        private DocValuesType_e? docValueType;
+        private FieldInfo.DocValuesType_e? docValueType;
 
         /// <summary>
         /// Create a new mutable FieldType with all of the properties from <code>ref</code>
@@ -407,7 +405,7 @@ namespace Lucene.Net.Document
         /// <exception cref="IllegalStateException"> if this FieldType is frozen against
         ///         future modifications. </exception>
         /// <seealso cref= #docValueType() </seealso>
-        public DocValuesType_e? DocValueType
+        public FieldInfo.DocValuesType_e? DocValueType
         {
             get
             {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/FloatDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/FloatDocValuesField.cs b/src/Lucene.Net.Core/Document/FloatDocValuesField.cs
index 1dde8a6..704fb35 100644
--- a/src/Lucene.Net.Core/Document/FloatDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/FloatDocValuesField.cs
@@ -1,4 +1,8 @@
-namespace Lucene.Net.Document
+using System;
+
+using Lucene.Net.Search;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,7 +41,7 @@ namespace Lucene.Net.Document
         /// Creates a new DocValues field with the specified 32-bit float value </summary>
         /// <param name="name"> field name </param>
         /// <param name="value"> 32-bit float value </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null </exception>
+        /// <exception cref="ArgumentException"> if the field name is null </exception>
         public FloatDocValuesField(string name, float value)
             : base(name, Support.Single.FloatToIntBits(value))
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/FloatField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/FloatField.cs b/src/Lucene.Net.Core/Document/FloatField.cs
index 8a74398..809e780 100644
--- a/src/Lucene.Net.Core/Document/FloatField.cs
+++ b/src/Lucene.Net.Core/Document/FloatField.cs
@@ -1,4 +1,9 @@
-namespace Lucene.Net.Document
+using System;
+
+using Lucene.Net.Index;
+using Lucene.Net.Search;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,9 +25,7 @@ namespace Lucene.Net.Document
     // javadocs
     // javadocs
     // javadocs
-    using Lucene.Net.Index;
-    using System;
-
+    
     /// <summary>
     /// <p>
     /// Field that indexes <code>float</code> values
@@ -125,13 +128,13 @@ namespace Lucene.Net.Document
             TYPE_NOT_STORED.Tokenized = true;
             TYPE_NOT_STORED.OmitNorms = true;
             TYPE_NOT_STORED.IndexOptionsValue = FieldInfo.IndexOptions.DOCS_ONLY;
-            TYPE_NOT_STORED.NumericTypeValue = Lucene.Net.Document.FieldType.NumericType.FLOAT;
+            TYPE_NOT_STORED.NumericTypeValue = Documents.FieldType.NumericType.FLOAT;
             TYPE_NOT_STORED.Freeze();
             TYPE_STORED.Indexed = true;
             TYPE_STORED.Tokenized = true;
             TYPE_STORED.OmitNorms = true;
             TYPE_STORED.IndexOptionsValue = FieldInfo.IndexOptions.DOCS_ONLY;
-            TYPE_STORED.NumericTypeValue = Lucene.Net.Document.FieldType.NumericType.FLOAT;
+            TYPE_STORED.NumericTypeValue = Documents.FieldType.NumericType.FLOAT;
             TYPE_STORED.Stored = true;
             TYPE_STORED.Freeze();
         }
@@ -168,7 +171,7 @@ namespace Lucene.Net.Document
         public FloatField(string name, float value, FieldType type)
             : base(name, type)
         {
-            if (type.NumericTypeValue != Lucene.Net.Document.FieldType.NumericType.FLOAT)
+            if (type.NumericTypeValue != Documents.FieldType.NumericType.FLOAT)
             {
                 throw new System.ArgumentException("type.numericType() must be FLOAT but got " + type.NumericTypeValue);
             }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/IntDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/IntDocValuesField.cs b/src/Lucene.Net.Core/Document/IntDocValuesField.cs
index cbc3143..dee8692 100644
--- a/src/Lucene.Net.Core/Document/IntDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/IntDocValuesField.cs
@@ -1,4 +1,6 @@
-namespace Lucene.Net.Document
+
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/IntField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/IntField.cs b/src/Lucene.Net.Core/Document/IntField.cs
index 84e739f..c3b1996 100644
--- a/src/Lucene.Net.Core/Document/IntField.cs
+++ b/src/Lucene.Net.Core/Document/IntField.cs
@@ -1,11 +1,11 @@
+using System;
+
 using Lucene.Net.Index;
+using Lucene.Net.Search;
 
-namespace Lucene.Net.Document
+namespace Lucene.Net.Documents
 {
-    // javadocs
-    // javadocs
-    using System;
-
+ 
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed with
@@ -127,13 +127,13 @@ namespace Lucene.Net.Document
             TYPE_NOT_STORED.Tokenized = true;
             TYPE_NOT_STORED.OmitNorms = true;
             TYPE_NOT_STORED.IndexOptionsValue = FieldInfo.IndexOptions.DOCS_ONLY;
-            TYPE_NOT_STORED.NumericTypeValue = Lucene.Net.Document.FieldType.NumericType.INT;
+            TYPE_NOT_STORED.NumericTypeValue = Documents.FieldType.NumericType.INT;
             TYPE_NOT_STORED.Freeze();
             TYPE_STORED.Indexed = true;
             TYPE_STORED.Tokenized = true;
             TYPE_STORED.OmitNorms = true;
             TYPE_STORED.IndexOptionsValue = FieldInfo.IndexOptions.DOCS_ONLY;
-            TYPE_STORED.NumericTypeValue = Lucene.Net.Document.FieldType.NumericType.INT;
+            TYPE_STORED.NumericTypeValue = Documents.FieldType.NumericType.INT;
             TYPE_STORED.Stored = true;
             TYPE_STORED.Freeze();
         }
@@ -170,7 +170,7 @@ namespace Lucene.Net.Document
         public IntField(string name, int value, FieldType type)
             : base(name, type)
         {
-            if (type.NumericTypeValue != Lucene.Net.Document.FieldType.NumericType.INT)
+            if (type.NumericTypeValue != Documents.FieldType.NumericType.INT)
             {
                 throw new System.ArgumentException("type.numericType() must be INT but got " + type.NumericTypeValue);
             }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/LongDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/LongDocValuesField.cs b/src/Lucene.Net.Core/Document/LongDocValuesField.cs
index 7d4a988..d40ac74 100644
--- a/src/Lucene.Net.Core/Document/LongDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/LongDocValuesField.cs
@@ -1,4 +1,7 @@
-namespace Lucene.Net.Document
+using System;
+
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,7 +41,7 @@ namespace Lucene.Net.Document
         /// Creates a new DocValues field with the specified 64-bit long value </summary>
         /// <param name="name"> field name </param>
         /// <param name="value"> 64-bit long value </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null </exception>
+        /// <exception cref="ArgumentException"> if the field name is null </exception>
         public LongDocValuesField(string name, long value)
             : base(name, value)
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/LongField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/LongField.cs b/src/Lucene.Net.Core/Document/LongField.cs
index 320a286..74d63df 100644
--- a/src/Lucene.Net.Core/Document/LongField.cs
+++ b/src/Lucene.Net.Core/Document/LongField.cs
@@ -1,7 +1,7 @@
 using System;
 using Lucene.Net.Index;
 
-namespace Lucene.Net.Document
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,11 +20,6 @@ namespace Lucene.Net.Document
      * limitations under the License.
      */
 
-    // javadocs
-    
-    // javadocs
-    // javadocs
-
     /// <summary>
     /// <p>
     /// Field that indexes <code>long</code> values
@@ -137,13 +132,13 @@ namespace Lucene.Net.Document
             TYPE_NOT_STORED.Tokenized = true;
             TYPE_NOT_STORED.OmitNorms = true;
             TYPE_NOT_STORED.IndexOptionsValue = FieldInfo.IndexOptions.DOCS_ONLY;
-            TYPE_NOT_STORED.NumericTypeValue = Lucene.Net.Document.FieldType.NumericType.LONG;
+            TYPE_NOT_STORED.NumericTypeValue = Documents.FieldType.NumericType.LONG;
             TYPE_NOT_STORED.Freeze();
             TYPE_STORED.Indexed = true;
             TYPE_STORED.Tokenized = true;
             TYPE_STORED.OmitNorms = true;
             TYPE_STORED.IndexOptionsValue = FieldInfo.IndexOptions.DOCS_ONLY;
-            TYPE_STORED.NumericTypeValue = Lucene.Net.Document.FieldType.NumericType.LONG;
+            TYPE_STORED.NumericTypeValue = Documents.FieldType.NumericType.LONG;
             TYPE_STORED.Stored = true;
             TYPE_STORED.Freeze();
         }
@@ -180,7 +175,7 @@ namespace Lucene.Net.Document
         public LongField(string name, long value, FieldType type)
             : base(name, type)
         {
-            if (type.NumericTypeValue != Lucene.Net.Document.FieldType.NumericType.LONG)
+            if (type.NumericTypeValue != Documents.FieldType.NumericType.LONG)
             {
                 throw new System.ArgumentException("type.numericType() must be LONG but got " + type.NumericTypeValue);
             }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/NumericDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/NumericDocValuesField.cs b/src/Lucene.Net.Core/Document/NumericDocValuesField.cs
index 41fede7..ac3da29 100644
--- a/src/Lucene.Net.Core/Document/NumericDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/NumericDocValuesField.cs
@@ -1,6 +1,8 @@
 using System;
 
-namespace Lucene.Net.Document
+using Lucene.Net.Index;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,9 +20,6 @@ namespace Lucene.Net.Document
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-
-    using FieldInfo = Lucene.Net.Index.FieldInfo;
-
     /// <summary>
     /// <p>
     /// Field that stores a per-document <code>long</code> value for scoring,

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/PackedLongDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/PackedLongDocValuesField.cs b/src/Lucene.Net.Core/Document/PackedLongDocValuesField.cs
index 55b1f20..ea2e11b 100644
--- a/src/Lucene.Net.Core/Document/PackedLongDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/PackedLongDocValuesField.cs
@@ -1,4 +1,7 @@
-namespace Lucene.Net.Document
+using System;
+
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,7 +42,7 @@ namespace Lucene.Net.Document
         /// Creates a new DocValues field with the specified long value </summary>
         /// <param name="name"> field name </param>
         /// <param name="value"> 64-bit long value </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null </exception>
+        /// <exception cref="ArgumentException"> if the field name is null </exception>
         public PackedLongDocValuesField(string name, long value)
             : base(name, value)
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/ShortDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/ShortDocValuesField.cs b/src/Lucene.Net.Core/Document/ShortDocValuesField.cs
index 122dd06..0826785 100644
--- a/src/Lucene.Net.Core/Document/ShortDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/ShortDocValuesField.cs
@@ -1,4 +1,7 @@
-namespace Lucene.Net.Document
+using System;
+
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,7 +42,7 @@ namespace Lucene.Net.Document
         /// Creates a new DocValues field with the specified 16-bit short value </summary>
         /// <param name="name"> field name </param>
         /// <param name="value"> 16-bit short value </param>
-        /// <exception cref="IllegalArgumentException"> if the field name is null </exception>
+        /// <exception cref="ArgumentException"> if the field name is null </exception>
         public ShortDocValuesField(string name, short value)
             : base(name, value)
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/SortedBytesDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/SortedBytesDocValuesField.cs b/src/Lucene.Net.Core/Document/SortedBytesDocValuesField.cs
index c9b4650..a0eb556 100644
--- a/src/Lucene.Net.Core/Document/SortedBytesDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/SortedBytesDocValuesField.cs
@@ -1,4 +1,7 @@
-namespace Lucene.Net.Document
+
+using Lucene.Net.Util;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,9 +19,6 @@ namespace Lucene.Net.Document
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-
-    using BytesRef = Lucene.Net.Util.BytesRef;
-
     /// <summary>
     /// <p>
     /// Field that stores

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/SortedDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/SortedDocValuesField.cs b/src/Lucene.Net.Core/Document/SortedDocValuesField.cs
index ed66dbb..04afea2 100644
--- a/src/Lucene.Net.Core/Document/SortedDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/SortedDocValuesField.cs
@@ -1,7 +1,9 @@
-namespace Lucene.Net.Document
-{
-    using BytesRef = Lucene.Net.Util.BytesRef;
 
+using Lucene.Net.Index;
+using Lucene.Net.Util;
+
+namespace Lucene.Net.Documents
+{
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +21,6 @@ namespace Lucene.Net.Document
          * limitations under the License.
          */
 
-    using FieldInfo = Lucene.Net.Index.FieldInfo;
-
     /// <summary>
     /// <p>
     /// Field that stores
@@ -37,7 +37,6 @@ namespace Lucene.Net.Document
     ///
     ///
     /// </summary>
-
     public class SortedDocValuesField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/SortedSetDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/SortedSetDocValuesField.cs b/src/Lucene.Net.Core/Document/SortedSetDocValuesField.cs
index 0ec44be..bff3aa7 100644
--- a/src/Lucene.Net.Core/Document/SortedSetDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/SortedSetDocValuesField.cs
@@ -1,7 +1,9 @@
-namespace Lucene.Net.Document
-{
-    using BytesRef = Lucene.Net.Util.BytesRef;
 
+using Lucene.Net.Index;
+using Lucene.Net.Util;
+
+namespace Lucene.Net.Documents
+{
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +21,6 @@ namespace Lucene.Net.Document
          * limitations under the License.
          */
 
-    using FieldInfo = Lucene.Net.Index.FieldInfo;
-
     /// <summary>
     /// <p>
     /// Field that stores

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/StoredField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/StoredField.cs b/src/Lucene.Net.Core/Document/StoredField.cs
index 0289458..860a56a 100644
--- a/src/Lucene.Net.Core/Document/StoredField.cs
+++ b/src/Lucene.Net.Core/Document/StoredField.cs
@@ -1,9 +1,11 @@
-namespace Lucene.Net.Document
+using Lucene.Net.Index;
+using Lucene.Net.Util;
+
+namespace Lucene.Net.Documents
 {
     // javadocs
     // javadocs
-    using BytesRef = Lucene.Net.Util.BytesRef;
-
+    
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
      * contributor license agreements.  See the NOTICE file distributed with

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/StraightBytesDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/StraightBytesDocValuesField.cs b/src/Lucene.Net.Core/Document/StraightBytesDocValuesField.cs
index 417899c..fea1f2a 100644
--- a/src/Lucene.Net.Core/Document/StraightBytesDocValuesField.cs
+++ b/src/Lucene.Net.Core/Document/StraightBytesDocValuesField.cs
@@ -1,4 +1,6 @@
-namespace Lucene.Net.Document
+using Lucene.Net.Util;
+
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -16,9 +18,6 @@ namespace Lucene.Net.Document
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-
-    using BytesRef = Lucene.Net.Util.BytesRef;
-
     /// <summary>
     /// <p>
     /// Field that stores

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/StringField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/StringField.cs b/src/Lucene.Net.Core/Document/StringField.cs
index 07f7d72..86abc2f 100644
--- a/src/Lucene.Net.Core/Document/StringField.cs
+++ b/src/Lucene.Net.Core/Document/StringField.cs
@@ -1,6 +1,6 @@
 using Lucene.Net.Index;
 
-namespace Lucene.Net.Document
+namespace Lucene.Net.Documents
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Document/TextField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Document/TextField.cs b/src/Lucene.Net.Core/Document/TextField.cs
index 9bd9f78..cdb6482 100644
--- a/src/Lucene.Net.Core/Document/TextField.cs
+++ b/src/Lucene.Net.Core/Document/TextField.cs
@@ -1,7 +1,8 @@
-namespace Lucene.Net.Document
-{
-    using System.IO;
+using System.IO;
+using Lucene.Net.Analysis;
 
+namespace Lucene.Net.Documents
+{
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +20,6 @@ namespace Lucene.Net.Document
          * limitations under the License.
          */
 
-    using TokenStream = Lucene.Net.Analysis.TokenStream;
-
     /// <summary>
     /// A field that is indexed and tokenized, without term
     ///  vectors.  For example this would be used on a 'body'

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Index/BinaryDocValuesFieldUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/BinaryDocValuesFieldUpdates.cs b/src/Lucene.Net.Core/Index/BinaryDocValuesFieldUpdates.cs
index 0db32d2..46ef31b 100644
--- a/src/Lucene.Net.Core/Index/BinaryDocValuesFieldUpdates.cs
+++ b/src/Lucene.Net.Core/Index/BinaryDocValuesFieldUpdates.cs
@@ -1,8 +1,9 @@
 using System;
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Index
 {
-    using BinaryDocValuesField = Lucene.Net.Document.BinaryDocValuesField;
+    using BinaryDocValuesField = BinaryDocValuesField;
     using BinaryDocValuesUpdate = Lucene.Net.Index.DocValuesUpdate.BinaryDocValuesUpdate;
     using BytesRef = Lucene.Net.Util.BytesRef;
     using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Index/CheckIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/CheckIndex.cs b/src/Lucene.Net.Core/Index/CheckIndex.cs
index 8447bac..b8dc100 100644
--- a/src/Lucene.Net.Core/Index/CheckIndex.cs
+++ b/src/Lucene.Net.Core/Index/CheckIndex.cs
@@ -31,7 +31,7 @@ namespace Lucene.Net.Index
     using Codec = Lucene.Net.Codecs.Codec;
     using Directory = Lucene.Net.Store.Directory;
     using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
     using DocValuesStatus = Lucene.Net.Index.CheckIndex.Status.DocValuesStatus;
     using FixedBitSet = Lucene.Net.Util.FixedBitSet;
     using IndexInput = Lucene.Net.Store.IndexInput;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Index/DocValuesUpdate.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocValuesUpdate.cs b/src/Lucene.Net.Core/Index/DocValuesUpdate.cs
index 7f27e42..8ce9307 100644
--- a/src/Lucene.Net.Core/Index/DocValuesUpdate.cs
+++ b/src/Lucene.Net.Core/Index/DocValuesUpdate.cs
@@ -1,7 +1,9 @@
+using Lucene.Net.Documents;
+
 namespace Lucene.Net.Index
 {
     using BytesRef = Lucene.Net.Util.BytesRef;
-    using NumericDocValuesField = Lucene.Net.Document.NumericDocValuesField;
+    using NumericDocValuesField = NumericDocValuesField;
     using RamUsageEstimator = Lucene.Net.Util.RamUsageEstimator;
 
     /*

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Index/IndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexReader.cs b/src/Lucene.Net.Core/Index/IndexReader.cs
index d1c95b5..8229a6d 100644
--- a/src/Lucene.Net.Core/Index/IndexReader.cs
+++ b/src/Lucene.Net.Core/Index/IndexReader.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Index
 {
@@ -26,8 +27,8 @@ namespace Lucene.Net.Index
          * limitations under the License.
          */
 
-    using Document = Lucene.Net.Document.Document;
-    using DocumentStoredFieldVisitor = Lucene.Net.Document.DocumentStoredFieldVisitor;
+    using Document = Documents.Document;
+    using DocumentStoredFieldVisitor = DocumentStoredFieldVisitor;
     using IOUtils = Lucene.Net.Util.IOUtils;
 
     // javadocs

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Index/IndexableFieldType.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexableFieldType.cs b/src/Lucene.Net.Core/Index/IndexableFieldType.cs
index e9ed61f..b30e5d1 100644
--- a/src/Lucene.Net.Core/Index/IndexableFieldType.cs
+++ b/src/Lucene.Net.Core/Index/IndexableFieldType.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Document;
+
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Index
 {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Index/NumericDocValuesFieldUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/NumericDocValuesFieldUpdates.cs b/src/Lucene.Net.Core/Index/NumericDocValuesFieldUpdates.cs
index 143b4aa..684f62a 100644
--- a/src/Lucene.Net.Core/Index/NumericDocValuesFieldUpdates.cs
+++ b/src/Lucene.Net.Core/Index/NumericDocValuesFieldUpdates.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Diagnostics;
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Index
 {
     using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
     using FixedBitSet = Lucene.Net.Util.FixedBitSet;
     using InPlaceMergeSorter = Lucene.Net.Util.InPlaceMergeSorter;
-    using NumericDocValuesField = Lucene.Net.Document.NumericDocValuesField;
+    using NumericDocValuesField = NumericDocValuesField;
     using NumericDocValuesUpdate = Lucene.Net.Index.DocValuesUpdate.NumericDocValuesUpdate;
     using PackedInts = Lucene.Net.Util.Packed.PackedInts;
     using PagedGrowableWriter = Lucene.Net.Util.Packed.PagedGrowableWriter;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Index/ReadersAndUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/ReadersAndUpdates.cs b/src/Lucene.Net.Core/Index/ReadersAndUpdates.cs
index 2e01b57..d1026af 100644
--- a/src/Lucene.Net.Core/Index/ReadersAndUpdates.cs
+++ b/src/Lucene.Net.Core/Index/ReadersAndUpdates.cs
@@ -3,11 +3,12 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Text;
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Index
 {
     using Lucene.Net.Support;
-    using BinaryDocValuesField = Lucene.Net.Document.BinaryDocValuesField;
+    using BinaryDocValuesField = BinaryDocValuesField;
     using Bits = Lucene.Net.Util.Bits;
     using BytesRef = Lucene.Net.Util.BytesRef;
 
@@ -36,7 +37,7 @@ namespace Lucene.Net.Index
     using IOUtils = Lucene.Net.Util.IOUtils;
     using LiveDocsFormat = Lucene.Net.Codecs.LiveDocsFormat;
     using MutableBits = Lucene.Net.Util.MutableBits;
-    using NumericDocValuesField = Lucene.Net.Document.NumericDocValuesField;
+    using NumericDocValuesField = NumericDocValuesField;
     using TrackingDirectoryWrapper = Lucene.Net.Store.TrackingDirectoryWrapper;
 
     // Used by IndexWriter to hold open SegmentReaders (for

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Search/FieldCache.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/FieldCache.cs b/src/Lucene.Net.Core/Search/FieldCache.cs
index d4c35ee..fa9a75b 100644
--- a/src/Lucene.Net.Core/Search/FieldCache.cs
+++ b/src/Lucene.Net.Core/Search/FieldCache.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Search
 {
@@ -28,11 +29,11 @@ namespace Lucene.Net.Search
          * limitations under the License.
          */
 
-    using DoubleField = Lucene.Net.Document.DoubleField;
-    using FloatField = Lucene.Net.Document.FloatField;
-    using IntField = Lucene.Net.Document.IntField;
-    using LongField = Lucene.Net.Document.LongField;
-    using NumericDocValuesField = Lucene.Net.Document.NumericDocValuesField;
+    using DoubleField = DoubleField;
+    using FloatField = FloatField;
+    using IntField = IntField;
+    using LongField = LongField;
+    using NumericDocValuesField = NumericDocValuesField;
     using NumericUtils = Lucene.Net.Util.NumericUtils;
     using RamUsageEstimator = Lucene.Net.Util.RamUsageEstimator;
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Search/IndexSearcher.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/IndexSearcher.cs b/src/Lucene.Net.Core/Search/IndexSearcher.cs
index ee5ba74..2740a8a 100644
--- a/src/Lucene.Net.Core/Search/IndexSearcher.cs
+++ b/src/Lucene.Net.Core/Search/IndexSearcher.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Search
          * limitations under the License.
          */
 
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
 
     // javadocs
     using IndexReader = Lucene.Net.Index.IndexReader;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Search/NumericRangeQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/NumericRangeQuery.cs b/src/Lucene.Net.Core/Search/NumericRangeQuery.cs
index b035e4f..0e3db46 100644
--- a/src/Lucene.Net.Core/Search/NumericRangeQuery.cs
+++ b/src/Lucene.Net.Core/Search/NumericRangeQuery.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Search
 {
@@ -31,7 +32,7 @@ namespace Lucene.Net.Search
     // for javadocs
     // for javadocs
     // for javadocs
-    using NumericType = Lucene.Net.Document.FieldType.NumericType;
+    using NumericType = FieldType.NumericType;
     using NumericUtils = Lucene.Net.Util.NumericUtils;
     using Terms = Lucene.Net.Index.Terms;
     using TermsEnum = Lucene.Net.Index.TermsEnum;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Search/Similarities/TFIDFSimilarity.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/Similarities/TFIDFSimilarity.cs b/src/Lucene.Net.Core/Search/Similarities/TFIDFSimilarity.cs
index 8b80af9..782e80f 100644
--- a/src/Lucene.Net.Core/Search/Similarities/TFIDFSimilarity.cs
+++ b/src/Lucene.Net.Core/Search/Similarities/TFIDFSimilarity.cs
@@ -1,3 +1,5 @@
+using Lucene.Net.Documents;
+
 namespace Lucene.Net.Search.Similarities
 {
     /*
@@ -450,7 +452,7 @@ namespace Lucene.Net.Search.Similarities
     ///
     ///      <ul>
     ///        <li><b>Field boost</b> - set by calling
-    ///        <seealso cref="Lucene.Net.Document.Field#setBoost(float) field.setBoost()"/>
+    ///        <seealso cref="Field#setBoost(float) field.setBoost()"/>
     ///        before adding the field to a document.
     ///        </li>
     ///        <li><b>lengthNorm</b> - computed

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.Core/Util/NumericUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/NumericUtils.cs b/src/Lucene.Net.Core/Util/NumericUtils.cs
index e09d942..41ce83a 100644
--- a/src/Lucene.Net.Core/Util/NumericUtils.cs
+++ b/src/Lucene.Net.Core/Util/NumericUtils.cs
@@ -1,3 +1,5 @@
+using Lucene.Net.Documents;
+
 namespace Lucene.Net.Util
 {
     using Lucene.Net.Search;
@@ -6,9 +8,9 @@ namespace Lucene.Net.Util
     using FilteredTermsEnum = Lucene.Net.Index.FilteredTermsEnum;
 
     // javadocs
-    using FloatField = Lucene.Net.Document.FloatField; // javadocs
-    using IntField = Lucene.Net.Document.IntField; // javadocs
-    using LongField = Lucene.Net.Document.LongField; // javadocs
+    using FloatField = FloatField; // javadocs
+    using IntField = IntField; // javadocs
+    using LongField = LongField; // javadocs
 
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index 7134361..f2f1bde 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Apache.NMS.Util;
+using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using NUnit.Framework;
 using System;
@@ -34,16 +35,16 @@ namespace Lucene.Net.Analysis
     using System.IO;
     using Attribute = Lucene.Net.Util.Attribute;
     using Directory = Lucene.Net.Store.Directory;
-    using Document = Lucene.Net.Document.Document;
-    using Field = Lucene.Net.Document.Field;
-    using FieldType = Lucene.Net.Document.FieldType;
+    using Document = Documents.Document;
+    using Field = Field;
+    using FieldType = FieldType;
     using IAttribute = Lucene.Net.Util.IAttribute;
     using IOUtils = Lucene.Net.Util.IOUtils;
     using LineFileDocs = Lucene.Net.Util.LineFileDocs;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
     using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;   
     using TestUtil = Lucene.Net.Util.TestUtil;
-    using TextField = Lucene.Net.Document.TextField;
+    using TextField = TextField;
 
     /// <summary>
     /// base class for all Lucene unit tests that use TokenStreams.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs b/src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs
index adf6f86..1b6e12a 100644
--- a/src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/CollationTestBase.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Analysis.Tokenattributes;
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Analysis
 {
@@ -29,9 +30,9 @@ namespace Lucene.Net.Analysis
          * limitations under the License.
          */
 
-    using Document = Lucene.Net.Document.Document;
-    using Field = Lucene.Net.Document.Field;
-    using FieldType = Lucene.Net.Document.FieldType;
+    using Document = Documents.Document;
+    using Field = Field;
+    using FieldType = FieldType;
     using IndexableBinaryStringTools = Lucene.Net.Util.IndexableBinaryStringTools;
     using IndexableField = Lucene.Net.Index.IndexableField;
     using IndexReader = Lucene.Net.Index.IndexReader;
@@ -44,13 +45,13 @@ namespace Lucene.Net.Analysis
     using ScoreDoc = Lucene.Net.Search.ScoreDoc;
     using Sort = Lucene.Net.Search.Sort;
     using SortField = Lucene.Net.Search.SortField;
-    using StringField = Lucene.Net.Document.StringField;
+    using StringField = StringField;
     using Term = Lucene.Net.Index.Term;
     using TermQuery = Lucene.Net.Search.TermQuery;
     using TermRangeFilter = Lucene.Net.Search.TermRangeFilter;
     using TermRangeQuery = Lucene.Net.Search.TermRangeQuery;
     using TestUtil = Lucene.Net.Util.TestUtil;
-    using TextField = Lucene.Net.Document.TextField;
+    using TextField = TextField;
 
     /// <summary>
     /// base test class for testing Unicode collation.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs
index 7a24fcc..d88ecb4 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Documents;
 using Lucene.Net.Randomized.Generators;
 using System.Collections.Generic;
 
@@ -5,7 +6,7 @@ namespace Lucene.Net.Index
 {
     using NUnit.Framework;
     using Directory = Lucene.Net.Store.Directory;
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
 
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,7 +26,7 @@ namespace Lucene.Net.Index
          */
 
     using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
-    using NumericDocValuesField = Lucene.Net.Document.NumericDocValuesField;
+    using NumericDocValuesField = NumericDocValuesField;
     using PackedInts = Lucene.Net.Util.Packed.PackedInts;
     using RAMDirectory = Lucene.Net.Store.RAMDirectory;
     using TestUtil = Lucene.Net.Util.TestUtil;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
index 0d1a25c..3c6c02d 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs
@@ -1,4 +1,5 @@
 using Apache.NMS.Util;
+using Lucene.Net.Documents;
 using Lucene.Net.Randomized.Generators;
 using System;
 using System.Collections.Generic;
@@ -27,31 +28,31 @@ namespace Lucene.Net.Index
          */
 
     using Analyzer = Lucene.Net.Analysis.Analyzer;
-    using BinaryDocValuesField = Lucene.Net.Document.BinaryDocValuesField;
+    using BinaryDocValuesField = BinaryDocValuesField;
     using Bits = Lucene.Net.Util.Bits;
     using BooleanClause = Lucene.Net.Search.BooleanClause;
     using BooleanQuery = Lucene.Net.Search.BooleanQuery;
     using BytesRef = Lucene.Net.Util.BytesRef;
     using BytesRefHash = Lucene.Net.Util.BytesRefHash;
     using Directory = Lucene.Net.Store.Directory;
-    using Document = Lucene.Net.Document.Document;
-    using Field = Lucene.Net.Document.Field;
+    using Document = Documents.Document;
+    using Field = Field;
     using FieldCache_Fields = Lucene.Net.Search.FieldCache_Fields;
-    using FloatDocValuesField = Lucene.Net.Document.FloatDocValuesField;
+    using FloatDocValuesField = FloatDocValuesField;
     using IndexSearcher = Lucene.Net.Search.IndexSearcher;
     using Lucene42DocValuesFormat = Lucene.Net.Codecs.Lucene42.Lucene42DocValuesFormat;
     using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
-    using NumericDocValuesField = Lucene.Net.Document.NumericDocValuesField;
+    using NumericDocValuesField = NumericDocValuesField;
     using Query = Lucene.Net.Search.Query;
     using ScoreDoc = Lucene.Net.Search.ScoreDoc;
     using SeekStatus = Lucene.Net.Index.TermsEnum.SeekStatus;
-    using SortedDocValuesField = Lucene.Net.Document.SortedDocValuesField;
-    using SortedSetDocValuesField = Lucene.Net.Document.SortedSetDocValuesField;
-    using StoredField = Lucene.Net.Document.StoredField;
-    using StringField = Lucene.Net.Document.StringField;
+    using SortedDocValuesField = SortedDocValuesField;
+    using SortedSetDocValuesField = SortedSetDocValuesField;
+    using StoredField = StoredField;
+    using StringField = StringField;
     using TermQuery = Lucene.Net.Search.TermQuery;
     using TestUtil = Lucene.Net.Util.TestUtil;
-    using TextField = Lucene.Net.Document.TextField;
+    using TextField = TextField;
     using TopDocs = Lucene.Net.Search.TopDocs;
 
     /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
index 3fed5ce..693540e 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseIndexFileFormatTestCase.cs
@@ -6,7 +6,7 @@ namespace Lucene.Net.Index
 {
     using Codec = Lucene.Net.Codecs.Codec;
     using Directory = Lucene.Net.Store.Directory;
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
 
     /*

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
index babf98b..23b1448 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs
@@ -6,7 +6,7 @@ using NUnit.Framework;
 namespace Lucene.Net.Index
 {
     using Directory = Lucene.Net.Store.Directory;
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
 
     /*

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index 46ae2ee..347fa9c 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Documents;
 using Lucene.Net.Randomized.Generators;
 using Lucene.Net.Support;
 using System;
@@ -32,12 +33,12 @@ namespace Lucene.Net.Index
     using Codec = Lucene.Net.Codecs.Codec;
     using Constants = Lucene.Net.Util.Constants;
     using Directory = Lucene.Net.Store.Directory;
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
     using DocValuesType = Lucene.Net.Index.FieldInfo.DocValuesType_e;
-    using Field = Lucene.Net.Document.Field;
+    using Field = Field;
     using FieldsConsumer = Lucene.Net.Codecs.FieldsConsumer;
     using FieldsProducer = Lucene.Net.Codecs.FieldsProducer;
-    using FieldType = Lucene.Net.Document.FieldType;
+    using FieldType = FieldType;
     using FixedBitSet = Lucene.Net.Util.FixedBitSet;
     using FlushInfo = Lucene.Net.Store.FlushInfo;
     using IOContext = Lucene.Net.Store.IOContext;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index d6246db..1e0d93a 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -1,5 +1,6 @@
 using Apache.NMS.Util;
 using Lucene.Net.Codecs;
+using Lucene.Net.Documents;
 using Lucene.Net.Randomized.Generators;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
@@ -15,15 +16,15 @@ namespace Lucene.Net.Index
     using Directory = Lucene.Net.Store.Directory;
 
     //using SimpleTextCodec = Lucene.Net.Codecs.simpletext.SimpleTextCodec;
-    using Document = Lucene.Net.Document.Document;
-    using DoubleField = Lucene.Net.Document.DoubleField;
-    using Field = Lucene.Net.Document.Field;
+    using Document = Documents.Document;
+    using DoubleField = DoubleField;
+    using Field = Field;
     using FieldCache_Fields = Lucene.Net.Search.FieldCache_Fields;
-    using FieldType = Lucene.Net.Document.FieldType;
-    using FloatField = Lucene.Net.Document.FloatField;
+    using FieldType = FieldType;
+    using FloatField = FloatField;
     using IndexSearcher = Lucene.Net.Search.IndexSearcher;
-    using IntField = Lucene.Net.Document.IntField;
-    using LongField = Lucene.Net.Document.LongField;
+    using IntField = IntField;
+    using LongField = LongField;
     using Lucene46Codec = Lucene.Net.Codecs.Lucene46.Lucene46Codec;
     using MMapDirectory = Lucene.Net.Store.MMapDirectory;
 
@@ -48,11 +49,11 @@ namespace Lucene.Net.Index
     using MockDirectoryWrapper = Lucene.Net.Store.MockDirectoryWrapper;
     using NumericRangeQuery = Lucene.Net.Search.NumericRangeQuery;
     using Query = Lucene.Net.Search.Query;
-    using StoredField = Lucene.Net.Document.StoredField;
-    using StringField = Lucene.Net.Document.StringField;
+    using StoredField = StoredField;
+    using StringField = StringField;
     using TermQuery = Lucene.Net.Search.TermQuery;
     using TestUtil = Lucene.Net.Util.TestUtil;
-    using TextField = Lucene.Net.Document.TextField;
+    using TextField = TextField;
     using TopDocs = Lucene.Net.Search.TopDocs;
 
     /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
index 6b326b5..312e16c 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Lucene.Net.Codecs;
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Index
 {
@@ -16,19 +17,19 @@ namespace Lucene.Net.Index
     using CharTermAttribute = Lucene.Net.Analysis.Tokenattributes.CharTermAttribute;
     using Codec = Lucene.Net.Codecs.Codec;
     using Directory = Lucene.Net.Store.Directory;
-    using Document = Lucene.Net.Document.Document;
-    using Field = Lucene.Net.Document.Field;
-    using FieldType = Lucene.Net.Document.FieldType;
+    using Document = Documents.Document;
+    using Field = Field;
+    using FieldType = FieldType;
     using FixedBitSet = Lucene.Net.Util.FixedBitSet;
     using IndexSearcher = Lucene.Net.Search.IndexSearcher;
     using OffsetAttribute = Lucene.Net.Analysis.Tokenattributes.OffsetAttribute;
     using PayloadAttribute = Lucene.Net.Analysis.Tokenattributes.PayloadAttribute;
     using PositionIncrementAttribute = Lucene.Net.Analysis.Tokenattributes.PositionIncrementAttribute;
     using SeekStatus = Lucene.Net.Index.TermsEnum.SeekStatus;
-    using StringField = Lucene.Net.Document.StringField;
+    using StringField = StringField;
     using TermQuery = Lucene.Net.Search.TermQuery;
     using TestUtil = Lucene.Net.Util.TestUtil;
-    using TextField = Lucene.Net.Document.TextField;
+    using TextField = TextField;
 
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Index/DocHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/DocHelper.cs b/src/Lucene.Net.TestFramework/Index/DocHelper.cs
index 91a56fa..d80d755 100644
--- a/src/Lucene.Net.TestFramework/Index/DocHelper.cs
+++ b/src/Lucene.Net.TestFramework/Index/DocHelper.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Documents;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
@@ -25,16 +26,16 @@ namespace Lucene.Net.Index
 
     using Analyzer = Lucene.Net.Analysis.Analyzer;
     using Directory = Lucene.Net.Store.Directory;
-    using Document = Lucene.Net.Document.Document;
-    using Field = Lucene.Net.Document.Field;
-    using FieldType = Lucene.Net.Document.FieldType;
+    using Document = Documents.Document;
+    using Field = Field;
+    using FieldType = FieldType;
     using IndexSearcher = Lucene.Net.Search.IndexSearcher;
     using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
     using MockTokenizer = Lucene.Net.Analysis.MockTokenizer;
     using Similarity = Lucene.Net.Search.Similarities.Similarity;
-    using StoredField = Lucene.Net.Document.StoredField;
-    using StringField = Lucene.Net.Document.StringField;
-    using TextField = Lucene.Net.Document.TextField;
+    using StoredField = StoredField;
+    using StringField = StringField;
+    using TextField = TextField;
 
     public class DocHelper
     {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
index 723c92e..824ca0e 100644
--- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using Lucene.Net.Documents;
 
 namespace Lucene.Net.Index
 {
@@ -14,9 +15,9 @@ namespace Lucene.Net.Index
     using Bits = Lucene.Net.Util.Bits;
     using BytesRef = Lucene.Net.Util.BytesRef;
     using Directory = Lucene.Net.Store.Directory;
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
     using FailOnNonBulkMergesInfoStream = Lucene.Net.Util.FailOnNonBulkMergesInfoStream;
-    using Field = Lucene.Net.Document.Field;
+    using Field = Field;
     using IndexSearcher = Lucene.Net.Search.IndexSearcher;
     using LineFileDocs = Lucene.Net.Util.LineFileDocs;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/273b9fdb/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
index 20436ea..d6cc5c5 100644
--- a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
+++ b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
@@ -13,7 +13,7 @@ namespace Lucene.Net.Search
     using Bits = Lucene.Net.Util.Bits;
     using Directory = Lucene.Net.Store.Directory;
     using DirectoryReader = Lucene.Net.Index.DirectoryReader;
-    using Document = Lucene.Net.Document.Document;
+    using Document = Documents.Document;
     using IndexReader = Lucene.Net.Index.IndexReader;
     using IndexWriter = Lucene.Net.Index.IndexWriter;
     using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig;


Mime
View raw message