Index: src/chext/chext.vc90.vcproj
===================================================================
diff -u -N -rcaa71fb57fcfdd3b3731ed038cecc280ff69a78e -r8f31c461b6a91ce6818c646814bd19e740b109ef
--- src/chext/chext.vc90.vcproj	(.../chext.vc90.vcproj)	(revision caa71fb57fcfdd3b3731ed038cecc280ff69a78e)
+++ src/chext/chext.vc90.vcproj	(.../chext.vc90.vcproj)	(revision 8f31c461b6a91ce6818c646814bd19e740b109ef)
@@ -381,277 +381,280 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
-			<File
-				RelativePath="chext.cpp"
+			<Filter
+				Name="Interfaces"
 				>
-			</File>
-			<File
-				RelativePath="chext.def"
-				>
-			</File>
-			<File
-				RelativePath="chext.idl"
-				>
-				<FileConfiguration
-					Name="Debug-Unicode|Win32"
+				<File
+					RelativePath="DropMenuExt.cpp"
 					>
-					<Tool
-						Name="VCMIDLTool"
-						GenerateStublessProxies="true"
-						TypeLibraryName=".\chext.tlb"
-						HeaderFileName="chext.h"
-						InterfaceIdentifierFileName="chext_i.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug-Unicode|x64"
+				</File>
+				<File
+					RelativePath="DropMenuExt.h"
 					>
-					<Tool
-						Name="VCMIDLTool"
-						GenerateStublessProxies="true"
-						TypeLibraryName=".\chext.tlb"
-						HeaderFileName="chext.h"
-						InterfaceIdentifierFileName="chext_i.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-Unicode|Win32"
+				</File>
+				<File
+					RelativePath="MenuExt.cpp"
 					>
-					<Tool
-						Name="VCMIDLTool"
-						GenerateStublessProxies="true"
-						TypeLibraryName=".\chext.tlb"
-						HeaderFileName="chext.h"
-						InterfaceIdentifierFileName="chext_i.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-Unicode|x64"
+				</File>
+				<File
+					RelativePath="MenuExt.h"
 					>
-					<Tool
-						Name="VCMIDLTool"
-						GenerateStublessProxies="true"
-						TypeLibraryName=".\chext.tlb"
-						HeaderFileName="chext.h"
-						InterfaceIdentifierFileName="chext_i.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
+				</File>
+				<File
+					RelativePath=".\ShellExtControl.cpp"
 					>
-					<Tool
-						Name="VCMIDLTool"
-						GenerateStublessProxies="true"
-						TypeLibraryName=".\chext.tlb"
-						HeaderFileName="chext.h"
-						InterfaceIdentifierFileName="chext_i.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
+				</File>
+				<File
+					RelativePath=".\ShellExtControl.h"
 					>
-					<Tool
-						Name="VCMIDLTool"
-						GenerateStublessProxies="true"
-						TypeLibraryName=".\chext.tlb"
-						HeaderFileName="chext.h"
-						InterfaceIdentifierFileName="chext_i.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
+				</File>
+			</Filter>
+			<Filter
+				Name="Tools"
+				>
+				<File
+					RelativePath="clipboard.cpp"
 					>
-					<Tool
-						Name="VCMIDLTool"
-						GenerateStublessProxies="true"
-						TypeLibraryName=".\chext.tlb"
-						HeaderFileName="chext.h"
-						InterfaceIdentifierFileName="chext_i.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
+				</File>
+				<File
+					RelativePath="clipboard.h"
 					>
-					<Tool
-						Name="VCMIDLTool"
-						GenerateStublessProxies="true"
-						TypeLibraryName=".\chext.tlb"
-						HeaderFileName="chext.h"
-						InterfaceIdentifierFileName="chext_i.c"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="chext.rc"
+				</File>
+				<File
+					RelativePath="StringHelpers.cpp"
+					>
+				</File>
+				<File
+					RelativePath="StringHelpers.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Common"
 				>
-			</File>
-			<File
-				RelativePath="clipboard.cpp"
+				<File
+					RelativePath="..\common\FileSupport.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\common\FileSupport.h"
+					>
+				</File>
+				<File
+					RelativePath="..\common\ipcstructs.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Main"
 				>
-			</File>
-			<File
-				RelativePath=".\dllmain.cpp"
-				>
-			</File>
-			<File
-				RelativePath="DropMenuExt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\common\FileSupport.cpp"
-				>
-			</File>
-			<File
-				RelativePath="MenuExt.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ShellExtControl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="StdAfx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug-Unicode|Win32"
+				<File
+					RelativePath="chext.cpp"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug-Unicode|x64"
+				</File>
+				<File
+					RelativePath="chext.def"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-Unicode|Win32"
+				</File>
+				<File
+					RelativePath="chext.idl"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-Unicode|x64"
+					<FileConfiguration
+						Name="Debug-Unicode|Win32"
+						>
+						<Tool
+							Name="VCMIDLTool"
+							GenerateStublessProxies="true"
+							TypeLibraryName=".\chext.tlb"
+							HeaderFileName="chext.h"
+							InterfaceIdentifierFileName="chext_i.c"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug-Unicode|x64"
+						>
+						<Tool
+							Name="VCMIDLTool"
+							GenerateStublessProxies="true"
+							TypeLibraryName=".\chext.tlb"
+							HeaderFileName="chext.h"
+							InterfaceIdentifierFileName="chext_i.c"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release-Unicode|Win32"
+						>
+						<Tool
+							Name="VCMIDLTool"
+							GenerateStublessProxies="true"
+							TypeLibraryName=".\chext.tlb"
+							HeaderFileName="chext.h"
+							InterfaceIdentifierFileName="chext_i.c"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release-Unicode|x64"
+						>
+						<Tool
+							Name="VCMIDLTool"
+							GenerateStublessProxies="true"
+							TypeLibraryName=".\chext.tlb"
+							HeaderFileName="chext.h"
+							InterfaceIdentifierFileName="chext_i.c"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCMIDLTool"
+							GenerateStublessProxies="true"
+							TypeLibraryName=".\chext.tlb"
+							HeaderFileName="chext.h"
+							InterfaceIdentifierFileName="chext_i.c"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCMIDLTool"
+							GenerateStublessProxies="true"
+							TypeLibraryName=".\chext.tlb"
+							HeaderFileName="chext.h"
+							InterfaceIdentifierFileName="chext_i.c"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCMIDLTool"
+							GenerateStublessProxies="true"
+							TypeLibraryName=".\chext.tlb"
+							HeaderFileName="chext.h"
+							InterfaceIdentifierFileName="chext_i.c"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCMIDLTool"
+							GenerateStublessProxies="true"
+							TypeLibraryName=".\chext.tlb"
+							HeaderFileName="chext.h"
+							InterfaceIdentifierFileName="chext_i.c"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\dllmain.cpp"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
+				</File>
+				<File
+					RelativePath=".\dllmain.h"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
+				</File>
+				<File
+					RelativePath="StdAfx.cpp"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
+					<FileConfiguration
+						Name="Debug-Unicode|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug-Unicode|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release-Unicode|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release-Unicode|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="1"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="StdAfx.h"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
+				</File>
+				<File
+					RelativePath="..\common\targetver.h"
 					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="StringHelpers.cpp"
-				>
-			</File>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="clipboard.h"
+				RelativePath="chext.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\dllmain.h"
+				RelativePath="DropMenuExt.rgs"
 				>
 			</File>
 			<File
-				RelativePath="DropMenuExt.h"
+				RelativePath="MenuExt.rgs"
 				>
 			</File>
 			<File
-				RelativePath="..\common\FileSupport.h"
-				>
-			</File>
-			<File
-				RelativePath="IContextMenuImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\ipcstructs.h"
-				>
-			</File>
-			<File
-				RelativePath="IShellExtInitImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="MenuExt.h"
-				>
-			</File>
-			<File
 				RelativePath="resource.h"
 				>
 			</File>
 			<File
-				RelativePath=".\ShellExtControl.h"
-				>
-			</File>
-			<File
-				RelativePath="StdAfx.h"
-				>
-			</File>
-			<File
-				RelativePath="StringHelpers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\targetver.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="DropMenuExt.rgs"
-				>
-			</File>
-			<File
-				RelativePath="MenuExt.rgs"
-				>
-			</File>
-			<File
 				RelativePath=".\ShellExtControl.rgs"
 				>
 			</File>