From 1a961a9736eea8718b5af666eb51777090de2086 Mon Sep 17 00:00:00 2001
From: Bogdan Gheorghe <gheorghe@ca.ibm.com>
Date: Thu, 7 Apr 2005 20:19:53 +0000
Subject: [PATCH] Refactored index storage framework to allow for offset
 storage Updated source indexer and ctagsindexer to add offset info to index
 Updated IndexViewer to display offsets Updated Index Tests

---
 .../indexer/tests/IndexerOffsetTests.java     |  92 +++++
 .../indexer/tests/SourceIndexerTests.java     |   8 +-
 .../browser/cache/IndexerDependenciesJob.java |   8 +-
 .../core/browser/cache/IndexerTypesJob.java   |  10 +-
 .../sourcedependency/DependencyQueryJob.java  |  12 +-
 .../cdt/internal/core/index/IEntryResult.java |   6 +
 .../internal/core/index/IIndexerOutput.java   |  11 +-
 .../{impl => cindexstorage}/EntryResult.java  |  24 +-
 .../ICIndexStorageConstants.java              | 108 +++++
 .../InMemoryIndex.java                        | 130 +++---
 .../{impl => cindexstorage}/IncludeEntry.java |   2 +-
 .../IncludeEntryHashedArray.java              |   2 +-
 .../index/{impl => cindexstorage}/Index.java  |  36 +-
 .../cindexstorage/IndexPathVariableEntry.java |  70 ++++
 .../IndexPathVariableEntryHashedArray.java    | 117 ++++++
 .../index/cindexstorage/IndexedFileEntry.java |  76 ++++
 .../IndexedFileEntryHashedArray.java}         |  38 +-
 .../IndexerOutput.java                        |  26 +-
 .../index/{impl => cindexstorage}/Util.java   |  22 +-
 .../core/index/cindexstorage/WordEntry.java   | 385 ++++++++++++++++++
 .../WordEntryHashedArray.java                 |   4 +-
 .../{impl => cindexstorage/io}/Block.java     |   5 +-
 .../io}/BlocksIndexInput.java                 |  50 ++-
 .../io}/BlocksIndexOutput.java                |  19 +-
 .../io}/CodeByteStream.java                   |   2 +-
 .../{impl => cindexstorage/io}/Field.java     |   4 +-
 .../io}/FileListBlock.java                    |  15 +-
 .../io}/GammaCompressedIndexBlock.java        |  54 ++-
 .../io}/IndexBlock.java                       |   4 +-
 .../io}/IndexInput.java                       |  11 +-
 .../io}/IndexOutput.java                      |   7 +-
 .../io}/IndexSummary.java                     |  14 +-
 .../io}/MergeFactory.java                     |  35 +-
 .../io}/SafeRandomAccessFile.java             |   2 +-
 .../io}/SimpleIndexInput.java                 |  25 +-
 .../ctagsindexer/CTagsConsoleParser.java      |  11 +-
 .../index/ctagsindexer/CTagsFileReader.java   |  16 +-
 .../ctagsindexer/CTagsIndexerRunner.java      |   4 +-
 .../DOMSourceIndexerRunner.java               |   6 +-
 .../domsourceindexer/IndexEncoderUtil.java    |  15 +-
 .../core/index/impl/IIndexConstants.java      |  29 --
 .../internal/core/index/impl/IndexedFile.java |  59 ---
 .../internal/core/index/impl/WordEntry.java   | 186 ---------
 .../index/sourceindexer/AbstractIndexer.java  |  85 ++--
 .../index/sourceindexer/CIndexStorage.java    |   2 +-
 .../sourceindexer/SourceIndexerRequestor.java |  16 +-
 .../sourceindexer/SourceIndexerRunner.java    |   4 +-
 .../eclipse/cdt/core/search/OrPattern.java    |   2 +-
 .../core/search/PatternSearchJob.java         |   2 +-
 .../core/search/matching/CSearchPattern.java  |   4 +-
 .../matching/ClassDeclarationPattern.java     |   6 +-
 .../matching/FieldDeclarationPattern.java     |   6 +-
 .../core/search/matching/IncludePattern.java  |   7 +-
 .../matching/MacroDeclarationPattern.java     |   6 +-
 .../matching/MethodDeclarationPattern.java    |   6 +-
 .../matching/NamespaceDeclarationPattern.java |   6 +-
 .../ui/tests/IndexerView/IndexerNodeLeaf.java |  38 +-
 57 files changed, 1329 insertions(+), 621 deletions(-)
 create mode 100644 core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/IndexerOffsetTests.java
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage}/EntryResult.java (74%)
 create mode 100644 core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/ICIndexStorageConstants.java
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage}/InMemoryIndex.java (67%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage}/IncludeEntry.java (99%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage}/IncludeEntryHashedArray.java (97%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage}/Index.java (89%)
 create mode 100644 core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexPathVariableEntry.java
 create mode 100644 core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexPathVariableEntryHashedArray.java
 create mode 100644 core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexedFileEntry.java
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl/IndexedFileHashedArray.java => cindexstorage/IndexedFileEntryHashedArray.java} (71%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage}/IndexerOutput.java (75%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage}/Util.java (94%)
 create mode 100644 core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/WordEntry.java
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage}/WordEntryHashedArray.java (95%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/Block.java (93%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/BlocksIndexInput.java (90%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/BlocksIndexOutput.java (86%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/CodeByteStream.java (99%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/Field.java (98%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/FileListBlock.java (86%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/GammaCompressedIndexBlock.java (81%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/IndexBlock.java (91%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/IndexInput.java (91%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/IndexOutput.java (82%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/IndexSummary.java (95%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/MergeFactory.java (88%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/SafeRandomAccessFile.java (94%)
 rename core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/{impl => cindexstorage/io}/SimpleIndexInput.java (85%)
 delete mode 100644 core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IIndexConstants.java
 delete mode 100644 core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexedFile.java
 delete mode 100644 core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/WordEntry.java

diff --git a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/IndexerOffsetTests.java b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/IndexerOffsetTests.java
new file mode 100644
index 00000000000..e2e0bbb90a3
--- /dev/null
+++ b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/IndexerOffsetTests.java
@@ -0,0 +1,92 @@
+/**********************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors: 
+ * IBM - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.cdt.core.indexer.tests;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.eclipse.cdt.internal.core.index.cindexstorage.ICIndexStorageConstants;
+import org.eclipse.cdt.internal.core.index.cindexstorage.WordEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.GammaCompressedIndexBlock;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexBlock;
+
+/**
+ * @author Bogdan Gheorghe
+ */
+public class IndexerOffsetTests extends TestCase {
+
+    public static void main(String[] args) {
+    }
+    
+	public static Test suite() {
+		TestSuite suite = new TestSuite(IndexerOffsetTests.class.getName());
+
+		suite.addTest(new IndexerOffsetTests("testOffsetsResizing")); //$NON-NLS-1$
+	
+		return suite;
+	
+	}
+	
+	/**
+	 * Constructor for IndexerOffsetTests.
+	 * @param name
+	 */
+	public IndexerOffsetTests(String name) {
+		super(name);
+	}
+	
+	public void testOffsetsResizing() throws Exception{
+	    WordEntry word = new WordEntry("typeDecl/C/Test".toCharArray());
+	    word.addRef(2);
+	    word.addOffset(235,2,ICIndexStorageConstants.OFFSET);
+	    word.addOffset(512,2,ICIndexStorageConstants.OFFSET);
+	    word.addOffset(512,2,ICIndexStorageConstants.OFFSET);
+	    word.addOffset(512,2,ICIndexStorageConstants.OFFSET);
+	    word.addRef(5);
+	    word.addOffset(43,5,ICIndexStorageConstants.OFFSET);
+	    word.addOffset(2,5,ICIndexStorageConstants.LINE);
+	    word.addOffset(89,5,ICIndexStorageConstants.OFFSET);
+	    word.addOffset(63,5,ICIndexStorageConstants.LINE);
+	    word.addOffset(124,5,ICIndexStorageConstants.OFFSET);
+	    word.addRef(9);
+	    word.addOffset(433,9,ICIndexStorageConstants.OFFSET);
+	    word.addOffset(234,9,ICIndexStorageConstants.OFFSET);
+	    word.addRef(11);
+	    word.addOffset(4233,11,ICIndexStorageConstants.OFFSET);
+	    word.addOffset(2314,11,ICIndexStorageConstants.OFFSET);
+	    word.addRef(17);
+	    word.addOffset(2,17,ICIndexStorageConstants.OFFSET);
+	    word.addOffset(52,17,ICIndexStorageConstants.OFFSET);
+	    int[] test =word.getOffsets(1);
+	    
+	    WordEntry word2 = new WordEntry("typeDecl/C/Test".toCharArray());
+	    word2.addRef(4);
+	    word2.addOffset(13,4, ICIndexStorageConstants.OFFSET);
+	    word2.addOffset(17,4, ICIndexStorageConstants.OFFSET);
+	    word2.addOffset(20,4,ICIndexStorageConstants.OFFSET);
+	    word2.addRef(7);
+	    word2.addOffset(21,7, ICIndexStorageConstants.OFFSET);
+	    word2.addOffset(24,7, ICIndexStorageConstants.OFFSET);
+	    word2.addOffset(28,7,ICIndexStorageConstants.OFFSET);
+	    
+	    word.addWordInfo(word2.getRefs(), word2.getOffsets(), word2.getOffsetCount());
+	    
+	    word.mapRefs(new int[]{-1, 1, 17, 3, 4, 11, 6, 7, 8, 24, 10, 5, 12, 13, 14, 15, 16, 2});
+	   
+	    IndexBlock block= new GammaCompressedIndexBlock(ICIndexStorageConstants.BLOCK_SIZE);
+	    block.addEntry(word);
+	    block.flush();
+	    
+	    WordEntry entry= new WordEntry();
+		block.nextEntry(entry);
+	}
+}
diff --git a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/SourceIndexerTests.java b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/SourceIndexerTests.java
index b900dedc339..6f47e1e3928 100644
--- a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/SourceIndexerTests.java
+++ b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/SourceIndexerTests.java
@@ -151,13 +151,13 @@ public class SourceIndexerTests extends TestCase implements IIndexChangeListener
 		TestSuite suite = new TestSuite(SourceIndexerTests.class.getName());
 
 		suite.addTest(new SourceIndexerTests("testAddNewFileToIndex")); //$NON-NLS-1$
-		suite.addTest(new SourceIndexerTests("testForwardDeclarations")); //$NON-NLS-1$
+/*		suite.addTest(new SourceIndexerTests("testForwardDeclarations")); //$NON-NLS-1$
 		suite.addTest(new SourceIndexerTests("testIndexAll")); //$NON-NLS-1$
 		suite.addTest(new SourceIndexerTests("testIndexContents")); //$NON-NLS-1$
 		suite.addTest(new SourceIndexerTests("testMacros")); //$NON-NLS-1$
 		suite.addTest(new SourceIndexerTests("testRefs")); //$NON-NLS-1$
-		suite.addTest(new SourceIndexerTests("testExactDeclarations")); //$NON-NLS-1$
-		suite.addTest(new SourceIndexerTests("testRemoveFileFromIndex")); //$NON-NLS-1$
+*/		suite.addTest(new SourceIndexerTests("testExactDeclarations")); //$NON-NLS-1$
+		//suite.addTest(new SourceIndexerTests("testRemoveFileFromIndex")); //$NON-NLS-1$
 		suite.addTest(new SourceIndexerTests("testRemoveProjectFromIndex")); //$NON-NLS-1$
 		suite.addTest(new SourceIndexerTests("testIndexShutdown")); //$NON-NLS-1$
 	
@@ -259,7 +259,7 @@ public class SourceIndexerTests extends TestCase implements IIndexChangeListener
 		ind = sourceIndexer.getIndex(testProjectPath,true,true);
 		
 		char[] prefix = "typeDecl/C/CDocumentManager".toCharArray(); //$NON-NLS-1$
-		String [] entryResultModel ={"EntryResult: word=typeDecl/C/CDocumentManager, refs={ 2 }"}; //$NON-NLS-1$
+		String [] entryResultModel ={"EntryResult: word=typeDecl/C/CDocumentManager, refs={ 2 }, offsets={ [ 2121] }"}; //$NON-NLS-1$
 		IEntryResult[] eresults =ind.queryEntries(prefix);
 		IEntryResult[] bogRe = ind.queryEntries(IIndexConstants.TYPE_DECL);
 		assertTrue("Entry Result exists", eresults != null); //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerDependenciesJob.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerDependenciesJob.java
index 5ff2bb7e45e..6bbc5041199 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerDependenciesJob.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerDependenciesJob.java
@@ -17,9 +17,9 @@ import org.eclipse.cdt.core.browser.PathUtil;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
 import org.eclipse.cdt.internal.core.index.IIndex;
-import org.eclipse.cdt.internal.core.index.impl.BlocksIndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.BlocksIndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
 import org.eclipse.core.resources.IProject;
@@ -76,7 +76,7 @@ public class IndexerDependenciesJob extends IndexerJob {
 							if (progressMonitor.isCanceled())
 								throw new InterruptedException();
 
-							IndexedFile file = input.getIndexedFile(references[j]);
+							IndexedFileEntry file = input.getIndexedFile(references[j]);
 							if (file != null && file.getPath() != null) {
 								IPath path = PathUtil.getWorkspaceRelativePath(file.getPath());
 								fTypeCache.flush(path);
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob.java
index b573ec475db..aae004e9b9e 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob.java
@@ -22,9 +22,9 @@ import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
 import org.eclipse.cdt.internal.core.index.IIndex;
-import org.eclipse.cdt.internal.core.index.impl.BlocksIndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.BlocksIndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
 import org.eclipse.core.resources.IProject;
@@ -175,7 +175,7 @@ public class IndexerTypesJob extends IndexerJob {
 //					}
 //				}
 				// just grab the first reference
-				IndexedFile file = input.getIndexedFile(references[0]);
+				IndexedFileEntry file = input.getIndexedFile(references[0]);
 				if (file != null && file.getPath() != null) {
 					IPath path = PathUtil.getWorkspaceRelativePath(file.getPath());
 					info.addReference(new TypeReference(path, project));
@@ -200,7 +200,7 @@ public class IndexerTypesJob extends IndexerJob {
 				if (monitor.isCanceled())
 					throw new InterruptedException();
 
-				IndexedFile file = input.getIndexedFile(references[i]);
+				IndexedFileEntry file = input.getIndexedFile(references[i]);
 				if (file != null && file.getPath() != null) {
 					IPath path = PathUtil.getWorkspaceRelativePath(file.getPath());
 					info.addDerivedReference(new TypeReference(path, project));
diff --git a/core/org.eclipse.cdt.core/dependency/org/eclipse/cdt/internal/core/sourcedependency/DependencyQueryJob.java b/core/org.eclipse.cdt.core/dependency/org/eclipse/cdt/internal/core/sourcedependency/DependencyQueryJob.java
index 96ebdf31cdb..8fa75a17382 100644
--- a/core/org.eclipse.cdt.core/dependency/org/eclipse/cdt/internal/core/sourcedependency/DependencyQueryJob.java
+++ b/core/org.eclipse.cdt.core/dependency/org/eclipse/cdt/internal/core/sourcedependency/DependencyQueryJob.java
@@ -18,10 +18,10 @@ import java.util.List;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.search.SearchEngine;
 import org.eclipse.cdt.internal.core.index.IIndex;
-import org.eclipse.cdt.internal.core.index.impl.BlocksIndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IncludeEntry;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IncludeEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.BlocksIndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer;
 import org.eclipse.cdt.internal.core.search.IndexSelector;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
@@ -174,11 +174,11 @@ public class DependencyQueryJob implements IIndexJob {
 	 */
 	private void findDep(IndexInput input) throws IOException {
 		
-		IndexedFile indexedFile = input.getIndexedFile(file.getFullPath().toString());
+		IndexedFileEntry indexedFile = input.getIndexedFile(file.getFullPath().toString());
 		if (indexedFile == null) return;
 		
 		
-		int fileNum =indexedFile.getFileNumber();
+		int fileNum =indexedFile.getFileID();
 		IncludeEntry[] tempEntries = input.queryIncludeEntries(fileNum);
 		if (tempEntries != null){
 			for (int r=0; r<tempEntries.length; r++){
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IEntryResult.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IEntryResult.java
index 396d81291b5..95f6c60b796 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IEntryResult.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IEntryResult.java
@@ -23,5 +23,11 @@ public interface IEntryResult {
 	 * Returns the encoded word of this entry
 	 */
 	public char[] getWord();
+	/**
+	 * Returns the offsets for this entry - offsets are in the same position
+	 * as the file references (ex. the first offset array belongs to the first
+	 * file reference etc.)
+	 */
+	public int[][] getOffsets();
 }
 
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IIndexerOutput.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IIndexerOutput.java
index 253ea5af626..ed58f41c6d8 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IIndexerOutput.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/IIndexerOutput.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.index;
 
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
 
 /**
  * This class represents the output from an indexer to an index 
@@ -18,11 +18,12 @@ import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
  */
 
 public interface IIndexerOutput {
-	public void addRef(int indexedFileNumber, char[] word);
-	public void addRef(int indexedFileNumber, String word);
+    public void addRef(int indexedFileNumber, char[] word);
+	public void addRef(int indexedFileNumber, char[] word, int offset, int offsetType);
+	public void addRef(int indexedFileNumber, String word, int offset, int offsetType);
 	
-	public IndexedFile getIndexedFile(String path); 
-	public IndexedFile addIndexedFile(String path);
+	public IndexedFileEntry  getIndexedFile(String path); 
+	public IndexedFileEntry  addIndexedFile(String path);
 	//For Dep Tree
 	public void addIncludeRef(int indexedFileNumber, char[] word);
 	public void addIncludeRef(int indexedFileNumber, String word);
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/EntryResult.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/EntryResult.java
similarity index 74%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/EntryResult.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/EntryResult.java
index 236dd90fd0f..b56181d5ba0 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/EntryResult.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/EntryResult.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage;
 
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
@@ -17,10 +17,12 @@ import org.eclipse.cdt.internal.core.index.IEntryResult;
 public class EntryResult implements IEntryResult {
 	private char[] word;
 	private int[]  fileRefs;
+	private int[][] offsets;
 	
-public EntryResult(char[] word, int[] refs) {
+public EntryResult(char[] word, int[] refs, int[][] offsets) {
 	this.word = word;
 	this.fileRefs = refs;
+	this.offsets = offsets;
 }
 public boolean equals(Object anObject){
 	
@@ -61,9 +63,27 @@ public String toString(){
 		buffer.append(' ');
 		buffer.append(fileRefs[i]);
 	}
+	buffer.append(" }, offsets={"); //$NON-NLS-1$
+	for (int i = 0; i < offsets.length; i++){
+		if (i > 0) buffer.append(',');
+		buffer.append(' ');
+		buffer.append('['); 
+		for (int j=0; j<offsets[i].length; j++){
+		    if (j > 0) buffer.append(',');
+			buffer.append(' ');
+		    buffer.append(offsets[i][j]);
+		}
+		buffer.append(']'); 
+	}
 	buffer.append(" }"); //$NON-NLS-1$
 	return buffer.toString();
 }
+/* (non-Javadoc)
+ * @see org.eclipse.cdt.internal.core.index.IEntryResult#getOffsets()
+ */
+public int[][] getOffsets() {
+    return offsets;
+}
 
 }
 
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/ICIndexStorageConstants.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/ICIndexStorageConstants.java
new file mode 100644
index 00000000000..2c6ebce3db3
--- /dev/null
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/ICIndexStorageConstants.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.core.index.cindexstorage;
+
+/**
+ * This interface provides constants used by the search engine.
+ */
+public interface ICIndexStorageConstants {
+	/**
+	 * The signature of the index file.
+	 */
+	public static final String SIGNATURE= "INDEX FILE 0.015"; //$NON-NLS-1$
+	/**
+	 * The separator for files in the index file.
+	 */
+	public static final char FILE_SEPARATOR= '/';
+	/**
+	 * The size of a block for a <code>Block</code>.
+	 */
+	public static final int BLOCK_SIZE= 8192;
+	
+	/**
+	 * Encodings used in CIndexStorage - can be used by clients to encode
+	 * strings destined for the index. Proper format is:
+	 * 
+	 * {encodings + encodingTypes} 
+	 * 
+	 * for everything except type strings which should look like:
+	 * 
+	 * {encodings + encodingTypes + typeConstants + '/'}.
+	 */
+	final static int TYPE = 1;
+	final static int FUNCTION = 2;
+	final static int METHOD = 3;
+	final static int FIELD = 4;
+	final static int MACRO = 5;
+	final static int NAMESPACE = 6;
+	final static int ENUMTOR = 7;
+	final static int INCLUDE = 8;
+
+    final static char[][] encodings = {
+            new char[] {' '},   // not used
+            "type".toCharArray(),    	// TYPES            //$NON-NLS-1$
+            "function".toCharArray(),   // FUNCTIONS        //$NON-NLS-1$
+            "method".toCharArray(),    	// METHODS          //$NON-NLS-1$
+            "field".toCharArray(),    	// FIELDS           //$NON-NLS-1$
+            "macro".toCharArray(),    	// MACROS           //$NON-NLS-1$
+            "namespace".toCharArray(),  // NAMESPACES       //$NON-NLS-1$
+            "enumtor".toCharArray(),    // ENUMERATORS      //$NON-NLS-1$
+            "include".toCharArray()   	// INCLUDES	        //$NON-NLS-1$
+        };
+    
+    /**
+	 * Encoding types
+	 */
+    final static int DECLARATION = 1;
+    final static int REFERENCE = 2;
+    final static int DEFINITION = 3;
+    
+    final static char[][] encodingTypes = {
+            new char[] {' '},   // not used
+            "Decl/".toCharArray(),   // DECLARATIONS        //$NON-NLS-1$
+            "Ref/".toCharArray(),    // REFERENCES          //$NON-NLS-1$
+            "Defn/".toCharArray()    // DEFINTIONS          //$NON-NLS-1$
+        };
+    
+    /**
+     * Encoding constants used in CIndexStorage
+     */
+	final static int TYPE_CLASS = 1;
+	final static int TYPE_STRUCT = 2;
+	final static int TYPE_UNION = 3;
+	final static int TYPE_ENUM = 4;
+	final static int TYPE_VAR = 5;
+	final static int TYPE_TYPEDEF = 6;
+	final static int TYPE_DERIVED = 7;
+	final static int TYPE_FRIEND = 8;
+	final static int TYPE_FWD_CLASS = 9;
+	final static int TYPE_FWD_STRUCT = 10;
+	final static int TYPE_FWD_UNION = 11;
+	
+    final static char[] typeConstants = {
+            ' ',    // not used
+            'C',    // CLASS            
+            'S',    // STRUCT          
+            'U',    // UNION            
+            'E',    // ENUM             
+            'V',    // VAR              
+            'T',    // TYPEDEF          
+            'D',    // DERIVED          
+            'F',    // FRIEND           
+            'G',    // FWD_CLASS        
+            'H',    // FWD_STRUCT       
+            'I'     // FWD_UNION
+        };
+    
+    //Used for offsets
+    final static int LINE=1;
+    final static int OFFSET=2;
+}
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/InMemoryIndex.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/InMemoryIndex.java
similarity index 67%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/InMemoryIndex.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/InMemoryIndex.java
index 75d2af87a3b..133e87dadbe 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/InMemoryIndex.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/InMemoryIndex.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,13 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.eclipse.cdt.internal.core.index.IIndex;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.BlocksIndexOutput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexOutput;
 
+ 
 /**
  * This index stores the document names in an <code>ObjectVector</code>, and the words in
  * an <code>HashtableOfObjects</code>.
@@ -27,13 +29,17 @@ public class InMemoryIndex {
 	*/
 	protected IncludeEntryHashedArray includes;
 	/**
-	 * hashtable of WordEntrys = words+numbers of the files they appear in.
+	 * Array of WordEntry
 	 */
 	protected WordEntryHashedArray words;
 	/**
-	 * List of IndexedFiles = file name + a unique number.
+	 * Array of IndexedFileEntry
 	 */
-	protected IndexedFileHashedArray files;
+	protected IndexedFileEntryHashedArray files;
+	/**
+	 * Array of IndexedPathVariableEntry = file name + a unique number.
+	 */
+	protected IndexPathVariableEntryHashedArray  pathVars;
 	/**
 	 * Size of the index.
 	 */
@@ -41,95 +47,84 @@ public class InMemoryIndex {
 
 	private IncludeEntry[] sortedIncludeEntries;
 	private WordEntry[] sortedWordEntries;
-	private IndexedFile[] sortedFiles;
-
+	private IndexedFileEntry[] sortedFiles;
+	private IndexPathVariableEntry[] sortedPathVars;
 	private int lastId;
 	
 	public InMemoryIndex() {
-		includes= new IncludeEntryHashedArray(501);
 		init();
 	}
 	
-	public IndexedFile addFile(String path){
-		IndexedFile indexedFile = this.files.add(path);
-		this.footprint += indexedFile.footprint() + 4;
+	public IndexedFileEntry addFile(String path){
+	    IndexedFileEntry indexedFileEntry = this.files.add(path);
+		this.footprint += indexedFileEntry.footprint() + 4;
 		this.sortedFiles = null;
-		return indexedFile;
+		return indexedFileEntry;
 	}
 	
-	public void addIncludeRef(IndexedFile indexedFile, char[] include) {
-		addIncludeRef(include, indexedFile.getFileNumber());
+	public void addIncludeRef(IndexedFileEntry indexedFile, char[] include) {
+		addIncludeRef(include, indexedFile.getFileID());
 	}
 	
-	public void addIncludeRef(IndexedFile indexedFile, String include) {
-		addIncludeRef(include.toCharArray(), indexedFile.getFileNumber());
+	public void addIncludeRef(IndexedFileEntry indexedFile, String include) {
+		addIncludeRef(include.toCharArray(), indexedFile.getFileID());
 	}
 	
 	/**
-		 * Adds the references of the include to the tree (reference = number of the file the include belongs to).
-		 */
-		protected void addIncludeRef(char[] include, int[] references) {
-			int size= references.length;
-			int i= 0;
-			while (i < size) {
-				if (references[i] != 0)
-					addIncludeRef(include, references[i]);
-				i++;
-			}
-		}
-		/**
-		 * Looks if the include already exists to the tree and adds the fileNum to this include.
-		 * If the include does not exist, it adds it to the tree.
-		 */
-		protected void addIncludeRef(char[] include, int fileNum) {
-			IncludeEntry entry= this.includes.get(include);
-			if (entry == null) {
-				entry= new IncludeEntry(include, ++lastId);
-				entry.addRef(fileNum);
-				this.includes.add(entry);
-				this.sortedIncludeEntries= null;
-				this.footprint += entry.footprint();
-			} else {
-				this.footprint += entry.addRef(fileNum);
-			}
-		}
-
-	/**
-	 * Adds the references of the word to the index (reference = number of the file the word belongs to).
+	 * Adds the references of the include to the tree (reference = number of the file the include belongs to).
 	 */
-	protected void addRef(char[] word, int[] references) {
+	protected void addIncludeRef(char[] include, int[] references) {
 		int size= references.length;
 		int i= 0;
 		while (i < size) {
 			if (references[i] != 0)
-				addRef(word, references[i]);
+				addIncludeRef(include, references[i]);
 			i++;
 		}
 	}
+	/**
+	 * Looks if the include already exists to the tree and adds the fileNum to this include.
+	 * If the include does not exist, it adds it to the tree.
+	 */
+	protected void addIncludeRef(char[] include, int fileNum) {
+		IncludeEntry entry= this.includes.get(include);
+		if (entry == null) {
+			entry= new IncludeEntry(include, ++lastId);
+			entry.addRef(fileNum);
+			this.includes.add(entry);
+			this.sortedIncludeEntries= null;
+			this.footprint += entry.footprint();
+		} else {
+			this.footprint += entry.addRef(fileNum);
+		}
+	}
 	/**
 	 * Looks if the word already exists in the index and add the fileNum to this word.
 	 * If the word does not exist, it adds it in the index.
 	 * @param indexFlags
 	 */
-	protected void addRef(char[] word, int fileNum) {
+	protected void addRef(char[] word, int fileNum, int offset, int offsetType) {
 		WordEntry entry= this.words.get(word);
+	
 		if (entry == null) {
 			entry= new WordEntry(word);
 			entry.addRef(fileNum);
+			entry.addOffset(offset,fileNum, offsetType);
 			this.words.add(entry);
 			this.sortedWordEntries= null;
 			this.footprint += entry.footprint();
 		} else {
 			this.footprint += entry.addRef(fileNum);
+			entry.addOffset(offset, fileNum, offsetType);
 		}
 	}
 
-	public void addRef(IndexedFile indexedFile, char[] word) {
-		addRef(word, indexedFile.getFileNumber());
+	public void addRef(IndexedFileEntry indexedFile, char[] word, int offset, int offsetType) {
+		addRef(word, indexedFile.getFileID(), offset, offsetType);
 	}
 
-	public void addRef(IndexedFile indexedFile, String word) {
-		addRef(word.toCharArray(), indexedFile.getFileNumber());
+	public void addRef(IndexedFileEntry indexedFile, String word, int offset, int offsetType) {
+		addRef(word.toCharArray(), indexedFile.getFileID(), offset, offsetType);
 	}
 	
 	public void addRelatives(int fileNumber, String inclusion, String parent) {
@@ -161,13 +156,13 @@ public class InMemoryIndex {
 	/**
 	 * Returns the indexed files contained in the hashtable of includes.
 	 */
-	public IndexedFile[] getIndexedFiles(){
+	public IndexedFileEntry[] getIndexedFiles(){
 		return this.files.asArray();
 	}
 	/**
 	 * Returns the indexed file with the given path, or null if such file does not exist.
 	 */
-	public IndexedFile getIndexedFile(String path) {
+	public IndexedFileEntry getIndexedFile(String path) {
 		return files.get(path);
 	}
 	/**
@@ -182,15 +177,11 @@ public class InMemoryIndex {
 	protected IncludeEntry getIncludeEntry(char[] include) {
 		return includes.get(include);
 	}
-	/**
-	 * @see IIndex#getNumDocuments()
-	 */
+
 	public int getNumFiles() {
 		return files.size();
 	}
-	/**
-	 * @see IIndex#getNumWords()
-	 */
+	
 	public int getNumWords() {
 		return words.elementSize;
 	}
@@ -202,9 +193,9 @@ public class InMemoryIndex {
 	/**
 	 * Returns the words contained in the hashtable of words, sorted by alphabetical order.
 	 */
-	protected IndexedFile[] getSortedFiles() {
+	public IndexedFileEntry[] getSortedFiles() {
 		if (this.sortedFiles == null) {
-			IndexedFile[] indexedFiles= files.asArray();
+			IndexedFileEntry[] indexedFiles= files.asArray();
 			Util.sort(indexedFiles);
 			this.sortedFiles= indexedFiles;
 		}
@@ -213,7 +204,7 @@ public class InMemoryIndex {
 	/**
 	 * Returns the word entries contained in the hashtable of words, sorted by alphabetical order.
 	 */
-	protected WordEntry[] getSortedWordEntries() {
+	public WordEntry[] getSortedWordEntries() {
 		if (this.sortedWordEntries == null) {
 			WordEntry[] words= this.words.asArray();
 			Util.sort(words);
@@ -224,7 +215,7 @@ public class InMemoryIndex {
 	/**
 	 * Returns the include entries contained in the hashtable of includeas, sorted by alphabetical order.
 	 */
-	protected IncludeEntry[] getSortedIncludeEntries() {
+	public IncludeEntry[] getSortedIncludeEntries() {
 		if (this.sortedIncludeEntries == null) {
 			IncludeEntry[] includes= this.includes.asArray();
 			Util.sort(includes);
@@ -235,7 +226,7 @@ public class InMemoryIndex {
 	/**
 	 * Returns the word entry corresponding to the given word.
 	 */
-	protected WordEntry getWordEntry(char[] word) {
+	public WordEntry getWordEntry(char[] word) {
 		return words.get(word);
 	}
 	/**
@@ -244,7 +235,8 @@ public class InMemoryIndex {
 	public void init() {
 		includes= new IncludeEntryHashedArray(501);
 		words= new WordEntryHashedArray(501);
-		files= new IndexedFileHashedArray(101);
+		files= new IndexedFileEntryHashedArray(101);
+		pathVars= new IndexPathVariableEntryHashedArray(101);
 		footprint= 0;
 		lastId=0;
 		sortedWordEntries= null;
@@ -285,7 +277,7 @@ public class InMemoryIndex {
 		boolean ok= false;
 		try {
 			output.open();
-			IndexedFile[] indexedFiles= files.asArray();
+			IndexedFileEntry[] indexedFiles= files.asArray();
 			for (int i= 0, length = indexedFiles.length; i < length; ++i)
 				output.addFile(indexedFiles[i]); // written out in order BUT not alphabetical
 			getSortedWordEntries(); // init the slot
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IncludeEntry.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IncludeEntry.java
similarity index 99%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IncludeEntry.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IncludeEntry.java
index 3ff8ba0fbde..b7e12b5be57 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IncludeEntry.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IncludeEntry.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IncludeEntryHashedArray.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IncludeEntryHashedArray.java
similarity index 97%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IncludeEntryHashedArray.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IncludeEntryHashedArray.java
index 3c7bc80c5b6..2712f0b7b34 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IncludeEntryHashedArray.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IncludeEntryHashedArray.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage;
 
 import org.eclipse.cdt.internal.core.CharOperation;
 
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Index.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Index.java
similarity index 89%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Index.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Index.java
index 9cfd5c9caaa..2edd0e87dc6 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Index.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Index.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,6 +24,14 @@ import org.eclipse.cdt.internal.core.index.IEntryResult;
 import org.eclipse.cdt.internal.core.index.IIndex;
 import org.eclipse.cdt.internal.core.index.IIndexer;
 import org.eclipse.cdt.internal.core.index.IQueryResult;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.BlocksIndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.BlocksIndexOutput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexOutput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.MergeFactory;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.SimpleIndexInput;
+import org.eclipse.cdt.internal.core.index.impl.IndexDelta;
+import org.eclipse.cdt.internal.core.index.impl.Int;
 import org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IPath;
@@ -93,7 +101,7 @@ public class Index implements IIndex {
 		if (timeToMerge()) {
 			merge();
 		}
-		IndexedFile indexedFile= addsIndex.getIndexedFile(file.getFullPath().toString());
+		IndexedFileEntry indexedFile= addsIndex.getIndexedFile(file.getFullPath().toString());
 		if (indexedFile != null /*&& removedInAdds.get(document.getName()) == null*/
 			)
 			remove(indexedFile, MergeFactory.ADDS_INDEX);
@@ -184,7 +192,7 @@ public class Index implements IIndex {
 		IndexInput input= new BlocksIndexInput(indexFile);
 		try {
 			input.open();
-			IndexedFile file = input.getIndexedFile(documentNumber);
+			IndexedFileEntry file = input.getIndexedFile(documentNumber);
 			if (file == null) return null;
 			return file.getPath();
 		} finally {
@@ -217,10 +225,10 @@ public class Index implements IIndex {
 			} catch(IOException e) {
 				BlocksIndexInput input = (BlocksIndexInput)mainIndexInput;
 				try {
-					input.opened = true;
+					input.setOpened(true);
 					input.close();
 				} finally {
-					input.opened = false;
+					input.setOpened(false);
 				}
 				indexFile.delete();
 				mainIndexInput = null;
@@ -360,8 +368,8 @@ public class Index implements IIndex {
 		List tempFileReturn = new ArrayList();
 		try {
 			input.open();
-			IndexedFile inFile = input.getIndexedFile(file.getFullPath().toString());
-			fileNum =inFile.getFileNumber();
+			IndexedFileEntry inFile = input.getIndexedFile(file.getFullPath().toString());
+			fileNum =inFile.getFileID();
 	
 			IncludeEntry[] tempEntries = input.queryIncludeEntries(fileNum);
 			for (int i=0; i<tempEntries.length; i++)
@@ -379,16 +387,16 @@ public class Index implements IIndex {
 	 * @see IIndex#remove
 	 */
 	public void remove(String documentName) throws IOException {
-		IndexedFile file= addsIndex.getIndexedFile(documentName);
+		IndexedFileEntry file= addsIndex.getIndexedFile(documentName);
 		if (file != null) {
 			//the file is in the adds Index, we remove it from this one
 			Int lastRemoved= (Int) removedInAdds.get(documentName);
 			if (lastRemoved != null) {
-				int fileNum= file.getFileNumber();
+				int fileNum= file.getFileID();
 				if (lastRemoved.value < fileNum)
 					lastRemoved.value= fileNum;
 			} else
-				removedInAdds.put(documentName, new Int(file.getFileNumber()));
+				removedInAdds.put(documentName, new Int(file.getFileID()));
 		} else {
 			//we remove the file from the old index
 			removedInOld.put(documentName, new Int(1));
@@ -399,15 +407,15 @@ public class Index implements IIndex {
 	 * Removes the given document from the given index (MergeFactory.ADDS_INDEX for the
 	 * in memory index, MergeFactory.OLD_INDEX for the index on the disk).
 	 */
-	protected void remove(IndexedFile file, int index) throws IOException {
+	protected void remove(IndexedFileEntry file, int index) throws IOException {
 		String name= file.getPath();
 		if (index == MergeFactory.ADDS_INDEX) {
 			Int lastRemoved= (Int) removedInAdds.get(name);
 			if (lastRemoved != null) {
-				if (lastRemoved.value < file.getFileNumber())
-					lastRemoved.value= file.getFileNumber();
+				if (lastRemoved.value < file.getFileID())
+					lastRemoved.value= file.getFileID();
 			} else
-				removedInAdds.put(name, new Int(file.getFileNumber()));
+				removedInAdds.put(name, new Int(file.getFileID()));
 		} else if (index == MergeFactory.OLD_INDEX)
 			removedInOld.put(name, new Int(1));
 		else
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexPathVariableEntry.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexPathVariableEntry.java
new file mode 100644
index 00000000000..e9c3e9cbbb3
--- /dev/null
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexPathVariableEntry.java
@@ -0,0 +1,70 @@
+/**********************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors: 
+ * IBM - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.cdt.internal.core.index.cindexstorage;
+
+/**
+ * @author Bogdan Gheorghe
+ */
+public class IndexPathVariableEntry {
+    //All indexes will reserve 1 in the PathVariable block to represent
+    //the workspace location
+    public static final int WORKSPACE_ID = 1;
+    
+    private String	pathVariableName;
+    private String	pathVariablePath;
+    private int 	pathVarID;
+    
+    public IndexPathVariableEntry(String pathVarName, String pathVarPath, int id){
+        this.pathVariableName = pathVarName;
+        this.pathVariablePath = pathVarPath;
+        this.pathVarID	= id;
+    }
+
+    /**
+     * @return Returns the id.
+     */
+    public int getId() {
+        return pathVarID;
+    }
+    /**
+     * @param id The id to set.
+     */
+    public void setId(int id) {
+        this.pathVarID = id;
+    }
+    /**
+     * @return Returns the pathVariableName.
+     */
+    public String getPathVariableName() {
+        return pathVariableName;
+    }
+    /**
+     * @return Returns the pathVariablePath.
+     */
+    public String getPathVariablePath() {
+        return pathVariablePath;
+    }
+    
+	/**
+	 * Returns the size of the indexedFile.
+	 */
+	public int footprint() {
+		//object+ 3 slots + size of the string (Object size + (4 fields in String class)
+	    //+ 8 for char array in string + (2 for each char * number of chars in string)) + {another String}
+		return 8 + (3 * 4) + (8 + (4 * 4) + 8 + (pathVariableName.length() * 2)) + (8 + (4 * 4) + 8 + (pathVariablePath.length() * 2));
+	}
+	
+	public String toString() {
+		return "IndexPathVariableEntry(" + pathVarID + ": " + pathVariableName + " + " + pathVariablePath + ")"; //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-3$ //$NON-NLS-4$
+	}
+
+	
+}
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexPathVariableEntryHashedArray.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexPathVariableEntryHashedArray.java
new file mode 100644
index 00000000000..975be5478fc
--- /dev/null
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexPathVariableEntryHashedArray.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.core.index.cindexstorage;
+
+import java.util.ArrayList;
+
+public final class IndexPathVariableEntryHashedArray {
+
+private IndexPathVariableEntry elements[];
+private int elementSize; // number of elements in the table
+private int threshold;
+private int lastId;
+private ArrayList replacedElements;
+
+public IndexPathVariableEntryHashedArray(int size) {
+	if (size < 7) size = 7;
+	this.elements = new IndexPathVariableEntry[2 * size + 1];
+	this.elementSize = 0;
+	this.threshold = size + 1; // size is the expected number of elements
+	this.lastId = 1; //start at 2; 1 is reserved for workspace variable
+	this.replacedElements = null;
+}
+
+public IndexPathVariableEntry add(String pathVarName, String path){
+	return add(new IndexPathVariableEntry(pathVarName, path, ++lastId));
+}
+
+/** 
+ * Adds the IndexPathVariableEntry to the list, hashed by path
+ * @param pathVar
+ */ 
+private IndexPathVariableEntry add(IndexPathVariableEntry pathVar) {
+	int length = elements.length;
+	String path = pathVar.getPathVariablePath();
+	int index = (path.hashCode() & 0x7FFFFFFF) % length;
+	IndexPathVariableEntry current;
+	while ((current = elements[index]) != null) {
+		if (current.getPathVariablePath().equals(path)) {
+			if (replacedElements == null) replacedElements = new ArrayList(5);
+			replacedElements.add(current);
+			return elements[index] = pathVar;
+		}
+		if (++index == length) index = 0;
+	}
+	elements[index] = pathVar;
+
+	// assumes the threshold is never equal to the size of the table
+	if (++elementSize > threshold) grow();
+	return pathVar;
+}
+
+public IndexPathVariableEntry[] asArray() {
+    IndexPathVariableEntry[] array = new IndexPathVariableEntry[lastId];
+	for (int i = 0, length = elements.length; i < length; i++) {
+	    IndexPathVariableEntry current = elements[i];
+		if (current != null)
+			array[current.getId() - 1] = current;
+	}
+	if (replacedElements != null) {
+		for (int i = 0, length = replacedElements.size(); i < length; i++) {
+		    IndexPathVariableEntry current = (IndexPathVariableEntry) replacedElements.get(i);
+			array[current.getId() - 1] = current;
+		}
+	}
+	return array;
+}
+
+/**
+ * Returns corresponing IndexPathVariableEntry for the given path or
+ * null if it hasn't been added to the array
+ * @param path
+ * @return
+ */
+public IndexPathVariableEntry get(String path) {
+	int length = elements.length;
+	int index = (path.hashCode() & 0x7FFFFFFF) % length;
+	IndexPathVariableEntry current;
+	while ((current = elements[index]) != null) {
+		if (current.getPathVariablePath().equals(path)) return current;
+		if (++index == length) index = 0;
+	}
+	return null;
+}
+
+private void grow() {
+	IndexPathVariableEntryHashedArray newArray = new IndexPathVariableEntryHashedArray(elementSize * 2); // double the number of expected elements
+	for (int i = 0, length = elements.length; i < length; i++)
+		if (elements[i] != null)
+			newArray.add(elements[i]);
+
+	// leave replacedElements as is
+	this.elements = newArray.elements;
+	this.elementSize = newArray.elementSize;
+	this.threshold = newArray.threshold;
+}
+
+public int size() {
+	return elementSize + (replacedElements == null ? 0 : replacedElements.size());
+}
+
+public String toString() {
+	String s = ""; //$NON-NLS-1$
+	IndexPathVariableEntry[] files = asArray();
+	for (int i = 0, length = files.length; i < length; i++)
+		s += files[i].toString() + "\n"; 	//$NON-NLS-1$
+	return s;
+}
+}
+
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexedFileEntry.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexedFileEntry.java
new file mode 100644
index 00000000000..22b60901738
--- /dev/null
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexedFileEntry.java
@@ -0,0 +1,76 @@
+/**********************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors: 
+ * IBM - Initial API and implementation
+ **********************************************************************/
+package org.eclipse.cdt.internal.core.index.cindexstorage;
+
+import org.eclipse.cdt.internal.core.index.IQueryResult;
+
+/**
+ * @author Bogdan Gheorghe
+ */
+public class IndexedFileEntry implements IQueryResult {
+    
+    /**
+     * Path relative to the workspace root for this file
+     */
+    private String path;
+    /**
+     * Unique file id
+     */
+    private int fileID;
+	/**
+     * Index Path Var id - links this file entry to a corresponding entry
+     * in IndexPathVariableEntry.
+     */
+    private int pathVarID;
+    /**
+     * MD5 for this file
+     */
+    private byte[] MD5;
+	
+	public IndexedFileEntry(String path, int fileNum) {
+		if (fileNum < 1)
+			throw new IllegalArgumentException();
+		this.fileID= fileNum;
+		this.path= path;
+	}
+	
+	/**
+	 * Returns the size of the indexedFile.
+	 */
+	public int footprint() {
+		//object+ 4 slots + size of the string (header + 4 slots + char[]) + size of byte array
+		return 8 + (4 * 4) + (8 + (4 * 4) + 8 + path.length() * 2); //Put in when you put in MD5 + (8 + MD5.length);
+	}
+	/**
+	 * Returns the file number.
+	 */
+	public int getFileID() {
+		return fileID;
+	}
+	/**
+	 * Returns the path.
+	 */
+	public String getPath() {
+		return path;
+	}
+	/**
+	 * Sets the file number.
+	 */
+	public void setFileNumber(int fileNumber) {
+	    this.fileID= fileNumber;
+	}
+	public String toString() {
+		return "IndexedFile(" + fileID + ": " + path + ")"; //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-3$
+	}
+	
+	
+	
+}
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexedFileHashedArray.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexedFileEntryHashedArray.java
similarity index 71%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexedFileHashedArray.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexedFileEntryHashedArray.java
index ff8da7094d5..422edca4955 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexedFileHashedArray.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexedFileEntryHashedArray.java
@@ -8,36 +8,36 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage;
 
 import java.util.ArrayList;
 
-public final class IndexedFileHashedArray {
+public final class IndexedFileEntryHashedArray {
 
-private IndexedFile elements[];
+private IndexedFileEntry elements[];
 private int elementSize; // number of elements in the table
 private int threshold;
 private int lastId;
 private ArrayList replacedElements;
 
-public IndexedFileHashedArray(int size) {
+public IndexedFileEntryHashedArray(int size) {
 	if (size < 7) size = 7;
-	this.elements = new IndexedFile[2 * size + 1];
+	this.elements = new IndexedFileEntry[2 * size + 1];
 	this.elementSize = 0;
 	this.threshold = size + 1; // size is the expected number of elements
 	this.lastId = 0;
 	this.replacedElements = null;
 }
 
-public IndexedFile add(String path){
-	return add(new IndexedFile(path, ++lastId));
+public IndexedFileEntry add(String path){
+	return add(new IndexedFileEntry(path, ++lastId));
 }
 
-private IndexedFile add(IndexedFile file) {
+private IndexedFileEntry add(IndexedFileEntry file) {
 	int length = elements.length;
 	String path = file.getPath();
 	int index = (path.hashCode() & 0x7FFFFFFF) % length;
-	IndexedFile current;
+	IndexedFileEntry current;
 	while ((current = elements[index]) != null) {
 		if (current.getPath().equals(path)) {
 			if (replacedElements == null) replacedElements = new ArrayList(5);
@@ -53,26 +53,26 @@ private IndexedFile add(IndexedFile file) {
 	return file;
 }
 
-public IndexedFile[] asArray() {
-	IndexedFile[] array = new IndexedFile[lastId];
+public IndexedFileEntry[] asArray() {
+    IndexedFileEntry[] array = new IndexedFileEntry[lastId];
 	for (int i = 0, length = elements.length; i < length; i++) {
-		IndexedFile current = elements[i];
+	    IndexedFileEntry current = elements[i];
 		if (current != null)
-			array[current.fileNumber - 1] = current;
+			array[current.getFileID() - 1] = current;
 	}
 	if (replacedElements != null) {
 		for (int i = 0, length = replacedElements.size(); i < length; i++) {
-			IndexedFile current = (IndexedFile) replacedElements.get(i);
-			array[current.fileNumber - 1] = current;
+		    IndexedFileEntry current = (IndexedFileEntry) replacedElements.get(i);
+			array[current.getFileID() - 1] = current;
 		}
 	}
 	return array;
 }
 
-public IndexedFile get(String path) {
+public IndexedFileEntry get(String path) {
 	int length = elements.length;
 	int index = (path.hashCode() & 0x7FFFFFFF) % length;
-	IndexedFile current;
+	IndexedFileEntry current;
 	while ((current = elements[index]) != null) {
 		if (current.getPath().equals(path)) return current;
 		if (++index == length) index = 0;
@@ -81,7 +81,7 @@ public IndexedFile get(String path) {
 }
 
 private void grow() {
-	IndexedFileHashedArray newArray = new IndexedFileHashedArray(elementSize * 2); // double the number of expected elements
+	IndexedFileEntryHashedArray newArray = new IndexedFileEntryHashedArray(elementSize * 2); // double the number of expected elements
 	for (int i = 0, length = elements.length; i < length; i++)
 		if (elements[i] != null)
 			newArray.add(elements[i]);
@@ -98,7 +98,7 @@ public int size() {
 
 public String toString() {
 	String s = ""; //$NON-NLS-1$
-	IndexedFile[] files = asArray();
+	IndexedFileEntry[] files = asArray();
 	for (int i = 0, length = files.length; i < length; i++)
 		s += files[i].toString() + "\n"; 	//$NON-NLS-1$
 	return s;
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexerOutput.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexerOutput.java
similarity index 75%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexerOutput.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexerOutput.java
index dc00f462def..601d8b4f432 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexerOutput.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/IndexerOutput.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage;
 
 import org.eclipse.cdt.internal.core.index.IIndexerOutput;
 
@@ -25,20 +25,30 @@ public class IndexerOutput implements IIndexerOutput {
 	public IndexerOutput(InMemoryIndex index) {
 		this.index= index;
 	}
+	
+	/**
+	 * @deprecated
+	 */
+	public void addRef(int indexedFileNumber, char[] word){
+	    addRef(indexedFileNumber,word,1,1);
+	}
+	
 	/**
 	 * Adds a reference to the given word to the inMemoryIndex.
 	 */
-	public void addRef(int indexedFileNumber, char[] word) {
+	public void addRef(int indexedFileNumber, char[] word, int offset, int offsetType) {
 		if (indexedFileNumber == 0) {
 			throw new IllegalStateException();
 		}
-		index.addRef(word, indexedFileNumber);
-	}
+		
+		
+		index.addRef(word, indexedFileNumber, offset, offsetType);
+	}  
 	/**
 	 * Adds a reference to the given word to the inMemoryIndex.
 	 */
-	public void addRef(int indexedFileNumber, String word) {
-		addRef(indexedFileNumber, word.toCharArray());
+	public void addRef(int indexedFileNumber, String word, int offset, int offsetType) {
+		addRef(indexedFileNumber, word.toCharArray(), offset, offsetType);
 	}
 		
 	public void addRelatives(int indexedFileNumber, String inclusion, String parent) {
@@ -59,7 +69,7 @@ public class IndexerOutput implements IIndexerOutput {
 		addIncludeRef(indexedFileNumber, word.toCharArray());
 	}
 	
-	public IndexedFile getIndexedFile(String path) {
+	public IndexedFileEntry getIndexedFile(String path) {
 		return index.getIndexedFile(path);
 	}
 	
@@ -67,7 +77,7 @@ public class IndexerOutput implements IIndexerOutput {
 	 * Adds the file path to the index, creating a new file entry
 	 * for it
 	 */
-	public IndexedFile addIndexedFile(String path) {
+	public IndexedFileEntry addIndexedFile(String path) {
 		return index.addFile(path);
 	}
 	
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Util.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Util.java
similarity index 94%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Util.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Util.java
index 6abcd24cc7b..519e8d4fe2c 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Util.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/Util.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage;
 
 import java.io.DataInput;
 import java.io.IOException;
@@ -143,19 +143,19 @@ public class Util {
 			quickSort(list, left, original_right);
 		}
 	}
-	private static void quickSort(IndexedFile[] list, int left, int right) {
+	private static void quickSort(IndexedFileEntry[] list, int left, int right) {
 		int original_left= left;
 		int original_right= right;
-		String mid= list[(left + right) / 2].path;
+		String mid= list[(left + right) / 2].getPath();
 		do {
-			while (list[left].path.compareTo(mid) < 0) {
+			while (list[left].getPath().compareTo(mid) < 0) {
 				left++;
 			}
-			while (mid.compareTo(list[right].path) < 0) {
+			while (mid.compareTo(list[right].getPath()) < 0) {
 				right--;
 			}
 			if (left <= right) {
-				IndexedFile tmp= list[left];
+				IndexedFileEntry tmp= list[left];
 				list[left]= list[right];
 				list[right]= tmp;
 				left++;
@@ -172,12 +172,12 @@ public class Util {
 	private static void quickSort(WordEntry[] list, int left, int right) {
 		int original_left= left;
 		int original_right= right;
-		char[] mid= list[(left + right) / 2].fWord;
+		char[] mid= list[(left + right) / 2].getWord();
 		do {
-			while (compare(list[left].fWord, mid) < 0) {
+			while (compare(list[left].getWord(), mid) < 0) {
 				left++;
 			}
-			while (compare(mid, list[right].fWord) < 0) {
+			while (compare(mid, list[right].getWord()) < 0) {
 				right--;
 			}
 			if (left <= right) {
@@ -195,6 +195,7 @@ public class Util {
 			quickSort(list, left, original_right);
 		}
 	}
+	
 	private static void quickSort(IncludeEntry[] list, int left, int right) {
 			int original_left= left;
 			int original_right= right;
@@ -309,7 +310,7 @@ public class Util {
 		if (list.length > 1)
 			quickSort(list, 0, list.length - 1);
 	}
-	public static void sort(IndexedFile[] list) {
+	public static void sort(IndexedFileEntry[] list) {
 		if (list.length > 1)
 			quickSort(list, 0, list.length - 1);
 	}
@@ -367,5 +368,6 @@ public class Util {
 			}
 		}
 	}
+   
 }
 
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/WordEntry.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/WordEntry.java
new file mode 100644
index 00000000000..4c98b7b7f6a
--- /dev/null
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/WordEntry.java
@@ -0,0 +1,385 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.core.index.cindexstorage;
+
+import org.eclipse.cdt.internal.core.CharOperation;
+
+public class WordEntry {
+   
+    //Prefix used for index encoding as defined in ICIndexStorageConstants
+    private int encodings; 
+    //Second part of encoding string as definined in ICIndexStorageConstants
+    private int encodingType;
+    //Used for type encodings only; defined in ICIndexStorageConstants
+    private int typeConstant;
+    
+    //Fully qualified name for ref 
+	private char[] word;
+	
+	//Number of file references for this word entry
+	private int fileRefCount;
+	//File reference id's
+	private int[] fileRefs;
+	
+	//Offset arrays - each fileRef's position in the fileRef array is the
+	//key into the offsets
+	//Offsets are prefixed with LINE or OFFSET designation
+	private int[][] offsets;
+	//Number of offsets in each offset array
+	private int[] offsetCount;
+	
+	public WordEntry() {
+		this(CharOperation.NO_CHAR);
+	}
+	public WordEntry(char[] word) {
+		this.word= word;
+		fileRefCount= 0;
+		fileRefs= new int[1];
+		offsets = new int [1][1];
+		offsetCount = new int[1];
+	}	
+	/**
+	 * Adds a reference and records the change in footprint.
+	 * @return returns the size increase for this instance
+	 */
+	public int addRef(int fileNum) {
+	    //Ensure that this is a unique fileNum that hasn't been added
+	    //already to the refs
+		if (fileRefCount > 0 && fileAlreadyAdded(fileNum)) {
+			return 0;
+		}
+		//Ensure that there is still space to add this ref - if so,
+		//add the reference
+		if (fileRefCount < fileRefs.length) {
+			fileRefs[fileRefCount++]= fileNum;
+			return 0;
+		} 
+		//Need to grow arrays - arrays will start at 1, grow to 4, 8, 16, 32, 64 etc.
+		int newSize= fileRefCount < 4 ? 4 : fileRefCount * 2;
+		//Grow the fileRefs array
+		System.arraycopy(fileRefs, 0, fileRefs= new int[newSize], 0, fileRefCount);
+		//Grow the offset array
+		System.arraycopy(offsets, 0, offsets= new int[newSize][1], 0, fileRefCount);
+		//Grow the offset count array
+		System.arraycopy(offsetCount, 0, offsetCount= new int[newSize], 0, fileRefCount);
+		//Add the new file reference
+		fileRefs[fileRefCount++]= fileNum;
+		return (newSize - fileRefCount + 1) * 4;
+	}
+    /**
+     * Checks to see if this file number has already been added
+     */
+    private boolean fileAlreadyAdded(int fileNum) {
+        for (int i=0; i<fileRefCount; i++){
+          if (fileRefs[i] == fileNum)
+              return true;
+        }
+        return false;
+    }
+    /**
+	 * Adds a set of references and records the change in footprint.
+     * @param passedOffsetCount
+     * @param offsets
+	 */
+	public void addWordInfo(int[] refs, int[][] passedOffsets, int[] passedOffsetCount) {
+		int[] newRefs= new int[fileRefCount + refs.length];
+		int[][]  newOffsets = new int[fileRefCount + refs.length][];
+		int[] newOffSetCount= new int[fileRefCount + refs.length];
+		
+		int pos1= 0;
+		int pos2= 0;
+		int posNew= 0;
+		int compare;
+		int r1= 0;
+		int r2= 0;
+		int i1=0;
+		int i2=0;
+		while (pos1 < fileRefCount || pos2 < refs.length) {
+			if (pos1 >= fileRefCount) {
+				r2= refs[pos2];
+				compare= -1;
+			} else if (pos2 >= refs.length) {
+				compare= 1;
+				r1= fileRefs[pos1];
+			} else {
+				r1= fileRefs[pos1];
+				r2= refs[pos2];
+				compare= r2 - r1;
+			}
+			if (compare > 0) {
+				newRefs[posNew]= r1;
+				newOffsets[posNew]= offsets[pos1];
+				newOffSetCount[posNew]=offsetCount[pos1];
+				posNew++;
+				pos1++;
+			} else {
+				if (r2 != 0) {
+					newRefs[posNew]= r2;
+					newOffsets[posNew]=passedOffsets[pos2];
+					newOffSetCount[posNew]=passedOffsetCount[pos2];
+					posNew++;
+				}
+				pos2++;
+			}
+		}
+		fileRefs= newRefs;
+		offsets= newOffsets;
+		offsetCount=newOffSetCount;
+		fileRefCount= posNew;
+	}
+	
+	/**
+	 * Adds a reference and records the change in footprint.
+	 * @return -1 if fileNumber not found, 0 if adding offset didn't result in 
+	 * change of object size, new size of object if adding offset forced the expansion
+	 * of the underlying array
+	 */
+	public int addOffset(int offset, int fileNum, int offsetType) {
+	    //Get the position in the fileRefs array for this file number - the 
+	    //position acts as an index into the offsets array
+	    int filePosition = getPositionForFile(fileNum);
+	    //File Number wasn't found
+        if (filePosition == -1)
+            return -1;
+        //Get the array containing the offsets for this file
+        int[] selectedOffsets = offsets[filePosition];
+        //Get the offset count for this file
+        int selectedOffsetCount = offsetCount[filePosition];
+        
+        //Encode the number with line/offset info
+        int encodedNumber = getEncodedNumber(offsetType, offset);
+        
+        //Check to see if this offset has already been added to the file
+        if (selectedOffsetCount > 0 && offsetAlreadyAdded(filePosition, encodedNumber)){
+            return 0;
+        }
+        
+    
+        //If there is still space in the array, add the encoded offset, update 
+        //the count
+		if (selectedOffsetCount < selectedOffsets.length) {
+		    selectedOffsets[selectedOffsetCount++]= encodedNumber;
+		    offsetCount[filePosition] = selectedOffsetCount;
+			return 0;
+		} 
+	
+		//Grow the offset array - start @ 1, grow to 4, 8, 16, 32, 64 etc.
+		int newSize= selectedOffsetCount < 4 ? 4 : selectedOffsetCount * 2; 
+		System.arraycopy(selectedOffsets, 0, selectedOffsets= new int[newSize], 0, selectedOffsetCount);
+	
+		//Add the encoded offset to the newly grown array, update the count
+		selectedOffsets[selectedOffsetCount++]= encodedNumber;
+		offsetCount[filePosition] = selectedOffsetCount;
+		//Put the newly grown array back in place
+		offsets[filePosition]=selectedOffsets;
+		
+		return (newSize - fileRefCount + 1) * 4;
+	}
+	
+	/**
+     * @param offsetType
+     * @param offset
+     * @return
+     */
+    private int getEncodedNumber(int offsetType, int offset) {
+        String offsetString = Integer.toString(offsetType) + Integer.toString(offset);
+        return Integer.parseInt(offsetString);
+    }
+    /**
+     * @param filePosition
+     * @return
+     */
+    private boolean offsetAlreadyAdded(int filePosition, int offset) {
+        int[] tempOffset = offsets[filePosition];
+        for (int i=0; i<tempOffset.length; i++){
+            if (tempOffset[i] == offset)
+                return true;
+        }
+        return false;
+    }
+    /**
+     * @param fileNum
+     * @return
+     */
+    private int getPositionForFile(int fileNum) {
+        for (int i=0; i<fileRefCount; i++){
+            if (fileRefs[i] == fileNum)
+                return i;
+        }
+        return -1;
+    }
+    /**
+	 * Returns the size of the wordEntry
+	 */
+	public int footprint() {
+		//Size of Object + (number of fields * size of Fields) + (Size of ArrayObject + (Number of chars * sizeof Chars)) + 
+		//(Size of ArrayObject + (Number of refs * sizeof int)) 
+		return 8 + (4 * 4) + (8 + word.length * 2) + (8 + fileRefs.length * 4);
+	}
+	/**
+	 * Returns the number of references, e.g. the number of files this word appears in.
+	 */
+	public int getNumRefs() {
+		return fileRefCount;
+	}
+	/**
+	 * returns the file number in the i position in the list of references.
+	 */
+	public int getRef(int i) {
+		if (i < fileRefCount) return fileRefs[i];
+		throw new IndexOutOfBoundsException();
+	}
+	/**
+	 * Returns the references of the wordEntry (the number of the files it appears in).
+	 */
+	public int[] getRefs() {
+		int[] result= new int[fileRefCount];
+		System.arraycopy(fileRefs, 0, result, 0, fileRefCount);
+		return result;
+	}
+	/**
+	 * Returns the offsets of the wordEntry 
+	 */
+	public int[][] getOffsets() {
+		int[][] result= new int[fileRefCount][];
+		for (int i=0; i<fileRefCount; i++){
+		   int offsetLength =offsetCount[i];
+		   int[] tempOffset = new int[offsetLength];
+		   System.arraycopy(offsets[i], 0, tempOffset, 0, offsetLength);
+		   result[i]=tempOffset;
+		}
+		return result;
+	}
+	/**
+	 * returns offset count array
+	 */
+	public int[] getOffsetCount(){
+		int[] result= new int[fileRefCount];
+		System.arraycopy(offsetCount, 0, result, 0, fileRefCount);
+		return result;
+	}
+	/**
+	 * returns the word of the wordEntry.
+	 */
+	public char[] getWord() {
+		return word;
+	}
+	/**
+	 * Changes the references of the wordEntry to match the mapping. For example,<br>
+	 * if the current references are [1 3 4]<br>
+	 * and mapping is [1 2 3 4 5]<br>
+	 * in references 1 becomes mapping[1] = 2, 3->4, and 4->5<br>
+	 * => references = [2 4 5].<br>
+	 */
+	public void mapRefs(int[] mappings) {
+		int position= 0;
+	
+		for (int i= 0; i < fileRefCount; i++) {
+			//Take care that the reference is actually within the bounds of the mapping
+			int map= -1;
+	
+			if(fileRefs[i] >= 0 && fileRefs[i] < mappings.length) 
+				map= mappings[fileRefs[i]];
+			if (map != -1 && map != 0)
+				fileRefs[position++]= map;
+		}
+		fileRefCount= position;
+
+		//Trim all arrays of excess flab
+		System.arraycopy(fileRefs, 0, (fileRefs= new int[fileRefCount]), 0, fileRefCount);
+		System.arraycopy(offsets, 0, (offsets = new int[fileRefCount][]), 0,fileRefCount);
+		System.arraycopy(offsetCount, 0,(offsetCount=new int[fileRefCount]),0,fileRefCount);
+		
+		//Store original ref positions in order to generate map
+		int[] originalRefs;
+		System.arraycopy(fileRefs, 0, (originalRefs = new int[fileRefCount]),0,fileRefCount);
+		//Sort file refs
+		Util.sort(fileRefs);
+		
+		 //Sort the original file refs
+	     int[] mapping = new int[fileRefs.length];
+	     figureOutMapping(originalRefs, mapping);
+	     mapOffsets(mapping);
+	}
+	
+	/**
+     * @param mapping
+     */
+    private void mapOffsets(int[] mapping) {
+        int fileRefLength = fileRefs.length;
+        int[][] tempOffsetsArray = new int[fileRefLength][];
+        int[] tempOffsetLengthArray = new int[fileRefLength];
+        
+        for (int i=0; i<mapping.length; i++){
+            int moveTo = mapping[i];
+            tempOffsetsArray[moveTo] = offsets[i];
+            tempOffsetLengthArray [moveTo] = offsetCount[i];
+        }
+        
+        System.arraycopy(tempOffsetsArray, 0, offsets,0, fileRefLength);
+        System.arraycopy(tempOffsetLengthArray, 0, offsetCount,0, fileRefLength);
+    }
+    private void figureOutMapping(int[] originalRefs, int[] mapping){
+	    int position = 0;
+        for (int i=0; i<originalRefs.length; i++){
+            int currentRef = originalRefs[i];
+            for (int j=0; j<fileRefs.length; j++){
+                if (currentRef == fileRefs[j]){
+                    mapping[position++] = j;
+                    break;
+                }
+            }
+        }
+	}
+	
+	/**
+	 * Clears the wordEntry.
+	 */
+	public void reset(char[] word) {
+		for (int i= fileRefCount; i-- > 0;) {
+			fileRefs[i]= 0;
+		}
+		fileRefCount= 0;
+		this.word= word;
+	}
+	public String toString() {
+		return new String(word);
+	}
+    /**
+     * Returns the sorted offset entries for the given index
+     * @return
+     */
+    public int[] getOffsets(int index) {
+        int[] tempOffset = offsets[index];
+        int offsetLength = offsetCount[index];
+      
+        int[] result= new int[offsetLength];
+		System.arraycopy(tempOffset, 0, result, 0, offsetLength);
+		Util.sort(result);
+		return result;
+    }
+    /**
+     * @param n
+     * @param tempOffsetArray
+     */
+    public void setOffsets(int index, int[] tempOffsetArray) {
+        int[] selectedOffsets = offsets[index];
+        int tempOffsetArrayLength = tempOffsetArray.length;
+        
+        //Grow the offset array - start @ 1, grow to 4, 8, 16, 32, 64 etc.
+		int newSize= tempOffsetArrayLength < 4 ? 4 : tempOffsetArrayLength * 2; 
+		System.arraycopy(tempOffsetArray, 0, selectedOffsets= new int[newSize], 0, tempOffsetArrayLength);
+		offsetCount[index] = tempOffsetArrayLength;
+		//Put the newly grown array back in place
+		offsets[index]=selectedOffsets;
+    }
+}
+
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/WordEntryHashedArray.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/WordEntryHashedArray.java
similarity index 95%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/WordEntryHashedArray.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/WordEntryHashedArray.java
index 3e57fa9dda4..cd4b8714a4e 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/WordEntryHashedArray.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/WordEntryHashedArray.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage;
 
 import org.eclipse.cdt.internal.core.CharOperation;
 
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Block.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/Block.java
similarity index 93%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Block.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/Block.java
index c2b1360af1c..58bb251ff41 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Block.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/Block.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,11 +9,12 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+
 /**
  * A block is a container that can hold information (a list of file names, a list of
  * words, ...), be saved on the disk and loaded in memory.
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/BlocksIndexInput.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/BlocksIndexInput.java
similarity index 90%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/BlocksIndexInput.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/BlocksIndexInput.java
index 09c89d7adcd..601f5a0e880 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/BlocksIndexInput.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/BlocksIndexInput.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,9 +19,13 @@ import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.Util;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
 import org.eclipse.cdt.internal.core.index.IQueryResult;
+import org.eclipse.cdt.internal.core.index.cindexstorage.EntryResult;
+import org.eclipse.cdt.internal.core.index.cindexstorage.ICIndexStorageConstants;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IncludeEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.WordEntry;
 import org.eclipse.cdt.internal.core.util.LRUCache;
-import org.eclipse.jface.text.IDocument;
-
+ 
 /**
  * This input is used for reading indexes saved using a BlocksIndexOutput.
  */
@@ -63,10 +67,10 @@ public class BlocksIndexInput extends IndexInput {
 	/**
 	 * @see IndexInput#getCurrentFile()
 	 */
-	public IndexedFile getCurrentFile() throws IOException {
+	public IndexedFileEntry getCurrentFile() throws IOException {
 		if (!hasMoreFiles())
 			return null;
-		IndexedFile file= null;
+		IndexedFileEntry file= null;
 		if ((file= currentFileListBlock.getFile(filePosition)) == null) {
 			currentFileListBlockNum= summary.getBlockNumForFileNum(filePosition);
 			currentFileListBlock= getFileListBlock(currentFileListBlockNum);
@@ -91,7 +95,7 @@ public class BlocksIndexInput extends IndexInput {
 		Block block= (Block) blockCache.get(key);
 		if (block != null && block instanceof FileListBlock)
 			return (FileListBlock) block;
-		FileListBlock fileListBlock= new FileListBlock(IIndexConstants.BLOCK_SIZE);
+		FileListBlock fileListBlock= new FileListBlock(ICIndexStorageConstants.BLOCK_SIZE);
 		fileListBlock.read(raf, blockNum);
 		blockCache.put(key, fileListBlock);
 		return fileListBlock;
@@ -104,7 +108,7 @@ public class BlocksIndexInput extends IndexInput {
 		Block block= (Block) blockCache.get(key);
 		if (block != null && block instanceof IndexBlock)
 			return (IndexBlock) block;
-		IndexBlock indexBlock= new GammaCompressedIndexBlock(IIndexConstants.BLOCK_SIZE);
+		IndexBlock indexBlock= new GammaCompressedIndexBlock(ICIndexStorageConstants.BLOCK_SIZE);
 		indexBlock.read(raf, blockNum);
 		blockCache.put(key, indexBlock);
 		return indexBlock;
@@ -112,7 +116,7 @@ public class BlocksIndexInput extends IndexInput {
 	/**
 	 * @see IndexInput#getIndexedFile(int)
 	 */
-	public IndexedFile getIndexedFile(int fileNum) throws IOException {
+	public IndexedFileEntry getIndexedFile(int fileNum) throws IOException {
 		int blockNum= summary.getBlockNumForFileNum(fileNum);
 		if (blockNum == -1)
 			return null;
@@ -122,10 +126,10 @@ public class BlocksIndexInput extends IndexInput {
 	/**
 	 * @see IndexInput#getIndexedFile(IDocument)
 	 */
-	public IndexedFile getIndexedFile(String fullPath) throws java.io.IOException {
+	public IndexedFileEntry getIndexedFile(String fullPath) throws java.io.IOException {
 		setFirstFile();
 		while (hasMoreFiles()) {
-			IndexedFile file= getCurrentFile();
+			IndexedFileEntry file= getCurrentFile();
 			String path= file.getPath();
 			if (path.equals(fullPath))
 				return file;
@@ -207,10 +211,10 @@ public class BlocksIndexInput extends IndexInput {
 		if (!opened) {
 			raf= new SafeRandomAccessFile(indexFile, "r"); //$NON-NLS-1$
 			String sig= raf.readUTF();
-			if (!sig.equals(IIndexConstants.SIGNATURE))
+			if (!sig.equals(ICIndexStorageConstants.SIGNATURE))
 				throw new IOException(Util.bind("exception.wrongFormat")); //$NON-NLS-1$
 			int summaryBlockNum= raf.readInt();
-			raf.seek(summaryBlockNum * (long) IIndexConstants.BLOCK_SIZE);
+			raf.seek(summaryBlockNum * (long) ICIndexStorageConstants.BLOCK_SIZE);
 			summary= new IndexSummary();
 			summary.read(raf);
 			init();
@@ -244,7 +248,7 @@ public class BlocksIndexInput extends IndexInput {
 			case -1 :
 				WordEntry entry = getEntry(pattern);
 				if (entry == null) return null;
-				return new IEntryResult[]{ new EntryResult(entry.getWord(), entry.getRefs()) };
+				return new IEntryResult[]{ new EntryResult(entry.getWord(), entry.getRefs(), entry.getOffsets()) };
 			case 0 :
 				blockNums = summary.getAllBlockNums();
 				break;
@@ -266,7 +270,7 @@ public class BlocksIndexInput extends IndexInput {
 					if (count == entries.length){
 						System.arraycopy(entries, 0, entries = new IEntryResult[count*2], 0, count);
 					}
-					entries[count++] = new EntryResult(entry.getWord(), entry.getRefs());
+					entries[count++] = new EntryResult(entry.getWord(), entry.getRefs(), entry.getOffsets());
 					found = true;
 				} else {
 					if (found) break;
@@ -296,7 +300,7 @@ public class BlocksIndexInput extends IndexInput {
 					if (count == entries.length){
 						System.arraycopy(entries, 0, entries = new IEntryResult[count*2], 0, count);
 					}
-					entries[count++] = new EntryResult(entry.getWord(), entry.getRefs());
+					entries[count++] = new EntryResult(entry.getWord(), entry.getRefs(), entry.getOffsets());
 					found = true;
 				} else {
 					if (found) break;
@@ -347,7 +351,7 @@ public class BlocksIndexInput extends IndexInput {
 		IQueryResult[] files = new IQueryResult[count];
 		Object[] indexedFiles = fileMatches.valueTable;
 		for (int i = 0, index = 0, max = indexedFiles.length; i < max; i++){
-			IndexedFile indexedFile = (IndexedFile) indexedFiles[i];
+			IndexedFileEntry indexedFile = (IndexedFileEntry) indexedFiles[i];
 			if (indexedFile != null){
 				files[index++] = indexedFile;
 			}
@@ -362,7 +366,7 @@ public class BlocksIndexInput extends IndexInput {
 		ArrayList matches= new ArrayList();
 		setFirstFile();
 		while (hasMoreFiles()) {
-			IndexedFile file= getCurrentFile();
+			IndexedFileEntry file= getCurrentFile();
 			if (file.getPath().indexOf(word) != -1)
 				matches.add(file);
 			moveToNextFile();
@@ -471,4 +475,16 @@ public class BlocksIndexInput extends IndexInput {
 		return entries;
 	}
 
+    /**
+     * @return Returns the opened.
+     */
+    public boolean isOpened() {
+        return opened;
+    }
+    /**
+     * @param opened The opened to set.
+     */
+    public void setOpened(boolean opened) {
+        this.opened = opened;
+    }
 }
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/BlocksIndexOutput.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/BlocksIndexOutput.java
similarity index 86%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/BlocksIndexOutput.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/BlocksIndexOutput.java
index a0ee21085c1..17aa03560f6 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/BlocksIndexOutput.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/BlocksIndexOutput.java
@@ -8,12 +8,17 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+import org.eclipse.cdt.internal.core.index.cindexstorage.ICIndexStorageConstants;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IncludeEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.WordEntry;
+
 /**
  * A blocksIndexOutput is used to save an index in a file with the given structure:<br>
  *  - Signature of the file;<br>
@@ -55,10 +60,10 @@ public class BlocksIndexOutput extends IndexOutput {
 	/**
 	 * @see IndexOutput#addFile
 	 */
-	public void addFile(IndexedFile indexedFile) throws IOException {
+	public void addFile(IndexedFileEntry indexedFile) throws IOException {
 		if (firstFileListBlock) {
 			firstInBlock= true;
-			fileListBlock= new FileListBlock(IIndexConstants.BLOCK_SIZE);
+			fileListBlock= new FileListBlock(ICIndexStorageConstants.BLOCK_SIZE);
 			firstFileListBlock= false;
 		}
 		if (fileListBlock.addFile(indexedFile)) {
@@ -80,7 +85,7 @@ public class BlocksIndexOutput extends IndexOutput {
 	 */
 	public void addWord(WordEntry entry) throws IOException {
 		if (firstIndexBlock) {
-			indexBlock= new GammaCompressedIndexBlock(IIndexConstants.BLOCK_SIZE);
+			indexBlock= new GammaCompressedIndexBlock(ICIndexStorageConstants.BLOCK_SIZE);
 			firstInBlock= true;
 			firstIndexBlock= false;
 		}
@@ -105,7 +110,7 @@ public class BlocksIndexOutput extends IndexOutput {
 	 */
 	public void addInclude(IncludeEntry entry) throws IOException {
 		if (firstIncludeIndexBlock) {
-			includeIndexBlock= new GammaCompressedIndexBlock(IIndexConstants.BLOCK_SIZE);
+			includeIndexBlock= new GammaCompressedIndexBlock(ICIndexStorageConstants.BLOCK_SIZE);
 			firstInBlock= true;
 			firstIncludeIndexBlock= false;
 		}
@@ -144,10 +149,10 @@ public class BlocksIndexOutput extends IndexOutput {
 		summary.setNumFiles(numFiles);
 		summary.setNumWords(numWords);
 		summary.setNumIncludes(numIncludes);
-		indexOut.seek(blockNum * (long) IIndexConstants.BLOCK_SIZE);
+		indexOut.seek(blockNum * (long) ICIndexStorageConstants.BLOCK_SIZE);
 		summary.write(indexOut);
 		indexOut.seek(0);
-		indexOut.writeUTF(IIndexConstants.SIGNATURE);
+		indexOut.writeUTF(ICIndexStorageConstants.SIGNATURE);
 		indexOut.writeInt(blockNum);
 	}
 	/**
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/CodeByteStream.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/CodeByteStream.java
similarity index 99%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/CodeByteStream.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/CodeByteStream.java
index 507616bd99a..dc6b37808e7 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/CodeByteStream.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/CodeByteStream.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.UTFDataFormatException;
 
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Field.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/Field.java
similarity index 98%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Field.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/Field.java
index 9b4cfa2911e..8d726c441d6 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/Field.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/Field.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.UTFDataFormatException;
 
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/FileListBlock.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/FileListBlock.java
similarity index 86%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/FileListBlock.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/FileListBlock.java
index 29fa5969aa7..dd5390671a6 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/FileListBlock.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/FileListBlock.java
@@ -8,11 +8,14 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.Util;
+
 public class FileListBlock extends Block {
 
 	protected int offset= 0;
@@ -27,10 +30,10 @@ public class FileListBlock extends Block {
 	 * The name is not the entire name of the indexedfile, but the 
 	 * difference between its name and the name of the previous indexedfile ...	
 	 */
-	public boolean addFile(IndexedFile indexedFile) {
+	public boolean addFile(IndexedFileEntry indexedFile) {
 		int offset= this.offset;
 		if (isEmpty()) {
-			field.putInt4(offset, indexedFile.getFileNumber());
+			field.putInt4(offset, indexedFile.getFileID());
 			offset += 4;
 		}
 		String path= indexedFile.getPath();
@@ -58,15 +61,15 @@ public class FileListBlock extends Block {
 			offset= 0;
 		}
 	}
-	public IndexedFile getFile(int fileNum) throws IOException {
-		IndexedFile resp= null;
+	public IndexedFileEntry getFile(int fileNum) throws IOException {
+		IndexedFileEntry resp= null;
 		try {
 			String[] paths= getPaths();
 			int i= fileNum - field.getInt4(0);
 			if(i >= paths.length) {	//fileNum was too large
 				return null;
 			}
-			resp= new IndexedFile(paths[i], fileNum);
+			resp= new IndexedFileEntry(paths[i], fileNum);
 		} catch (Exception e) {
 			//Cover ourselves in case something happens getting the indexed file
 		}
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/GammaCompressedIndexBlock.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/GammaCompressedIndexBlock.java
similarity index 81%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/GammaCompressedIndexBlock.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/GammaCompressedIndexBlock.java
index 5663fdfa3f6..1e42e7fcb38 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/GammaCompressedIndexBlock.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/GammaCompressedIndexBlock.java
@@ -8,10 +8,14 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.UTFDataFormatException;
 
+import org.eclipse.cdt.internal.core.index.cindexstorage.IncludeEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.Util;
+import org.eclipse.cdt.internal.core.index.cindexstorage.WordEntry;
+
 /**
  * Uses prefix coding on words, and gamma coding of document numbers differences.
  */
@@ -56,16 +60,21 @@ public class GammaCompressedIndexBlock extends IndexBlock {
 			codeStream.writeGamma(ref - prevRef);
 			prevRef= ref;
 		}
-		//encode index bit field
-		//FUTURE USE: For index parms etc.
-		/*if (entry.fRefs.length != entry.fRefsIndexFlags.length)
-			throw new IndexOutOfBoundsException();
-		
-		for (int i=0; i < n; ++i) {
-			int indexField = entry.getIndexFlag(i);
-			codeStream.writeGamma(indexField);
-		}*/
-		
+		//encode offsets
+		//same number of offsets arrays as file references
+		for (int i=0; i<n; i++){
+		    int[]offsetArray = entry.getOffsets(i);
+		    //write offset array length
+		    codeStream.writeGamma(offsetArray.length);
+			prevRef=0;
+		    for (int j=0; j<offsetArray.length; j++){
+		        int ref = offsetArray[j];
+		        if (ref <= prevRef)
+		            throw new IllegalArgumentException();
+		        codeStream.writeGamma(ref - prevRef);
+		        prevRef=ref;
+		    }
+		}
 	}
 	/**
 	 * @see IndexBlock#addEntry
@@ -148,16 +157,21 @@ public class GammaCompressedIndexBlock extends IndexBlock {
 				prevRef= ref;
 			}
 			
-		/*	//Now read in the index bit fields
-			//FUTURE USE: For index parms etc.
-			for (int i=0; i<n; ++i) {
-				int indexField = readCodeStream.readGamma();
-				//The index fields are encoded in the same order as 
-				//the file refs read above. So the first one belongs 
-				//to whatever the first file reference is
-				entry.fRefsIndexFlags[i]=indexField;
-			}*/
 			
+			for (int i=0; i<n; ++i) {
+				int offsetArrayLength = readCodeStream.readGamma();
+				int[] tempOffsetArray = new int[offsetArrayLength];
+				prevRef=0;
+				for (int j=0; j<offsetArrayLength; j++){
+				    int ref = prevRef + readCodeStream.readGamma();
+				    if (ref < prevRef)
+				        throw new InternalError();
+				    tempOffsetArray[j] = ref;
+				    prevRef = ref;
+				}
+				entry.setOffsets(i, tempOffsetArray);
+			}
+	
 			offset= readCodeStream.byteLength();
 			prevWord= word;
 			return true;
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexBlock.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexBlock.java
similarity index 91%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexBlock.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexBlock.java
index bd3c32427b0..a0bd7aa2e62 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexBlock.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexBlock.java
@@ -8,9 +8,11 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import org.eclipse.cdt.internal.core.CharOperation;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IncludeEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.WordEntry;
 
 /**
  * An indexBlock stores wordEntries.
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexInput.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexInput.java
similarity index 91%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexInput.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexInput.java
index 9c4e3407ee7..6042ac68929 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexInput.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexInput.java
@@ -8,12 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.IOException;
 
 import org.eclipse.cdt.internal.core.index.IEntryResult;
 import org.eclipse.cdt.internal.core.index.IQueryResult;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IncludeEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.WordEntry;
 
 
 /**
@@ -49,7 +52,7 @@ public abstract class IndexInput {
 	/**
 	 * Returns the current file the indexInput is pointing to in the index.
 	 */
-	public abstract IndexedFile getCurrentFile() throws IOException;
+	public abstract IndexedFileEntry getCurrentFile() throws IOException;
 	/**
 	 * Returns the current file the indexInput is pointing to in the index.
 	 */
@@ -76,13 +79,13 @@ public abstract class IndexInput {
 	 * Returns the indexedFile corresponding to the given document number in the index the input
 	 * reads in, or null if such indexedFile does not exist.
 	 */
-	public abstract IndexedFile getIndexedFile(int fileNum) throws IOException;
+	public abstract IndexedFileEntry getIndexedFile(int fileNum) throws IOException;
 	/**
 	 * Returns the indexedFile corresponding to the given file path in the index the input
 	 * reads in (e.g. the indexedFile with the same path in this index), or null if such 
 	 * indexedFile does not exist.
 	 */
-	public abstract IndexedFile getIndexedFile(String fullpath) throws IOException;
+	public abstract IndexedFileEntry getIndexedFile(String fullpath) throws IOException;
 	/**
 	 * Returns the number of files in the index.
 	 */
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexOutput.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexOutput.java
similarity index 82%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexOutput.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexOutput.java
index 6bea88471e0..c3fd4fa4bb4 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexOutput.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexOutput.java
@@ -8,10 +8,13 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.IOException;
 
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.WordEntry;
+
 /**
  * An indexOutput is used to write an index into a different object (a File, ...). 
  */
@@ -19,7 +22,7 @@ public abstract class IndexOutput {
 	/**
 	 * Adds a File to the destination.
 	 */
-	public abstract void addFile(IndexedFile file) throws IOException;
+	public abstract void addFile(IndexedFileEntry file) throws IOException;
 	/**
 	 * Adds a word to the destination.
 	 */
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexSummary.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexSummary.java
similarity index 95%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexSummary.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexSummary.java
index 1d4753492e0..1820fd6002d 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexSummary.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/IndexSummary.java
@@ -8,13 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
 
 import org.eclipse.cdt.internal.core.CharOperation;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.Util;
 
 /**
  * An indexSummary is used when saving an index into a BlocksIndexOuput or 
@@ -49,7 +51,7 @@ public class IndexSummary {
 	protected int numIncludes;
 	
 	static class FirstFileInBlock {
-		IndexedFile indexedFile;
+		IndexedFileEntry indexedFile;
 		int blockNum;
 	}
 
@@ -77,7 +79,7 @@ public class IndexSummary {
 	/**
 	 * Adds the given file as the first file for the given Block number. 
 	 */
-	public void addFirstFileInBlock(IndexedFile indexedFile, int blockNum) {
+	public void addFirstFileInBlock(IndexedFileEntry indexedFile, int blockNum) {
 		FirstFileInBlock entry= new FirstFileInBlock();
 		entry.indexedFile= indexedFile;
 		entry.blockNum= blockNum;
@@ -133,7 +135,7 @@ public class IndexSummary {
 		while (min <= max) {
 			int mid= (min + max) / 2;
 			FirstFileInBlock entry= (FirstFileInBlock) firstFilesInBlocks.get(mid);
-			int compare= fileNum - entry.indexedFile.getFileNumber();
+			int compare= fileNum - entry.indexedFile.getFileID();
 			if (compare == 0)
 				return entry.blockNum;
 			if (compare < 0)
@@ -318,7 +320,7 @@ public class IndexSummary {
 			FirstFileInBlock entry= new FirstFileInBlock();
 			String path= raf.readUTF();
 			int fileNum= raf.readInt();
-			entry.indexedFile= new IndexedFile(path, fileNum);
+			entry.indexedFile= new IndexedFileEntry(path, fileNum);
 			entry.blockNum= raf.readInt();
 			firstFilesInBlocks.add(entry);
 		}
@@ -370,7 +372,7 @@ public class IndexSummary {
 		for (int i= 0, size= firstFilesInBlocks.size(); i < size; ++i) {
 			FirstFileInBlock entry= (FirstFileInBlock) firstFilesInBlocks.get(i);
 			raf.writeUTF(entry.indexedFile.getPath());
-			raf.writeInt(entry.indexedFile.getFileNumber());
+			raf.writeInt(entry.indexedFile.getFileID());
 			raf.writeInt(entry.blockNum);
 		}
 		raf.writeInt(firstWordsInBlocks.size());
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/MergeFactory.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/MergeFactory.java
similarity index 88%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/MergeFactory.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/MergeFactory.java
index d4454731dd1..056c08b6aa8 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/MergeFactory.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/MergeFactory.java
@@ -8,11 +8,16 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.IOException;
 import java.util.Map;
 
+import org.eclipse.cdt.internal.core.index.cindexstorage.IncludeEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.Util;
+import org.eclipse.cdt.internal.core.index.cindexstorage.WordEntry;
+import org.eclipse.cdt.internal.core.index.impl.Int;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
 import org.eclipse.cdt.internal.core.search.processing.JobManager;
 
@@ -129,8 +134,8 @@ public class MergeFactory {
 		int compare;
 
 		while (oldInput.hasMoreFiles() || addsInput.hasMoreFiles()) {
-			IndexedFile file1= oldInput.getCurrentFile();
-			IndexedFile file2= addsInput.getCurrentFile();
+			IndexedFileEntry file1= oldInput.getCurrentFile();
+			IndexedFileEntry file2= addsInput.getCurrentFile();
 
 			//if the file has been removed we don't take it into account
 			while (file1 != null && wasRemoved(file1, OLD_INDEX)) {
@@ -159,18 +164,18 @@ public class MergeFactory {
 				//the file has been modified: 
 				//we remove it from the oldIndex and add it to the addsIndex
 				removeFile(file1, OLD_INDEX);
-				mappingAdds[file2.getFileNumber()]= positionInMerge;
+				mappingAdds[file2.getFileID()]= positionInMerge;
 				file1.setFileNumber(positionInMerge);
 				mergeOutput.addFile(file1);
 				oldInput.moveToNextFile();
 				addsInput.moveToNextFile();
 			} else if (compare < 0) {
-				mappingOld[file1.getFileNumber()]= positionInMerge;
+				mappingOld[file1.getFileID()]= positionInMerge;
 				file1.setFileNumber(positionInMerge);
 				mergeOutput.addFile(file1);
 				oldInput.moveToNextFile();
 			} else {
-				mappingAdds[file2.getFileNumber()]= positionInMerge;
+				mappingAdds[file2.getFileID()]= positionInMerge;
 				file2.setFileNumber(positionInMerge);
 				mergeOutput.addFile(file2);
 				addsInput.moveToNextFile();
@@ -199,21 +204,17 @@ public class MergeFactory {
 			else
 				compare= Util.compare(word1.getWord(), word2.getWord());
 			if (compare < 0) {
-				word1.catRefs(word1);
 				word1.mapRefs(mappingOld);
 				mergeOutput.addWord(word1);
 				oldInput.moveToNextWordEntry();
 			} else if (compare > 0) {
-				word2.catRefs(word2);
 				word2.mapRefs(mappingAdds);
 				mergeOutput.addWord(word2);
 				addsInput.moveToNextWordEntry();
 			} else {
-				word1.catRefs(word1);
-				word2.catRefs(word2);
 				word1.mapRefs(mappingOld);
 				word2.mapRefs(mappingAdds);
-				word1.addRefs(word2.getRefs());
+				word1.addWordInfo(word2.getRefs(), word2.getOffsets(), word2.getOffsetCount());
 				mergeOutput.addWord(word1);
 				addsInput.moveToNextWordEntry();
 				oldInput.moveToNextWordEntry();
@@ -263,11 +264,11 @@ public class MergeFactory {
 	/**
 	 * Records the deletion of one file.
 	 */
-	protected void removeFile(IndexedFile file, int index) {
+	protected void removeFile(IndexedFileEntry file, int index) {
 		if (index == OLD_INDEX)
-			mappingOld[file.getFileNumber()]= -1;
+			mappingOld[file.getFileID()]= -1;
 		else
-			mappingAdds[file.getFileNumber()]= -1;
+			mappingAdds[file.getFileID()]= -1;
 	}
 	/**
 	 * Returns whether the given file has to be removed from the given index
@@ -275,17 +276,17 @@ public class MergeFactory {
 	 * deletes it and records the changes. 
 	 */
 
-	protected boolean wasRemoved(IndexedFile indexedFile, int index) {
+	protected boolean wasRemoved(IndexedFileEntry indexedFile, int index) {
 		String path= indexedFile.getPath();
 		if (index == OLD_INDEX) {
 			if (removedInOld.remove(path) != null) {
-				mappingOld[indexedFile.getFileNumber()]= -1;
+				mappingOld[indexedFile.getFileID()]= -1;
 				return true;
 			}
 		} else if (index == ADDS_INDEX) {
 			Int lastRemoved= (Int) removedInAdds.get(path);
 			if (lastRemoved != null) {
-				int fileNum= indexedFile.getFileNumber();
+				int fileNum= indexedFile.getFileID();
 				if (lastRemoved.value >= fileNum) {
 					mappingAdds[fileNum]= -1;
 					//if (lastRemoved.value == fileNum) // ONLY if files in sorted order for names AND fileNums
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/SafeRandomAccessFile.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/SafeRandomAccessFile.java
similarity index 94%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/SafeRandomAccessFile.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/SafeRandomAccessFile.java
index 3dddaa21e45..72fe9d12aa9 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/SafeRandomAccessFile.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/SafeRandomAccessFile.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/SimpleIndexInput.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/SimpleIndexInput.java
similarity index 85%
rename from core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/SimpleIndexInput.java
rename to core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/SimpleIndexInput.java
index 636a5e35c3c..de02b7a4507 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/SimpleIndexInput.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/cindexstorage/io/SimpleIndexInput.java
@@ -8,14 +8,17 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
+package org.eclipse.cdt.internal.core.index.cindexstorage.io;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
 import org.eclipse.cdt.internal.core.index.IEntryResult;
 import org.eclipse.cdt.internal.core.index.IQueryResult;
-import org.eclipse.jface.text.IDocument;
+import org.eclipse.cdt.internal.core.index.cindexstorage.InMemoryIndex;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IncludeEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.WordEntry;
 
 /**
  * A simpleIndexInput is an input on an in memory Index. 
@@ -24,8 +27,8 @@ import org.eclipse.jface.text.IDocument;
 public class SimpleIndexInput extends IndexInput {
 	protected WordEntry[] sortedWordEntries;
 	protected IncludeEntry[] sortedIncludes;
-	protected IndexedFile currentFile;
-	protected IndexedFile[] sortedFiles;
+	protected IndexedFileEntry currentFile;
+	protected IndexedFileEntry[] sortedFiles;
 	protected InMemoryIndex index;
 
 	public SimpleIndexInput(InMemoryIndex index) {
@@ -46,7 +49,7 @@ public class SimpleIndexInput extends IndexInput {
 	/**
 	 * @see IndexInput#getCurrentFile()
 	 */
-	public IndexedFile getCurrentFile() throws IOException {
+	public IndexedFileEntry getCurrentFile() throws IOException {
 		if (!hasMoreFiles())
 			return null;
 		return currentFile;
@@ -54,18 +57,18 @@ public class SimpleIndexInput extends IndexInput {
 	/**
 	 * @see IndexInput#getIndexedFile(int)
 	 */
-	public IndexedFile getIndexedFile(int fileNum) throws IOException {
+	public IndexedFileEntry getIndexedFile(int fileNum) throws IOException {
 		for (int i= 0; i < sortedFiles.length; i++)
-			if (sortedFiles[i].getFileNumber() == fileNum)
+			if (sortedFiles[i].getFileID() == fileNum)
 				return sortedFiles[i];
 		return null;
 	}
 	/**
-	 * @see IndexInput#getIndexedFile(IDocument)
+	 * @see IndexInput#getIndexedFile(String)
 	 */
-	public IndexedFile getIndexedFile(String fullPath) throws IOException {
+	public IndexedFileEntry getIndexedFile(String fullPath) throws IOException {
 		for (int i= index.getNumFiles(); i >= 1; i--) {
-			IndexedFile file= getIndexedFile(i);
+			IndexedFileEntry file= getIndexedFile(i);
 			if (fullPath.equals(file.getPath()))
 				return file;
 		}
@@ -164,7 +167,7 @@ public class SimpleIndexInput extends IndexInput {
 		setFirstFile();
 		ArrayList matches= new ArrayList();
 		while (hasMoreFiles()) {
-			IndexedFile file= getCurrentFile();
+			IndexedFileEntry file= getCurrentFile();
 			if (file.getPath().indexOf(word) != -1)
 				matches.add(file.getPath());
 			moveToNextFile();
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsConsoleParser.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsConsoleParser.java
index 9595188cae4..60ba3ddf449 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsConsoleParser.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsConsoleParser.java
@@ -14,8 +14,9 @@ import java.util.StringTokenizer;
 
 import org.eclipse.cdt.core.IConsoleParser;
 import org.eclipse.cdt.core.search.ICSearchConstants;
+import org.eclipse.cdt.internal.core.index.cindexstorage.ICIndexStorageConstants;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
 import org.eclipse.cdt.internal.core.index.domsourceindexer.IndexEncoderUtil;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexEncodingConstants;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexEncodingConstants.EntryType;
 
@@ -113,8 +114,10 @@ public class CTagsConsoleParser implements IConsoleParser {
     	
     	}
     
+    	String lineNumber = (String)tempTag.tagExtensionField.get(LINE);
+    	
     	if (entryType != null)
-    	    indexer.getOutput().addRef(getFileNumber(),IndexEncoderUtil.encodeEntry(fullName,entryType,type));
+    	    indexer.getOutput().addRef(getFileNumber(),IndexEncoderUtil.encodeEntry(fullName,entryType,type), Integer.parseInt(lineNumber), ICIndexStorageConstants.LINE);
     }
 
     /**
@@ -122,10 +125,10 @@ public class CTagsConsoleParser implements IConsoleParser {
      */
     private int getFileNumber() {
         int fileNum = 0;
-        IndexedFile mainIndexFile = indexer.getOutput().getIndexedFile(
+        IndexedFileEntry mainIndexFile = indexer.getOutput().getIndexedFile(
                 indexer.getResourceFile().getFullPath().toString());
         if (mainIndexFile != null)
-            fileNum = mainIndexFile.getFileNumber();
+            fileNum = mainIndexFile.getFileID();
         
         return fileNum;
     }
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsFileReader.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsFileReader.java
index d1c2aed9ae5..fd814adcf41 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsFileReader.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsFileReader.java
@@ -20,8 +20,9 @@ import org.eclipse.cdt.core.search.ICSearchConstants;
 import org.eclipse.cdt.internal.core.index.IIndex;
 import org.eclipse.cdt.internal.core.index.IIndexer;
 import org.eclipse.cdt.internal.core.index.IIndexerOutput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.ICIndexStorageConstants;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
 import org.eclipse.cdt.internal.core.index.domsourceindexer.IndexEncoderUtil;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexEncodingConstants;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexEncodingConstants.EntryType;
@@ -71,7 +72,8 @@ public class CTagsFileReader {
 		   //encode new tag in current file
 		   char[][] fullName = parser.getQualifiedName(tagEntry);
 		   //encode name
-		   indexer.addToOutput(fullName,(String)tagEntry.tagExtensionField.get(CTagsConsoleParser.KIND));
+		   String lineNumber = (String) tagEntry.tagExtensionField.get(CTagsConsoleParser.LINE);
+		   indexer.addToOutput(fullName,(String)tagEntry.tagExtensionField.get(CTagsConsoleParser.KIND), Integer.parseInt(lineNumber));
 		}
 	}
 
@@ -85,14 +87,14 @@ public class CTagsFileReader {
         public MiniIndexer(IFile currentFile) {
             this.currentFile = currentFile;
         }
-        public void addToOutput(char[][]fullName, String kind){
+        public void addToOutput(char[][]fullName, String kind, int lineNumber){
         	if (kind == null)
         	  return;
         	
-	        IndexedFile mainIndexFile = this.output.getIndexedFile(currentFile.getFullPath().toString());
+	        IndexedFileEntry mainIndexFile = this.output.getIndexedFile(currentFile.getFullPath().toString());
 			int fileNum = 0;
 	        if (mainIndexFile != null)
-				fileNum = mainIndexFile.getFileNumber();
+				fileNum = mainIndexFile.getFileID();
 			
 	        EntryType entryType = null;
 	        
@@ -127,14 +129,14 @@ public class CTagsFileReader {
 	    	}
 	    	
 	    	if (entryType != null)
-	    	    output.addRef(fileNum, IndexEncoderUtil.encodeEntry(fullName,entryType,type));
+	    	    output.addRef(fileNum, IndexEncoderUtil.encodeEntry(fullName,entryType,type), lineNumber, ICIndexStorageConstants.LINE);
 	    }
         /* (non-Javadoc)
          * @see org.eclipse.cdt.internal.core.index.IIndexer#index(org.eclipse.cdt.internal.core.index.IDocument, org.eclipse.cdt.internal.core.index.IIndexerOutput)
          */
         public void index(IFile file, IIndexerOutput output) throws IOException {
             this.output = output;
-            IndexedFile indFile =output.addIndexedFile(file.getFullPath().toString());
+            IndexedFileEntry indFile =output.addIndexedFile(file.getFullPath().toString());
         }
 
         /* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexerRunner.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexerRunner.java
index 44ef980a94b..1d77685baff 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexerRunner.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/ctagsindexer/CTagsIndexerRunner.java
@@ -18,7 +18,7 @@ import org.eclipse.cdt.core.CommandLauncher;
 import org.eclipse.cdt.core.IConsoleParser;
 import org.eclipse.cdt.core.resources.IConsole;
 import org.eclipse.cdt.internal.core.ConsoleOutputSniffer;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IPath;
@@ -51,7 +51,7 @@ public class CTagsIndexerRunner extends AbstractIndexer {
      * @see org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer#indexFile(org.eclipse.cdt.internal.core.index.IDocument)
      */
     protected void indexFile(IFile file) throws IOException {
-    	IndexedFile indFile =output.addIndexedFile(file.getFullPath().toString());
+    	IndexedFileEntry indFile =output.addIndexedFile(file.getFullPath().toString());
        
     	String[] args = {"ctags", //$NON-NLS-1$
 		        "--excmd=number",  //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java
index 93c68928310..9097a9da919 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexerRunner.java
@@ -33,8 +33,8 @@ import org.eclipse.cdt.core.model.ICModelMarker;
 import org.eclipse.cdt.core.parser.ParseError;
 import org.eclipse.cdt.core.parser.ParserLanguage;
 import org.eclipse.cdt.core.search.ICSearchConstants;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
 import org.eclipse.cdt.internal.core.index.impl.IndexDelta;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexEncodingConstants;
@@ -70,7 +70,7 @@ public class DOMSourceIndexerRunner extends AbstractIndexer {
 
     protected void indexFile(IFile file) throws IOException {
         // Add the name of the file to the index
-        IndexedFile indFile =output.addIndexedFile(file.getFullPath().toString());
+        IndexedFileEntry indFile =output.addIndexedFile(file.getFullPath().toString());
       
         int problems = indexer.indexProblemsEnabled(resourceFile.getProject());
         setProblemMarkersEnabled(problems);
@@ -176,7 +176,7 @@ public class DOMSourceIndexerRunner extends AbstractIndexer {
 //                }
 //            }
             int fileNumber = getOutput().getIndexedFile(
-                    getResourceFile().getFullPath().toString()).getFileNumber();
+                    getResourceFile().getFullPath().toString()).getFileID();
             getOutput().addRef(fileNumber,IndexEncoderUtil.encodeEntry(
                         new char[][] {include.toCharArray()}, 
                         IIndexEncodingConstants.INCLUDE,
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexEncoderUtil.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexEncoderUtil.java
index b781f10aef9..99e0bb2b5c6 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexEncoderUtil.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexEncoderUtil.java
@@ -16,7 +16,7 @@ import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
 import org.eclipse.cdt.core.search.ICSearchConstants;
 import org.eclipse.cdt.core.search.ICSearchConstants.LimitTo;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexEncodingConstants;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexEncodingConstants.EntryType;
@@ -24,6 +24,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.Path;
 
 public class IndexEncoderUtil {
+    
     public static final char[] encodeEntry(char[][] elementName, EntryType entryType, LimitTo encodeType) {
         int pos, nameLength = 0;
         for (int i=0; i < elementName.length; i++){
@@ -71,10 +72,10 @@ public class IndexEncoderUtil {
         //the first step in the Source Indexer is to add the file being indexed to the index
         //which actually creates an entry for the file in the index.
         
-        IndexedFile mainIndexFile = indexer.getOutput().getIndexedFile(
+        IndexedFileEntry mainIndexFile = indexer.getOutput().getIndexedFile(
                 indexer.getResourceFile().getFullPath().toString());
         if (mainIndexFile != null)
-            fileNum = mainIndexFile.getFileNumber();
+            fileNum = mainIndexFile.getFileID();
         
         String fileName = null;
         IASTNodeLocation[] nameLocations = name.getNodeLocations();
@@ -103,21 +104,21 @@ public class IndexEncoderUtil {
 	            //We are not in the file that has triggered the index. Thus, we need to find the
 	            //file number for the current file (if it has one). If the current file does not
 	            //have a file number, we need to add it to the index.
-               IndexedFile indFile = indexer.getOutput().getIndexedFile(filePath);
+               IndexedFileEntry indFile = indexer.getOutput().getIndexedFile(filePath);
                 if (indFile != null){
-                    fileNum = indFile.getFileNumber();
+                    fileNum = indFile.getFileID();
                 }
                 else {
                     //Need to add file to index
                     if (tempFile != null){
                     indFile = indexer.getOutput().addIndexedFile(tempFile.getFullPath().toString());
                     if (indFile != null)
-                        fileNum = indFile.getFileNumber();
+                        fileNum = indFile.getFileID();
                     }
                     else {
                         indFile = indexer.getOutput().addIndexedFile(fileName);
                         if (indFile != null)
-                            fileNum = indFile.getFileNumber();
+                            fileNum = indFile.getFileID();
                     }
                 }
             }
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IIndexConstants.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IIndexConstants.java
deleted file mode 100644
index c66b976ec3f..00000000000
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IIndexConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
-
-/**
- * This interface provides constants used by the search engine.
- */
-public interface IIndexConstants {
-	/**
-	 * The signature of the index file.
-	 */
-	public static final String SIGNATURE= "INDEX FILE 0.015"; //$NON-NLS-1$
-	/**
-	 * The separator for files in the index file.
-	 */
-	public static final char FILE_SEPARATOR= '/';
-	/**
-	 * The size of a block for a <code>Block</code>.
-	 */
-	public static final int BLOCK_SIZE= 8192;
-}
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexedFile.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexedFile.java
deleted file mode 100644
index 8243d8163ee..00000000000
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/IndexedFile.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
-
-import org.eclipse.cdt.internal.core.index.IQueryResult;
-
-/**
- * An indexedFile associates a number to a document path, and document properties. 
- * It is what we add into an index, and the result of a query.
- */
-
-public class IndexedFile implements IQueryResult {
-	protected String path;
-	protected int fileNumber;
-
-	public IndexedFile(String path, int fileNum) {
-		if (fileNum < 1)
-			throw new IllegalArgumentException();
-		this.fileNumber= fileNum;
-		this.path= path;
-	}
-	
-	/**
-	 * Returns the size of the indexedFile.
-	 */
-	public int footprint() {
-		//object+ 2 slots + size of the string (header + 4 slots + char[])
-		return 8 + (2 * 4) + (8 + (4 * 4) + 8 + path.length() * 2);
-	}
-	/**
-	 * Returns the file number.
-	 */
-	public int getFileNumber() {
-		return fileNumber;
-	}
-	/**
-	 * Returns the path.
-	 */
-	public String getPath() {
-		return path;
-	}
-	/**
-	 * Sets the file number.
-	 */
-	public void setFileNumber(int fileNumber) {
-		this.fileNumber= fileNumber;
-	}
-	public String toString() {
-		return "IndexedFile(" + fileNumber + ": " + path + ")"; //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-3$
-	}
-}
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/WordEntry.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/WordEntry.java
deleted file mode 100644
index 68626a319bd..00000000000
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/impl/WordEntry.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.internal.core.index.impl;
-
-import org.eclipse.cdt.core.parser.util.ObjectSet;
-import org.eclipse.cdt.internal.core.CharOperation;
-
-public class WordEntry {
-	protected char[] fWord;
-	protected int fNumRefs;
-	protected int[] fRefs;
-	
-	
-	public WordEntry() {
-		this(CharOperation.NO_CHAR);
-	}
-	public WordEntry(char[] word) {
-		fWord= word;
-		fNumRefs= 0;
-		fRefs= new int[1];
-	}	
-	/**
-	 * Adds a reference and records the change in footprint.
-	 */
-	public int addRef(int fileNum) {
-		if (fNumRefs > 0 && fRefs[fNumRefs - 1] == fileNum) {
-			return 0;
-		}
-		if (fNumRefs < fRefs.length) {
-			int tempNumRefs = fNumRefs;
-			fRefs[fNumRefs++]= fileNum;
-			return 0;
-		} 
-	
-		int newSize= fNumRefs < 4 ? 4 : fNumRefs * 2; // so will start @ 1, grow to 4, 8, 16, 32, 64 etc.
-		System.arraycopy(fRefs, 0, fRefs= new int[newSize], 0, fNumRefs);
-	
-		fRefs[fNumRefs++]= fileNum;
-		return (newSize - fNumRefs + 1) * 4;
-	}
-	/**
-	 * Adds a set of references and records the change in footprint.
-	 */
-	public void addRefs(int[] refs) {
-		int[] newRefs= new int[fNumRefs + refs.length];
-		int pos1= 0;
-		int pos2= 0;
-		int posNew= 0;
-		int compare;
-		int r1= 0;
-		int r2= 0;
-		int i1=0;
-		int i2=0;
-		while (pos1 < fNumRefs || pos2 < refs.length) {
-			if (pos1 >= fNumRefs) {
-				r2= refs[pos2];
-				compare= -1;
-			} else if (pos2 >= refs.length) {
-				compare= 1;
-				r1= fRefs[pos1];
-			} else {
-				r1= fRefs[pos1];
-				r2= refs[pos2];
-				compare= r2 - r1;
-			}
-			if (compare > 0) {
-				newRefs[posNew]= r1;
-				posNew++;
-				pos1++;
-			} else {
-				if (r2 != 0) {
-					newRefs[posNew]= r2;
-					posNew++;
-				}
-				pos2++;
-			}
-		}
-		fRefs= newRefs;
-		fNumRefs= posNew;
-	}
-	/**
-	 * Returns the size of the wordEntry
-	 */
-	public int footprint() {
-		//Size of Object + (number of fields * size of Fields) + (Size of ArrayObject + (Number of chars * sizeof Chars)) + 
-		//(Size of ArrayObject + (Number of refs * sizeof int)) 
-		return 8 + (4 * 4) + (8 + fWord.length * 2) + (8 + fRefs.length * 4);
-	}
-	/**
-	 * Returns the number of references, e.g. the number of files this word appears in.
-	 */
-	public int getNumRefs() {
-		return fNumRefs;
-	}
-	/**
-	 * returns the file number in the i position in the list of references.
-	 */
-	public int getRef(int i) {
-		if (i < fNumRefs) return fRefs[i];
-		throw new IndexOutOfBoundsException();
-	}
-	/**
-	 * Returns the references of the wordEntry (the number of the files it appears in).
-	 */
-	public int[] getRefs() {
-		int[] result= new int[fNumRefs];
-		System.arraycopy(fRefs, 0, result, 0, fNumRefs);
-		return result;
-	}
-	/**
-	 * returns the word of the wordEntry.
-	 */
-	public char[] getWord() {
-		return fWord;
-	}
-	/**
-	 * Changes the references of the wordEntry to match the mapping. For example,<br>
-	 * if the current references are [1 3 4]<br>
-	 * and mapping is [1 2 3 4 5]<br>
-	 * in references 1 becomes mapping[1] = 2, 3->4, and 4->5<br>
-	 * => references = [2 4 5].<br>
-	 */
-	public void mapRefs(int[] mappings) {
-		int position= 0;
-	
-		for (int i= 0; i < fNumRefs; i++) {
-			//Take care that the reference is actually within the bounds of the mapping
-			int map= -1;
-	
-			if(fRefs[i] >= 0 && fRefs[i] < mappings.length) 
-				map= mappings[fRefs[i]];
-			if (map != -1 && map != 0)
-				fRefs[position++]= map;
-		}
-		fNumRefs= position;
-
-		//to be changed!
-		System.arraycopy(fRefs, 0, (fRefs= new int[fNumRefs]), 0, fNumRefs);
-		
-		Util.sort(fRefs);
-	}
-	/**
-	 * Clears the wordEntry.
-	 */
-	public void reset(char[] word) {
-		for (int i= fNumRefs; i-- > 0;) {
-			fRefs[i]= 0;
-		}
-		fNumRefs= 0;
-		fWord= word;
-	}
-	public String toString() {
-		return new String(fWord);
-	}
-	/**
-	 * @param word
-	 */
-	public void catRefs(WordEntry word) {
-		int[] wordFileRefs = word.fRefs;
-		ObjectSet set = new ObjectSet(4);
-		
- 		for (int i=0; i<wordFileRefs.length; i++){
- 			if (wordFileRefs[i] != 0)
- 				set.put(new Integer(wordFileRefs[i]));
-		}
-		
- 		int[] mergedArray = new int[set.size()];
- 		for (int i=0; i<set.size(); i++){
- 			mergedArray[i] = ((Integer) set.keyAt(i)).intValue();
- 		}
- 		
- 		System.arraycopy(mergedArray,0,(fRefs = new int[set.size()]),0,set.size());
- 		fNumRefs = set.size();
- 		
- 		Util.sort(fRefs);
-	}
-}
-
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/AbstractIndexer.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/AbstractIndexer.java
index 7b840fd2b89..df5549d57fa 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/AbstractIndexer.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/AbstractIndexer.java
@@ -44,6 +44,7 @@ import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.Util;
 import org.eclipse.cdt.internal.core.index.IIndexer;
 import org.eclipse.cdt.internal.core.index.IIndexerOutput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.ICIndexStorageConstants;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
 import org.eclipse.core.resources.IFile;
@@ -108,7 +109,8 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 					if (typeSpec instanceof IASTClassSpecifier){
 						IASTClassSpecifier baseClassSpec = (IASTClassSpecifier) typeSpec;
 						char[][] baseFullyQualifiedName = baseClassSpec.getFullyQualifiedNameCharArrays();
-						this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,DERIVED,ICSearchConstants.DECLARATIONS));
+						
+						this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,DERIVED,ICSearchConstants.DECLARATIONS), baseClassSpec.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 					}
 				} catch (ASTNotImplementedException e) {}
 			}
@@ -120,12 +122,12 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 				if (decl instanceof IASTClassSpecifier){
 					IASTClassSpecifier friendClassSpec = (IASTClassSpecifier) decl;
 					char[][] baseFullyQualifiedName = friendClassSpec.getFullyQualifiedNameCharArrays();
-					this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,FRIEND,ICSearchConstants.DECLARATIONS));
+					this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,FRIEND,ICSearchConstants.DECLARATIONS),friendClassSpec.getStartingOffset(), ICIndexStorageConstants.OFFSET);
 				}
 				else if (decl instanceof IASTElaboratedTypeSpecifier){
 					IASTElaboratedTypeSpecifier friendClassSpec = (IASTElaboratedTypeSpecifier) decl;
 					char[][] baseFullyQualifiedName = friendClassSpec.getFullyQualifiedNameCharArrays();
-					this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,FRIEND,ICSearchConstants.DECLARATIONS));
+					this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,FRIEND,ICSearchConstants.DECLARATIONS), friendClassSpec.getStartingOffset(), ICIndexStorageConstants.OFFSET);
 				}
 				else if (decl instanceof IASTFunction){
 					
@@ -136,7 +138,7 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 				
 			}
 			
-			this.output.addRef(fileNumber, encodeTypeEntry(classSpecification.getFullyQualifiedNameCharArrays(),CLASS, ICSearchConstants.DECLARATIONS));
+			this.output.addRef(fileNumber, encodeTypeEntry(classSpecification.getFullyQualifiedNameCharArrays(),CLASS, ICSearchConstants.DECLARATIONS), classSpecification.getStartingOffset(), ICIndexStorageConstants.OFFSET);
 		}		
 		else if (classSpecification.getClassKind().equals(ASTClassKind.STRUCT))
 		{
@@ -149,7 +151,7 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 					if (typeSpec instanceof IASTClassSpecifier){
 						IASTClassSpecifier baseClassSpec = (IASTClassSpecifier) typeSpec;
 						char[][] baseFullyQualifiedName = baseClassSpec.getFullyQualifiedNameCharArrays();
-						this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,DERIVED,ICSearchConstants.DECLARATIONS));
+						this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,DERIVED,ICSearchConstants.DECLARATIONS),baseClassSpec.getStartingOffset(), ICIndexStorageConstants.OFFSET);
 					}
 				} catch (ASTNotImplementedException e) {}
 			}
@@ -161,12 +163,12 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 				if (decl instanceof IASTClassSpecifier){
 					IASTClassSpecifier friendClassSpec = (IASTClassSpecifier) decl;
 					char[][] baseFullyQualifiedName = friendClassSpec.getFullyQualifiedNameCharArrays();
-					this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,FRIEND,ICSearchConstants.DECLARATIONS));
+					this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,FRIEND,ICSearchConstants.DECLARATIONS),friendClassSpec.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 				}
 				else if (decl instanceof IASTElaboratedTypeSpecifier){
 					IASTElaboratedTypeSpecifier friendClassSpec = (IASTElaboratedTypeSpecifier) decl;
 					char[][] baseFullyQualifiedName = friendClassSpec.getFullyQualifiedNameCharArrays();
-					this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,FRIEND,ICSearchConstants.DECLARATIONS));
+					this.output.addRef(fileNumber, encodeTypeEntry(baseFullyQualifiedName,FRIEND,ICSearchConstants.DECLARATIONS),friendClassSpec.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 				}
 				else if (decl instanceof IASTFunction){
 					
@@ -176,16 +178,16 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 				}
 			}
 			
-			this.output.addRef(fileNumber, encodeTypeEntry(classSpecification.getFullyQualifiedNameCharArrays(),STRUCT, ICSearchConstants.DECLARATIONS));
+			this.output.addRef(fileNumber, encodeTypeEntry(classSpecification.getFullyQualifiedNameCharArrays(),STRUCT, ICSearchConstants.DECLARATIONS),classSpecification.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 		}
 		else if (classSpecification.getClassKind().equals(ASTClassKind.UNION))
 		{
-			this.output.addRef(fileNumber, encodeTypeEntry(classSpecification.getFullyQualifiedNameCharArrays(),UNION, ICSearchConstants.DECLARATIONS));			
+			this.output.addRef(fileNumber, encodeTypeEntry(classSpecification.getFullyQualifiedNameCharArrays(),UNION, ICSearchConstants.DECLARATIONS),classSpecification.getStartingOffset(),ICIndexStorageConstants.OFFSET);			
 		}
 	}
 	
 	public void addEnumerationSpecifier(IASTEnumerationSpecifier enumeration, int fileNumber) {
-		this.output.addRef(fileNumber, encodeTypeEntry(enumeration.getFullyQualifiedNameCharArrays(), ENUM, ICSearchConstants.DECLARATIONS));
+		this.output.addRef(fileNumber, encodeTypeEntry(enumeration.getFullyQualifiedNameCharArrays(), ENUM, ICSearchConstants.DECLARATIONS),enumeration.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 		
 		Iterator i = enumeration.getEnumerators();
 		while (i.hasNext())
@@ -194,7 +196,7 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 			char[][] enumeratorFullName =
 				createEnumeratorFullyQualifiedName(en);
 
-			this.output.addRef(fileNumber, encodeEntry( enumeratorFullName, ENUMTOR_DECL, ENUMTOR_DECL_LENGTH ));
+			this.output.addRef(fileNumber, encodeEntry( enumeratorFullName, ENUMTOR_DECL, ENUMTOR_DECL_LENGTH ),en.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 
 		}
 	}
@@ -213,70 +215,70 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 	}
 
 	public void addEnumeratorReference(IASTEnumerator enumerator, int fileNumber) {
-		this.output.addRef(fileNumber, encodeEntry(createEnumeratorFullyQualifiedName(enumerator),ENUMTOR_REF,ENUMTOR_REF_LENGTH));	
+		this.output.addRef(fileNumber, encodeEntry(createEnumeratorFullyQualifiedName(enumerator),ENUMTOR_REF,ENUMTOR_REF_LENGTH),enumerator.getStartingOffset(), ICIndexStorageConstants.OFFSET);	
 	}
 		
 	public void addMacro(IASTMacro macro, int fileNumber) {
 		char[][] macroName = new char[][] { macro.getNameCharArray() };
-		this.output.addRef(fileNumber, encodeEntry(macroName,MACRO_DECL,MACRO_DECL_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(macroName,MACRO_DECL,MACRO_DECL_LENGTH), macro.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 		
 	public void addEnumerationReference(IASTEnumerationSpecifier enumeration, int fileNumber) {
-		this.output.addRef(fileNumber, encodeTypeEntry(enumeration.getFullyQualifiedNameCharArrays(), ENUM, ICSearchConstants.REFERENCES));
+		this.output.addRef(fileNumber, encodeTypeEntry(enumeration.getFullyQualifiedNameCharArrays(), ENUM, ICSearchConstants.REFERENCES), enumeration.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 	public void addVariable(IASTVariable variable, int fileNumber) {
-		this.output.addRef(fileNumber, encodeTypeEntry(variable.getFullyQualifiedNameCharArrays(), VAR, ICSearchConstants.DECLARATIONS));
+		this.output.addRef(fileNumber, encodeTypeEntry(variable.getFullyQualifiedNameCharArrays(), VAR, ICSearchConstants.DECLARATIONS), variable.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 	
 	public void addVariableReference(IASTVariable variable, int fileNumber) {
-		this.output.addRef(fileNumber, encodeTypeEntry(variable.getFullyQualifiedNameCharArrays(), VAR, ICSearchConstants.REFERENCES));
+		this.output.addRef(fileNumber, encodeTypeEntry(variable.getFullyQualifiedNameCharArrays(), VAR, ICSearchConstants.REFERENCES),variable.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}	
 	
 	public void addParameterReference( IASTParameterDeclaration parameter, int fileNumber ){
-		this.output.addRef(fileNumber,encodeTypeEntry( new char[][] { parameter.getNameCharArray() }, VAR, ICSearchConstants.REFERENCES));
+		this.output.addRef(fileNumber,encodeTypeEntry( new char[][] { parameter.getNameCharArray() }, VAR, ICSearchConstants.REFERENCES), parameter.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 	
 	public void addTypedefDeclaration(IASTTypedefDeclaration typedef, int fileNumber) {
-		this.output.addRef(fileNumber,encodeEntry(typedef.getFullyQualifiedNameCharArrays(), TYPEDEF_DECL, TYPEDEF_DECL_LENGTH));
+		this.output.addRef(fileNumber,encodeEntry(typedef.getFullyQualifiedNameCharArrays(), TYPEDEF_DECL, TYPEDEF_DECL_LENGTH),typedef.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 	
 	public void addFieldDeclaration(IASTField field, int fileNumber) {
-		this.output.addRef(fileNumber, encodeEntry(field.getFullyQualifiedNameCharArrays(),FIELD_DECL,FIELD_DECL_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(field.getFullyQualifiedNameCharArrays(),FIELD_DECL,FIELD_DECL_LENGTH),field.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 	
 	public void addFieldReference(IASTField field, int fileNumber) {
-		this.output.addRef(fileNumber, encodeEntry(field.getFullyQualifiedNameCharArrays(),FIELD_REF,FIELD_REF_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(field.getFullyQualifiedNameCharArrays(),FIELD_REF,FIELD_REF_LENGTH),field.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 	
 	public void addMethodDeclaration(IASTMethod method, int fileNumber) {
-		this.output.addRef(fileNumber, encodeEntry(method.getFullyQualifiedNameCharArrays(),METHOD_DECL,METHOD_DECL_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(method.getFullyQualifiedNameCharArrays(),METHOD_DECL,METHOD_DECL_LENGTH),method.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	
 		Iterator i=method.getParameters();
 		while (i.hasNext()){
 			Object parm = i.next();
 			if (parm instanceof IASTParameterDeclaration){
 				IASTParameterDeclaration parmDecl = (IASTParameterDeclaration) parm;
-				this.output.addRef(fileNumber, encodeTypeEntry(new char[][]{parmDecl.getNameCharArray()}, VAR, ICSearchConstants.DECLARATIONS));
+				this.output.addRef(fileNumber, encodeTypeEntry(new char[][]{parmDecl.getNameCharArray()}, VAR, ICSearchConstants.DECLARATIONS),parmDecl.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 			}
 		}
 	}
 	
 	public void addMethodReference(IASTMethod method, int fileNumber) {
-		this.output.addRef(fileNumber, encodeEntry(method.getFullyQualifiedNameCharArrays(),METHOD_REF,METHOD_REF_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(method.getFullyQualifiedNameCharArrays(),METHOD_REF,METHOD_REF_LENGTH),method.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 
 	public void addElaboratedForwardDeclaration(IASTElaboratedTypeSpecifier elaboratedType, int fileNumber) {
 		if (elaboratedType.getClassKind().equals(ASTClassKind.CLASS))
 		{
-			this.output.addRef(fileNumber,encodeTypeEntry(elaboratedType.getFullyQualifiedNameCharArrays(),FWD_CLASS, ICSearchConstants.DECLARATIONS));
+			this.output.addRef(fileNumber,encodeTypeEntry(elaboratedType.getFullyQualifiedNameCharArrays(),FWD_CLASS, ICSearchConstants.DECLARATIONS),elaboratedType.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 		}		
 		else if (elaboratedType.getClassKind().equals(ASTClassKind.STRUCT))
 		{
-			this.output.addRef(fileNumber,encodeTypeEntry(elaboratedType.getFullyQualifiedNameCharArrays(),FWD_STRUCT, ICSearchConstants.DECLARATIONS));
+			this.output.addRef(fileNumber,encodeTypeEntry(elaboratedType.getFullyQualifiedNameCharArrays(),FWD_STRUCT, ICSearchConstants.DECLARATIONS),elaboratedType.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 		}
 		else if (elaboratedType.getClassKind().equals(ASTClassKind.UNION))
 		{
-			this.output.addRef(fileNumber,encodeTypeEntry(elaboratedType.getFullyQualifiedNameCharArrays(),FWD_UNION, ICSearchConstants.DECLARATIONS));			
+			this.output.addRef(fileNumber,encodeTypeEntry(elaboratedType.getFullyQualifiedNameCharArrays(),FWD_UNION, ICSearchConstants.DECLARATIONS),elaboratedType.getStartingOffset(),ICIndexStorageConstants.OFFSET);			
 		}
 	}
 	
@@ -295,20 +297,20 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 	}
 
 	public void addFunctionDeclaration(IASTFunction function, int fileNumber){
-		this.output.addRef(fileNumber, encodeEntry(function.getFullyQualifiedNameCharArrays(),FUNCTION_DECL,FUNCTION_DECL_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(function.getFullyQualifiedNameCharArrays(),FUNCTION_DECL,FUNCTION_DECL_LENGTH),function.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 		
 		Iterator i=function.getParameters();
 		while (i.hasNext()){
 			Object parm = i.next();
 			if (parm instanceof IASTParameterDeclaration){
 				IASTParameterDeclaration parmDecl = (IASTParameterDeclaration) parm;
-				this.output.addRef(fileNumber, encodeTypeEntry(new char[][]{parmDecl.getNameCharArray()}, VAR, ICSearchConstants.DECLARATIONS));
+				this.output.addRef(fileNumber, encodeTypeEntry(new char[][]{parmDecl.getNameCharArray()}, VAR, ICSearchConstants.DECLARATIONS),parmDecl.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 			}
 		}
 	}
 	
 	public void addFunctionReference(IASTFunction function, int fileNumber){
-		this.output.addRef(fileNumber, encodeEntry(function.getFullyQualifiedNameCharArrays(),FUNCTION_REF,FUNCTION_REF_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(function.getFullyQualifiedNameCharArrays(),FUNCTION_REF,FUNCTION_REF_LENGTH),function.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 	
 	public void addNameReference(){
@@ -316,15 +318,15 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 	}
 	
 	public void addNamespaceDefinition(IASTNamespaceDefinition namespace, int fileNumber){
-		this.output.addRef(fileNumber, encodeEntry(namespace.getFullyQualifiedNameCharArrays(),NAMESPACE_DECL,NAMESPACE_DECL_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(namespace.getFullyQualifiedNameCharArrays(),NAMESPACE_DECL,NAMESPACE_DECL_LENGTH),namespace.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 	
 	public void addNamespaceReference(IASTNamespaceDefinition namespace, int fileNumber) {
-		this.output.addRef(fileNumber, encodeEntry(namespace.getFullyQualifiedNameCharArrays(),NAMESPACE_REF,NAMESPACE_REF_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(namespace.getFullyQualifiedNameCharArrays(),NAMESPACE_REF,NAMESPACE_REF_LENGTH),namespace.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 	
 	public void addTypedefReference( IASTTypedefDeclaration typedef, int fileNumber ){
-		this.output.addRef(fileNumber,encodeTypeEntry( typedef.getFullyQualifiedNameCharArrays(), TYPEDEF, ICSearchConstants.REFERENCES));
+		this.output.addRef(fileNumber,encodeTypeEntry( typedef.getFullyQualifiedNameCharArrays(), TYPEDEF, ICSearchConstants.REFERENCES),typedef.getStartingOffset(),ICIndexStorageConstants.OFFSET);
 	}
 
 	private void addSuperTypeReference(int modifiers, char[] packageName, char[] typeName, char[][] enclosingTypeNames, char classOrInterface, char[] superTypeName, char superClassOrInterface){
@@ -338,39 +340,44 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 	public void addClassReference(IASTTypeSpecifier reference, int fileNumber){
 		char[][] fullyQualifiedName = null;
 		ASTClassKind classKind = null;
+		int offset=0;
 		
 		if (reference instanceof IASTClassSpecifier){
 		  IASTClassSpecifier classRef = (IASTClassSpecifier) reference;
 		  fullyQualifiedName = classRef.getFullyQualifiedNameCharArrays();
 		  classKind = classRef.getClassKind();
+		  offset=classRef.getStartingOffset();
 		}
 		else if (reference instanceof IASTElaboratedTypeSpecifier){
 		  IASTElaboratedTypeSpecifier typeRef = (IASTElaboratedTypeSpecifier) reference;
 		  fullyQualifiedName = typeRef.getFullyQualifiedNameCharArrays();
 		  classKind = typeRef.getClassKind();
+		  offset=typeRef.getStartingOffset();
 		}
 	
 		if (classKind.equals(ASTClassKind.CLASS))
 		{  
-			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,CLASS, ICSearchConstants.REFERENCES));
+			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,CLASS, ICSearchConstants.REFERENCES),offset,ICIndexStorageConstants.OFFSET);
 		}		
 		else if (classKind.equals(ASTClassKind.STRUCT))
 		{
-			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,STRUCT,ICSearchConstants.REFERENCES));
+			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,STRUCT,ICSearchConstants.REFERENCES),offset,ICIndexStorageConstants.OFFSET);
 		}
 		else if (classKind.equals(ASTClassKind.UNION))
 		{
-			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,UNION,ICSearchConstants.REFERENCES));			
+			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,UNION,ICSearchConstants.REFERENCES),offset,ICIndexStorageConstants.OFFSET);			
 		}
 	}
 	public void addForwardClassReference(IASTTypeSpecifier reference, int fileNumber){
 		char[][] fullyQualifiedName = null;
 		ASTClassKind classKind = null;
+		int offset=0;
 		
 		if (reference instanceof IASTElaboratedTypeSpecifier){
 		  IASTElaboratedTypeSpecifier typeRef = (IASTElaboratedTypeSpecifier) reference;
 		  fullyQualifiedName = typeRef.getFullyQualifiedNameCharArrays();
 		  classKind = typeRef.getClassKind();
+		  offset=typeRef.getStartingOffset();
 		}
 	
 		if (classKind == null)
@@ -378,15 +385,15 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 		
 		if (classKind.equals(ASTClassKind.CLASS))
 		{  
-			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,FWD_CLASS, ICSearchConstants.REFERENCES));
+			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,FWD_CLASS, ICSearchConstants.REFERENCES),offset,ICIndexStorageConstants.OFFSET);
 		}		
 		else if (classKind.equals(ASTClassKind.STRUCT))
 		{
-			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,FWD_STRUCT,ICSearchConstants.REFERENCES));
+			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,FWD_STRUCT,ICSearchConstants.REFERENCES),offset,ICIndexStorageConstants.OFFSET);
 		}
 		else if (classKind.equals(ASTClassKind.UNION))
 		{
-			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,FWD_UNION,ICSearchConstants.REFERENCES));			
+			this.output.addRef(fileNumber, encodeTypeEntry(fullyQualifiedName,FWD_UNION,ICSearchConstants.REFERENCES),offset,ICIndexStorageConstants.OFFSET);			
 		}
 	}
 	/**
@@ -861,7 +868,7 @@ public abstract class AbstractIndexer implements IIndexer,IIndexConstants, ICSea
 		incName[0] = inclusion.getFullFileName().toCharArray();
 		//TODO: Kludge! Get rid of BOGUS entry - need to restructure Dep Tree to use reference indexes
 		int BOGUS_ENTRY = 1;
-		this.output.addRef(fileNumber, encodeEntry(incName, INCLUDE_REF, INCLUDE_REF_LENGTH));
+		this.output.addRef(fileNumber, encodeEntry(incName, INCLUDE_REF, INCLUDE_REF_LENGTH),1,ICIndexStorageConstants.LINE);
 	}
 	
 	
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/CIndexStorage.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/CIndexStorage.java
index fc4d903c071..1b9c540d55e 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/CIndexStorage.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/CIndexStorage.java
@@ -25,7 +25,7 @@ import org.eclipse.cdt.core.index.ICDTIndexer;
 import org.eclipse.cdt.core.index.IIndexStorage;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IIndex;
-import org.eclipse.cdt.internal.core.index.impl.Index;
+import org.eclipse.cdt.internal.core.index.cindexstorage.Index;
 import org.eclipse.cdt.internal.core.search.CWorkspaceScope;
 import org.eclipse.cdt.internal.core.search.IndexSelector;
 import org.eclipse.cdt.internal.core.search.SimpleLookupTable;
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexerRequestor.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexerRequestor.java
index 00ab84f7ce7..7edaab5ff29 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexerRequestor.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexerRequestor.java
@@ -64,7 +64,7 @@ import org.eclipse.cdt.core.parser.ast.IASTUsingDeclaration;
 import org.eclipse.cdt.core.parser.ast.IASTUsingDirective;
 import org.eclipse.cdt.core.parser.ast.IASTVariable;
 import org.eclipse.cdt.core.parser.ast.IASTVariableReference;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants;
 import org.eclipse.cdt.internal.core.search.indexing.IndexProblemHandler;
 import org.eclipse.core.resources.IFile;
@@ -193,7 +193,7 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo
 		}
 		
 		IASTInclusion parent = peekInclude();
-		indexer.addInclude(inclusion, parent,indexer.output.getIndexedFile(resourceFile.getFullPath().toString()).getFileNumber());
+		indexer.addInclude(inclusion, parent,indexer.output.getIndexedFile(resourceFile.getFullPath().toString()).getFileID());
 		//Push on stack
 		pushInclude(inclusion);
 		//Add to traversed files
@@ -274,9 +274,9 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo
 		//the first step in the Source Indexer is to add the file being indexed to the index
 		//which actually creates an entry for the file in the index.
 		
-		IndexedFile mainIndexFile = indexer.output.getIndexedFile(resourceFile.getFullPath().toString());
+		IndexedFileEntry mainIndexFile = indexer.output.getIndexedFile(resourceFile.getFullPath().toString());
 		if (mainIndexFile != null)
-			fileNum = mainIndexFile.getFileNumber();
+			fileNum = mainIndexFile.getFileID();
 		
 		IASTInclusion include = peekInclude();
 		if (include != null){
@@ -294,22 +294,22 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo
 				filePath = include.getFullFileName();
 			}
 			
-			IndexedFile indFile = indexer.output.getIndexedFile(filePath);
+			IndexedFileEntry indFile = indexer.output.getIndexedFile(filePath);
 			if (indFile != null){
 				//File has already been added to the output; it already has a number
-				fileNum = indFile.getFileNumber();
+				fileNum = indFile.getFileID();
 			}
 			else {
 				//Need to add file to index and get a fileNumber
 				if (tempFile != null){
 				indFile = indexer.output.addIndexedFile(tempFile.getFullPath().toString());
 				if (indFile != null)
-					fileNum = indFile.getFileNumber();
+					fileNum = indFile.getFileID();
 				}
 				else {
 					indFile = indexer.output.addIndexedFile(include.getFullFileName());
 					if (indFile != null)
-						fileNum = indFile.getFileNumber();
+						fileNum = indFile.getFileID();
 				}
 			}
 			
diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexerRunner.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexerRunner.java
index e9548bf9fe4..f03a795849d 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexerRunner.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/sourceindexer/SourceIndexerRunner.java
@@ -35,8 +35,8 @@ import org.eclipse.cdt.core.parser.ParserLanguage;
 import org.eclipse.cdt.core.parser.ParserMode;
 import org.eclipse.cdt.core.parser.ParserUtil;
 import org.eclipse.cdt.core.parser.ScannerInfo;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
 import org.eclipse.cdt.internal.core.index.impl.IndexDelta;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
@@ -72,7 +72,7 @@ public class SourceIndexerRunner extends AbstractIndexer {
 	
 	protected void indexFile(IFile file) throws IOException {
 		// Add the name of the file to the index
-		IndexedFile indFile =output.addIndexedFile(file.getFullPath().toString());
+		IndexedFileEntry indFile =output.addIndexedFile(file.getFullPath().toString());
         
 		// Create a new Parser 
 		SourceIndexerRequestor requestor = new SourceIndexerRequestor(this, resourceFile);
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/OrPattern.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/OrPattern.java
index 3099c6ab560..9344d6fb2fa 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/OrPattern.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/OrPattern.java
@@ -19,7 +19,7 @@ import java.util.LinkedList;
 
 import org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.search.IIndexSearchRequestor;
 import org.eclipse.cdt.internal.core.search.matching.CSearchPattern;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/PatternSearchJob.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/PatternSearchJob.java
index ce773a15b73..7deb61f5f32 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/PatternSearchJob.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/PatternSearchJob.java
@@ -20,7 +20,7 @@ import org.eclipse.cdt.core.index.IIndexStorage;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.search.ICSearchScope;
 import org.eclipse.cdt.internal.core.index.IIndex;
-import org.eclipse.cdt.internal.core.index.impl.Index;
+import org.eclipse.cdt.internal.core.index.cindexstorage.Index;
 import org.eclipse.cdt.internal.core.index.sourceindexer.CIndexStorage;
 import org.eclipse.cdt.internal.core.search.indexing.IndexManager;
 import org.eclipse.cdt.internal.core.search.indexing.ReadWriteMonitor;
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java
index 2cc867abd21..d9b3a02cf54 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java
@@ -45,8 +45,8 @@ import org.eclipse.cdt.core.search.OrPattern;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
 import org.eclipse.cdt.internal.core.index.IIndex;
-import org.eclipse.cdt.internal.core.index.impl.BlocksIndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.BlocksIndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.search.IIndexSearchRequestor;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/ClassDeclarationPattern.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/ClassDeclarationPattern.java
index f31e35f5aa4..7ac0e128779 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/ClassDeclarationPattern.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/ClassDeclarationPattern.java
@@ -26,8 +26,8 @@ import org.eclipse.cdt.core.parser.ast.IASTTypedefDeclaration;
 import org.eclipse.cdt.core.search.ICSearchScope;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.cdt.internal.core.search.IIndexSearchRequestor;
 
@@ -157,7 +157,7 @@ public class ClassDeclarationPattern extends CSearchPattern {
 	public void feedIndexRequestor(IIndexSearchRequestor requestor, int detailLevel, int[] references,IndexInput input, ICSearchScope scope) throws IOException {
 		boolean isClass = decodedType == CLASS_SUFFIX;
 		for (int i = 0, max = references.length; i < max; i++) {
-			IndexedFile file = input.getIndexedFile(references[i]);
+			IndexedFileEntry file = input.getIndexedFile(references[i]);
 			String path;
 			if (file != null && scope.encloses(path =file.getPath())) {
 				//TODO: BOG Fix this up - even if it's not a class we still care 
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/FieldDeclarationPattern.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/FieldDeclarationPattern.java
index 0d8059f3432..7367aceb0a5 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/FieldDeclarationPattern.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/FieldDeclarationPattern.java
@@ -27,8 +27,8 @@ import org.eclipse.cdt.core.parser.ast.IASTVariable;
 import org.eclipse.cdt.core.search.ICSearchScope;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.cdt.internal.core.search.IIndexSearchRequestor;
 
@@ -160,7 +160,7 @@ public class FieldDeclarationPattern extends CSearchPattern {
 	 */
 	public void feedIndexRequestor(IIndexSearchRequestor requestor, int detailLevel, int[] references, IndexInput input, ICSearchScope scope) throws IOException {
 		for (int i = 0, max = references.length; i < max; i++) {
-			IndexedFile file = input.getIndexedFile(references[i]);
+			IndexedFileEntry file = input.getIndexedFile(references[i]);
 			String path;
 			if (file != null && scope.encloses(path =file.getPath())) {
 				requestor.acceptFieldDeclaration(path, decodedSimpleName,decodedQualifications);
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/IncludePattern.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/IncludePattern.java
index a17f4bc0501..e013af2dcd0 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/IncludePattern.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/IncludePattern.java
@@ -12,13 +12,14 @@
 package org.eclipse.cdt.internal.core.search.matching;
 
 import java.io.IOException;
+
 import org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate;
 import org.eclipse.cdt.core.parser.ast.IASTInclusion;
 import org.eclipse.cdt.core.search.ICSearchScope;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.cdt.internal.core.search.IIndexSearchRequestor;
 
@@ -52,7 +53,7 @@ public class IncludePattern extends CSearchPattern {
 	 */
 	public void feedIndexRequestor(IIndexSearchRequestor requestor, int detailLevel, int[] references, IndexInput input, ICSearchScope scope) throws IOException {
 		for (int i = 0, max = references.length; i < max; i++) {
-			IndexedFile file = input.getIndexedFile(references[i]);
+			IndexedFileEntry file = input.getIndexedFile(references[i]);
 			String path;
 			if (file != null && scope.encloses(path =file.getPath())) {
 				requestor.acceptIncludeDeclaration(path, decodedSimpleName);
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MacroDeclarationPattern.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MacroDeclarationPattern.java
index 01509999b0e..2a8cc5696ed 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MacroDeclarationPattern.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MacroDeclarationPattern.java
@@ -21,8 +21,8 @@ import org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement;
 import org.eclipse.cdt.core.search.ICSearchScope;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.cdt.internal.core.search.IIndexSearchRequestor;
 
@@ -69,7 +69,7 @@ public class MacroDeclarationPattern extends CSearchPattern {
 	 */
 	public void feedIndexRequestor(IIndexSearchRequestor requestor, int detailLevel, int[] references, IndexInput input, ICSearchScope scope) throws IOException {
 		for (int i = 0, max = references.length; i < max; i++) {
-			IndexedFile file = input.getIndexedFile(references[i]);
+			IndexedFileEntry file = input.getIndexedFile(references[i]);
 			String path;
 			if (file != null && scope.encloses(path =file.getPath())) {
 				requestor.acceptMacroDeclaration(path, decodedSimpleName);
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java
index 5db5d534395..ad73befc310 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MethodDeclarationPattern.java
@@ -23,8 +23,8 @@ import org.eclipse.cdt.core.parser.ast.IASTQualifiedNameElement;
 import org.eclipse.cdt.core.search.ICSearchScope;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.cdt.internal.core.search.IIndexSearchRequestor;
 
@@ -170,7 +170,7 @@ public class MethodDeclarationPattern extends CSearchPattern {
 	
 	public void feedIndexRequestor(IIndexSearchRequestor requestor, int detailLevel, int[] references,IndexInput input, ICSearchScope scope) throws IOException {
 		for (int i = 0, max = references.length; i < max; i++) {
-			IndexedFile file = input.getIndexedFile(references[i]);
+			IndexedFileEntry file = input.getIndexedFile(references[i]);
 			String path;
 			if (file != null && scope.encloses(path =file.getPath())) {
 				if( searchFor == METHOD )
diff --git a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/NamespaceDeclarationPattern.java b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/NamespaceDeclarationPattern.java
index 88cd264f052..b382aaf2f6b 100644
--- a/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/NamespaceDeclarationPattern.java
+++ b/core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/NamespaceDeclarationPattern.java
@@ -20,8 +20,8 @@ import org.eclipse.cdt.core.parser.ast.IASTNamespaceDefinition;
 import org.eclipse.cdt.core.search.ICSearchScope;
 import org.eclipse.cdt.internal.core.CharOperation;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.index.sourceindexer.AbstractIndexer;
 import org.eclipse.cdt.internal.core.search.IIndexSearchRequestor;
 
@@ -81,7 +81,7 @@ public class NamespaceDeclarationPattern extends CSearchPattern {
 	 */
 	public void feedIndexRequestor(IIndexSearchRequestor requestor, int detailLevel, int[] references, IndexInput input, ICSearchScope scope) throws IOException {
 		for (int i = 0, max = references.length; i < max; i++) {
-			IndexedFile file = input.getIndexedFile(references[i]);
+			IndexedFileEntry file = input.getIndexedFile(references[i]);
 			String path;
 			if (file != null && scope.encloses(path =file.getPath())) {
 				requestor.acceptNamespaceDeclaration(path, decodedSimpleName, decodedContainingTypes);
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerNodeLeaf.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerNodeLeaf.java
index 74173515267..7d7b461b3a6 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerNodeLeaf.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerNodeLeaf.java
@@ -16,15 +16,15 @@ import java.io.IOException;
 import org.eclipse.cdt.core.browser.PathUtil;
 import org.eclipse.cdt.core.parser.util.ArrayUtil;
 import org.eclipse.cdt.internal.core.index.IEntryResult;
-import org.eclipse.cdt.internal.core.index.impl.BlocksIndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.IndexedFileEntry;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.BlocksIndexInput;
+import org.eclipse.cdt.internal.core.index.cindexstorage.io.IndexInput;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants;
-import org.eclipse.cdt.internal.core.index.impl.IndexInput;
-import org.eclipse.cdt.internal.core.index.impl.IndexedFile;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.IPropertySource;
 import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
+ 
 /**
  * @author dsteffle
  */
@@ -174,6 +174,10 @@ public class IndexerNodeLeaf implements IAdaptable {
         private static final String IENTRYRESULT_GETWORD__ = "IEntryResult#getWord()"; //$NON-NLS-1$
         private static final String REFERENCES = "References"; //$NON-NLS-1$
         private static final String REFERENCE_NUMBER_ = "reference# "; //$NON-NLS-1$
+        private static final String OFFSETS = "Offsets"; //$NON-NLS-1$
+        private static final String OFFSETS_NUMBER = "offsets for #"; //$NON-NLS-1$
+        private static final String OFFSETS_LINE = "Line "; //$NON-NLS-1$
+        private static final String OFFSETS_OFFSET = "Offset "; //$NON-NLS-1$
         private static final int DEFAULT_DESCRIPTOR_SIZE = 4;
         IEntryResult entryResult = null;
         
@@ -198,7 +202,7 @@ public class IndexerNodeLeaf implements IAdaptable {
                 int[] references = entryResult.getFileReferences();
                 if (references != null) {
                     for (int j = 0; j < references.length; ++j) {
-                        IndexedFile file = input.getIndexedFile(references[j]);
+                        IndexedFileEntry file = input.getIndexedFile(references[j]);
                         if (file != null && file.getPath() != null) {
                             String id = REFERENCE_NUMBER_ + String.valueOf(j);
                             text = new TextPropertyDescriptor(new TextDescriptorId(id, PathUtil.getWorkspaceRelativePath(file.getPath()).toOSString()), id);
@@ -208,6 +212,30 @@ public class IndexerNodeLeaf implements IAdaptable {
                     }
                 }
                 
+                //offsets
+                int[][]offsets = entryResult.getOffsets();
+                if (offsets != null){
+                    for (int j=0; j<offsets.length; j++){
+                        String id = OFFSETS_NUMBER + j;
+                        String offsetString = ""; //$NON-NLS-1$
+                        for (int k=0; k<offsets[j].length; k++){
+                            String rawOffset = String.valueOf(offsets[j][k]) ;
+                            switch(rawOffset.charAt(0)){
+                             case '1':
+                                 offsetString +=  OFFSETS_LINE + rawOffset.substring(1) + " "; //$NON-NLS-1$
+                             break;
+                             case '2':
+                                 offsetString +=  OFFSETS_OFFSET + rawOffset.substring(1) + " "; //$NON-NLS-1$
+                             break;    
+                            }
+                       
+                        }
+                        text = new TextPropertyDescriptor(new TextDescriptorId(id, offsetString), id);
+                        text.setCategory(OFFSETS);
+                        descriptors = (IPropertyDescriptor[])ArrayUtil.append(IPropertyDescriptor.class, descriptors, text);
+                    }
+                }
+                
                 // add a word descriptor
                 text = new TextPropertyDescriptor(new TextDescriptorId(IENTRYRESULT_GETWORD__, String.valueOf(entryResult.getWord())), IENTRYRESULT_GETWORD__);
                 text.setCategory(IENTRYRESULT);