diff --git a/moses-chart-cmd/moses-chart-cmd.vcproj b/moses-chart-cmd/moses-chart-cmd.vcproj
index 3bbe3b4f5..fb91ec78e 100644
--- a/moses-chart-cmd/moses-chart-cmd.vcproj
+++ b/moses-chart-cmd/moses-chart-cmd.vcproj
@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib &quot;$(OutDir)\moses.lib&quot; &quot;$(OutDir)\moses-chart.lib&quot; &quot;$(OutDir)\OnDiskPt.lib&quot;"
+				AdditionalDependencies="zlib.lib &quot;$(OutDir)\moses.lib&quot; &quot;$(OutDir)\OnDiskPt.lib&quot;"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="zlib.lib &quot;$(OutDir)\moses.lib&quot; &quot;$(OutDir)\moses-chart.lib&quot; &quot;$(OutDir)\OnDiskPt.lib&quot;"
+				AdditionalDependencies="zlib.lib &quot;$(OutDir)\moses.lib&quot; &quot;$(OutDir)\OnDiskPt.lib&quot;"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
diff --git a/moses.sln b/moses.sln
index ceb2a237c..d1400eac3 100644
--- a/moses.sln
+++ b/moses.sln
@@ -15,13 +15,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processPhraseTable", "misc\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moses", "moses\moses.vcproj", "{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moses-chart", "moses-chart\moses-chart.vcproj", "{C877DCA8-B4C0-4357-B6AE-34575B3D3328}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moses-chart-cmd", "moses-chart-cmd\moses-chart-cmd.vcproj", "{C3AF5C05-D4EC-41D2-8319-D1E69B9B5820}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8B07671B-CBAF-4514-AFFD-CE238CD427E9} = {8B07671B-CBAF-4514-AFFD-CE238CD427E9}
 		{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF} = {8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328} = {C877DCA8-B4C0-4357-B6AE-34575B3D3328}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "moses-cmd", "moses-cmd\moses-cmd.vcproj", "{E2233DB1-5592-46FE-9420-E529420612FA}"
@@ -36,7 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CreateOnDisk", "CreateOnDis
 	ProjectSection(ProjectDependencies) = postProject
 		{8B07671B-CBAF-4514-AFFD-CE238CD427E9} = {8B07671B-CBAF-4514-AFFD-CE238CD427E9}
 		{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF} = {8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328} = {C877DCA8-B4C0-4357-B6AE-34575B3D3328}
 	EndProjectSection
 EndProject
 Global
@@ -81,18 +77,6 @@ Global
 		{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.ReleaseNoObjPool|Win32.Build.0 = Release|Win32
 		{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release-withSRILM|Win32.ActiveCfg = Release|Win32
 		{8122157A-0DE5-44FF-8E5B-024ED6ACE7AF}.Release-withSRILM|Win32.Build.0 = Release|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.Debug|Win32.Build.0 = Debug|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.DebugNoObjPool|Win32.ActiveCfg = Debug|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.DebugNoObjPool|Win32.Build.0 = Debug|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.Debug-withSRILM|Win32.ActiveCfg = Debug|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.Debug-withSRILM|Win32.Build.0 = Debug|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.Release|Win32.ActiveCfg = Release|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.Release|Win32.Build.0 = Release|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.ReleaseNoObjPool|Win32.ActiveCfg = Release|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.ReleaseNoObjPool|Win32.Build.0 = Release|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.Release-withSRILM|Win32.ActiveCfg = Release|Win32
-		{C877DCA8-B4C0-4357-B6AE-34575B3D3328}.Release-withSRILM|Win32.Build.0 = Release|Win32
 		{C3AF5C05-D4EC-41D2-8319-D1E69B9B5820}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C3AF5C05-D4EC-41D2-8319-D1E69B9B5820}.Debug|Win32.Build.0 = Debug|Win32
 		{C3AF5C05-D4EC-41D2-8319-D1E69B9B5820}.DebugNoObjPool|Win32.ActiveCfg = Debug|Win32
diff --git a/moses/moses.vcproj b/moses/moses.vcproj
index 30f503e03..60ee890a5 100755
--- a/moses/moses.vcproj
+++ b/moses/moses.vcproj
@@ -291,18 +291,70 @@
 				RelativePath=".\src\BitmapContainer.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\ChartCell.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartCellCollection.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartHypothesis.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartHypothesisCollection.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartRuleLookupManagerMemory.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartRuleLookupManagerOnDisk.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\ChartTranslationOption.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\ChartTranslationOptionCollection.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\ChartTranslationOptionList.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\ChartTrellisNode.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartTrellisPath.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartTrellisPathCollection.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartTrellisPathList.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\ConfusionNet.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\CoveredChartSpan.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\DecodeFeature.cpp"
 				>
@@ -359,6 +411,10 @@
 				RelativePath=".\src\FFState.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\File.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\FloydWarshall.cpp"
 				>
@@ -591,18 +647,10 @@
 				RelativePath=".\src\PhraseDictionaryOnDisk.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\PhraseDictionaryOnDiskChart.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\PhraseDictionarySCFG.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\PhraseDictionarySCFGChart.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\PhraseDictionaryTree.cpp"
 				>
@@ -623,6 +671,14 @@
 				RelativePath=".\src\ReorderingStack.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\RuleCube.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\RuleCubeQueue.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\ScoreComponentCollection.cpp"
 				>
@@ -671,6 +727,10 @@
 				RelativePath=".\src\TargetPhraseCollection.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\ThreadPool.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\src\Timer.cpp"
 				>
@@ -723,10 +783,6 @@
 				RelativePath=".\src\Word.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\src\WordConsumed.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\src\WordLattice.cpp"
 				>
@@ -753,6 +809,10 @@
 				RelativePath=".\src\AlignmentInfo.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\BilingualDynSuffixArray.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\BitmapContainer.h"
 				>
@@ -761,18 +821,74 @@
 				RelativePath=".\src\CellCollection.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\ChartCell.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartCellCollection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartHypothesis.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartHypothesisCollection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartManager.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartRuleLookupManager.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartRuleLookupManagerMemory.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartRuleLookupManagerOnDisk.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\ChartTranslationOption.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\ChartTranslationOptionCollection.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\ChartTranslationOptionList.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\ChartTrellisNode.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartTrellisPath.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartTrellisPathCollection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ChartTrellisPathList.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\ConfusionNet.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\CoveredChartSpan.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\DecodeFeature.h"
 				>
@@ -809,6 +925,10 @@
 				RelativePath=".\src\DummyScoreProducers.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\DynSuffixArray.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\Factor.h"
 				>
@@ -837,6 +957,10 @@
 				RelativePath=".\src\FilePtr.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\FloydWarshall.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\GenerationDictionary.h"
 				>
@@ -897,14 +1021,34 @@
 				RelativePath=".\src\LanguageModelInternal.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\LanguageModelIRST.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\LanguageModelJoint.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\LanguageModelKen.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\LanguageModelMultiFactor.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\LanguageModelParallelBackoff.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\LanguageModelRandLM.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\LanguageModelRemote.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\LanguageModelSingleFactor.h"
 				>
@@ -949,10 +1093,18 @@
 				RelativePath=".\src\NGramNode.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\NonTerminal.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\ObjectPool.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\OutputCollector.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\Parameter.h"
 				>
@@ -1025,6 +1177,14 @@
 				RelativePath=".\src\ReorderingStack.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\RuleCube.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\RuleCubeQueue.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\ScoreComponentCollection.h"
 				>
@@ -1073,6 +1233,10 @@
 				RelativePath=".\src\TargetPhraseCollection.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\ThreadPool.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\Timer.h"
 				>
@@ -1121,6 +1285,10 @@
 				RelativePath=".\src\TypeDef.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\UniqueObject.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\UserMessage.h"
 				>