diff --git a/win32/clangAST/clangAST.vcproj b/win32/clangAST/clangAST.vcproj
index 9b4c37e..512f06e 100644
--- a/win32/clangAST/clangAST.vcproj
+++ b/win32/clangAST/clangAST.vcproj
@@ -153,71 +153,71 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\AST\ASTConsumer.cpp"
+				RelativePath="..\..\lib\AST\ASTConsumer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\ASTContext.cpp"
+				RelativePath="..\..\lib\AST\ASTContext.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\Builtins.cpp"
+				RelativePath="..\..\lib\AST\Builtins.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\CFG.cpp"
+				RelativePath="..\..\lib\AST\CFG.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\Decl.cpp"
+				RelativePath="..\..\lib\AST\Decl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\DeclSerialization.cpp"
+				RelativePath="..\..\lib\AST\DeclSerialization.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\Expr.cpp"
+				RelativePath="..\..\lib\AST\Expr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\ExprCXX.cpp"
+				RelativePath="..\..\lib\AST\ExprCXX.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\Stmt.cpp"
+				RelativePath="..\..\lib\AST\Stmt.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\StmtDumper.cpp"
+				RelativePath="..\..\lib\AST\StmtDumper.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\StmtIterator.cpp"
+				RelativePath="..\..\lib\AST\StmtIterator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\StmtPrinter.cpp"
+				RelativePath="..\..\lib\AST\StmtPrinter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\StmtSerialization.cpp"
+				RelativePath="..\..\lib\AST\StmtSerialization.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\StmtViz.cpp"
+				RelativePath="..\..\lib\AST\StmtViz.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\TranslationUnit.cpp"
+				RelativePath="..\..\lib\AST\TranslationUnit.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\Type.cpp"
+				RelativePath="..\..\lib\AST\Type.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\AST\TypeSerialization.cpp"
+				RelativePath="..\..\lib\AST\TypeSerialization.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/win32/clangAnalysis/clangAnalysis.vcproj b/win32/clangAnalysis/clangAnalysis.vcproj
index 5443371..756146c 100644
--- a/win32/clangAnalysis/clangAnalysis.vcproj
+++ b/win32/clangAnalysis/clangAnalysis.vcproj
@@ -153,55 +153,55 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\Analysis\DeadStores.cpp"
+				RelativePath="..\..\lib\Analysis\DeadStores.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\ExplodedGraph.cpp"
+				RelativePath="..\..\lib\Analysis\ExplodedGraph.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\GRBlockCounter.cpp"
+				RelativePath="..\..\lib\Analysis\GRBlockCounter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\GRCoreEngine.cpp"
+				RelativePath="..\..\lib\Analysis\GRCoreEngine.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\GRExprEngine.cpp"
+				RelativePath="..\..\lib\Analysis\GRExprEngine.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\GRSimpleVals.cpp"
+				RelativePath="..\..\lib\Analysis\GRSimpleVals.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\LiveVariables.cpp"
+				RelativePath="..\..\lib\Analysis\LiveVariables.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\ProgramPoint.cpp"
+				RelativePath="..\..\lib\Analysis\ProgramPoint.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\RValues.cpp"
+				RelativePath="..\..\lib\Analysis\RValues.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\SymbolManager.cpp"
+				RelativePath="..\..\lib\Analysis\SymbolManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\UninitializedValues.cpp"
+				RelativePath="..\..\lib\Analysis\UninitializedValues.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\ValueManager.cpp"
+				RelativePath="..\..\lib\Analysis\ValueManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Analysis\ValueState.cpp"
+				RelativePath="..\..\lib\Analysis\ValueState.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/win32/clangBasic/clangBasic.vcproj b/win32/clangBasic/clangBasic.vcproj
index 2401a04..e611e30 100644
--- a/win32/clangBasic/clangBasic.vcproj
+++ b/win32/clangBasic/clangBasic.vcproj
@@ -154,39 +154,39 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\Basic\Diagnostic.cpp"
+				RelativePath="..\..\lib\Basic\Diagnostic.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Basic\FileManager.cpp"
+				RelativePath="..\..\lib\Basic\FileManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Basic\IdentifierTable.cpp"
+				RelativePath="..\..\lib\Basic\IdentifierTable.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Basic\LangOptions.cpp"
+				RelativePath="..\..\lib\Basic\LangOptions.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Basic\SourceLocation.cpp"
+				RelativePath="..\..\lib\Basic\SourceLocation.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Basic\SourceManager.cpp"
+				RelativePath="..\..\lib\Basic\SourceManager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Basic\TargetInfo.cpp"
+				RelativePath="..\..\lib\Basic\TargetInfo.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Basic\Targets.cpp"
+				RelativePath="..\..\lib\Basic\Targets.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Basic\TokenKinds.cpp"
+				RelativePath="..\..\lib\Basic\TokenKinds.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/win32/clangCodeGen/clangCodeGen.vcproj b/win32/clangCodeGen/clangCodeGen.vcproj
index 71615e1..ef3b3af 100644
--- a/win32/clangCodeGen/clangCodeGen.vcproj
+++ b/win32/clangCodeGen/clangCodeGen.vcproj
@@ -153,59 +153,59 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\CodeGen\CGBuiltin.cpp"
+				RelativePath="..\..\lib\CodeGen\CGBuiltin.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CGDecl.cpp"
+				RelativePath="..\..\lib\CodeGen\CGDecl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CGExpr.cpp"
+				RelativePath="..\..\lib\CodeGen\CGExpr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CGExprAgg.cpp"
+				RelativePath="..\..\lib\CodeGen\CGExprAgg.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CGExprComplex.cpp"
+				RelativePath="..\..\lib\CodeGen\CGExprComplex.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CGExprConstant.cpp"
+				RelativePath="..\..\lib\CodeGen\CGExprConstant.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CGExprScalar.cpp"
+				RelativePath="..\..\lib\CodeGen\CGExprScalar.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CGObjC.cpp"
+				RelativePath="..\..\lib\CodeGen\CGObjC.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CGObjCGNU.cpp"
+				RelativePath="..\..\lib\CodeGen\CGObjCGNU.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CGStmt.cpp"
+				RelativePath="..\..\lib\CodeGen\CGStmt.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CodeGenFunction.cpp"
+				RelativePath="..\..\lib\CodeGen\CodeGenFunction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CodeGenModule.cpp"
+				RelativePath="..\..\lib\CodeGen\CodeGenModule.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CodeGenTypes.cpp"
+				RelativePath="..\..\lib\CodeGen\CodeGenTypes.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\ModuleBuilder.cpp"
+				RelativePath="..\..\lib\CodeGen\ModuleBuilder.cpp"
 				>
 			</File>
 		</Filter>
@@ -215,15 +215,15 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\CodeGen\CodeGenFunction.h"
+				RelativePath="..\..\lib\CodeGen\CodeGenFunction.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CodeGenModule.h"
+				RelativePath="..\..\lib\CodeGen\CodeGenModule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\CodeGen\CodeGenTypes.h"
+				RelativePath="..\..\lib\CodeGen\CodeGenTypes.h"
 				>
 			</File>
 			<File
diff --git a/win32/clangLex/clangLex.vcproj b/win32/clangLex/clangLex.vcproj
index bc0daed..3be092a 100644
--- a/win32/clangLex/clangLex.vcproj
+++ b/win32/clangLex/clangLex.vcproj
@@ -153,43 +153,43 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\Lex\HeaderMap.cpp"
+				RelativePath="..\..\lib\Lex\HeaderMap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\HeaderSearch.cpp"
+				RelativePath="..\..\lib\Lex\HeaderSearch.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\Lexer.cpp"
+				RelativePath="..\..\lib\Lex\Lexer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\LiteralSupport.cpp"
+				RelativePath="..\..\lib\Lex\LiteralSupport.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\MacroExpander.cpp"
+				RelativePath="..\..\lib\Lex\MacroExpander.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\MacroInfo.cpp"
+				RelativePath="..\..\lib\Lex\MacroInfo.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\PPExpressions.cpp"
+				RelativePath="..\..\lib\Lex\PPExpressions.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\Pragma.cpp"
+				RelativePath="..\..\lib\Lex\Pragma.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\Preprocessor.cpp"
+				RelativePath="..\..\lib\Lex\Preprocessor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\ScratchBuffer.cpp"
+				RelativePath="..\..\lib\Lex\ScratchBuffer.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/win32/clangParse/clangParse.vcproj b/win32/clangParse/clangParse.vcproj
index f4d435c..23ce529 100644
--- a/win32/clangParse/clangParse.vcproj
+++ b/win32/clangParse/clangParse.vcproj
@@ -153,47 +153,47 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\Parse\AttributeList.cpp"
+				RelativePath="..\..\lib\Parse\AttributeList.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\DeclSpec.cpp"
+				RelativePath="..\..\lib\Parse\DeclSpec.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\MinimalAction.cpp"
+				RelativePath="..\..\lib\Parse\MinimalAction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\ParseDecl.cpp"
+				RelativePath="..\..\lib\Parse\ParseDecl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\ParseDeclCXX.cpp"
+				RelativePath="..\..\lib\Parse\ParseDeclCXX.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\ParseExpr.cpp"
+				RelativePath="..\..\lib\Parse\ParseExpr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\ParseExprCXX.cpp"
+				RelativePath="..\..\lib\Parse\ParseExprCXX.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\ParseInit.cpp"
+				RelativePath="..\..\lib\Parse\ParseInit.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\ParseObjc.cpp"
+				RelativePath="..\..\lib\Parse\ParseObjc.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\Parser.cpp"
+				RelativePath="..\..\lib\Parse\Parser.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Parse\ParseStmt.cpp"
+				RelativePath="..\..\lib\Parse\ParseStmt.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/win32/clangRewrite/clangRewrite.vcproj b/win32/clangRewrite/clangRewrite.vcproj
index 810d79f..0df445e 100644
--- a/win32/clangRewrite/clangRewrite.vcproj
+++ b/win32/clangRewrite/clangRewrite.vcproj
@@ -149,7 +149,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\Rewrite\Rewriter.cpp"
+				RelativePath="..\..\lib\Rewrite\Rewriter.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/win32/clangSema/clangSema.vcproj b/win32/clangSema/clangSema.vcproj
index 8534348..ac85915 100644
--- a/win32/clangSema/clangSema.vcproj
+++ b/win32/clangSema/clangSema.vcproj
@@ -153,43 +153,43 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\Sema\ParseAST.cpp"
+				RelativePath="..\..\lib\Sema\ParseAST.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\Sema.cpp"
+				RelativePath="..\..\lib\Sema\Sema.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\SemaChecking.cpp"
+				RelativePath="..\..\lib\Sema\SemaChecking.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\SemaDecl.cpp"
+				RelativePath="..\..\lib\Sema\SemaDecl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\SemaDeclObjC.cpp"
+				RelativePath="..\..\lib\Sema\SemaDeclObjC.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\SemaExpr.cpp"
+				RelativePath="..\..\lib\Sema\SemaExpr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\SemaExprCXX.cpp"
+				RelativePath="..\..\lib\Sema\SemaExprCXX.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\SemaExprObjC.cpp"
+				RelativePath="..\..\lib\Sema\SemaExprObjC.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\SemaStmt.cpp"
+				RelativePath="..\..\lib\Sema\SemaStmt.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\SemaType.cpp"
+				RelativePath="..\..\lib\Sema\SemaType.cpp"
 				>
 			</File>
 		</Filter>
@@ -203,7 +203,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Sema\Sema.h"
+				RelativePath="..\..\lib\Sema\Sema.h"
 				>
 			</File>
 		</Filter>