diff --git a/samples/CSharp/IE/IE.csproj b/samples/CSharp/IE/IE.csproj
index fbf7b80a2e..160a479356 100755
--- a/samples/CSharp/IE/IE.csproj
+++ b/samples/CSharp/IE/IE.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -25,6 +25,8 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <ApplicationRevision>0</ApplicationRevision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
diff --git a/samples/CSharp/IE/IE.sln b/samples/CSharp/IE/IE.sln
index 577dd7ed82..120ac23743 100755
--- a/samples/CSharp/IE/IE.sln
+++ b/samples/CSharp/IE/IE.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IE", "IE.csproj", "{B9914BB3-B886-4B41-B48D-350EBEBEFD1F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OCC", "..\OCC\OCC.vcproj", "{DCB139CF-2190-412E-B72F-8B080CC01422}"
diff --git a/samples/CSharp/OCC/OCC.vcproj b/samples/CSharp/OCC/OCC.vcproj
index 0a778dc943..ad731fd233 100755
--- a/samples/CSharp/OCC/OCC.vcproj
+++ b/samples/CSharp/OCC/OCC.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="OCC"
 	ProjectGUID="{DCB139CF-2190-412E-B72F-8B080CC01422}"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CASROOT)\inc"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC)"
 				PreprocessorDefinitions="WNT"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
@@ -65,12 +66,14 @@
 				AdditionalDependencies="TKV3d.lib TKV2d.lib TKHLR.lib TKService.lib TKBool.lib TKPShape.lib TKMath.lib TKBO.lib TKernel.lib TKPrim.lib TKTopAlgo.lib TKBRep.lib TKGeomAlgo.lib TKG2d.lib TKG3d.lib PTKernel.lib TKShapeSchema.lib TKXSBase.lib TKIGES.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKShHealing.lib TKSTL.lib TKVRML.lib"
 				OutputFile="$(OutDir)/OCC.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\lib"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				ProgramDatabaseFile="$(OutDir)/OCC.pdb"
 				SubSystem="2"
 				ResourceOnlyDLL="false"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/OCC.lib"
 				TargetMachine="1"
 			/>
@@ -92,9 +95,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -125,7 +125,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(CASROOT)\inc"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC)"
 				PreprocessorDefinitions="WNT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -147,11 +147,13 @@
 				AdditionalDependencies="TKV3d.lib TKV2d.lib TKHLR.lib TKService.lib TKBool.lib TKPShape.lib TKMath.lib TKBO.lib TKernel.lib TKPrim.lib TKTopAlgo.lib TKBRep.lib TKGeomAlgo.lib TKG2d.lib TKG3d.lib PTKernel.lib TKShapeSchema.lib TKXSBase.lib TKIGES.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKShHealing.lib TKSTL.lib TKVRML.lib"
 				OutputFile="$(OutDir)/OCC.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\lib"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/OCC.lib"
 				TargetMachine="1"
 			/>
@@ -173,9 +175,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/samples/CSharp/Run_MSVC.bat b/samples/CSharp/Run_MSVC.bat
deleted file mode 100755
index 362c111729..0000000000
--- a/samples/CSharp/Run_MSVC.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-rem Launch MS VC with environment prepared for building OCCT C# sample
-
-rem Set build environment 
-call %~dp0..\..\ros\env_build.bat vc8 win32
-
-rem Define path to project file
-set PRJFILE=%~dp0IE\IE.sln
-
-rem Launch Visual Studio - either professional (devenv) or Express, as available
-if exist %DevEnvDir%\devenv.exe (
-    start %DevEnvDir%\devenv.exe %PRJFILE% /useenv
-) else if exist %DevEnvDir%\VCExpress.exe (
-    start %DevEnvDir%\VCExpress.exe %PRJFILE% /useenv
-) else (
-    echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-    echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
-)
-
diff --git a/samples/CSharp/env.bat b/samples/CSharp/env.bat
deleted file mode 100644
index 94db5b7ee2..0000000000
--- a/samples/CSharp/env.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@ECHO OFF
-
-call "%~dp0..\..\ros\env.bat"
\ No newline at end of file
diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat
new file mode 100644
index 0000000000..6a8707d6bc
--- /dev/null
+++ b/samples/CSharp/msvc.bat
@@ -0,0 +1,3 @@
+call ../../env.bat %1 %2 %3
+if not ["%CASDEB%"] == [""] call ../../msvc.bat %VCVER% win%ARCH% %CASDEB% %~dp0IE\IE.sln
+if ["%CASDEB%"] == [""] call ../../msvc.bat %VCVER% win%ARCH% "" %~dp0IE\IE.sln
\ No newline at end of file
diff --git a/samples/CSharp/run.bat b/samples/CSharp/run.bat
new file mode 100644
index 0000000000..104ecef9ea
--- /dev/null
+++ b/samples/CSharp/run.bat
@@ -0,0 +1,4 @@
+call ../../env.bat %1 %2 %3
+if not ["%CASDEB%"] == [""] set "BinDir=Debug"
+if ["%CASDEB%"] == [""] set "BinDir=Release"
+%~dp0IE\bin\%BinDir%\IE.exe
\ No newline at end of file
diff --git a/samples/CSharp/shell/shell.vcproj b/samples/CSharp/shell/shell.vcproj
index 72bf9d65a3..5df333af48 100755
--- a/samples/CSharp/shell/shell.vcproj
+++ b/samples/CSharp/shell/shell.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="shell"
 	ProjectGUID="{969912D9-78E7-4AB8-B4FF-6B52B4F03991}"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\OCC\;$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
 				PreprocessorDefinitions="WNT"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
@@ -65,11 +66,13 @@
 				AdditionalDependencies="OCC.lib TKV3d.lib TKV2d.lib TKHLR.lib TKService.lib PTKernel.lib TKShapeSchema.lib TKBool.lib TKMath.lib TKBO.lib TKernel.lib TKPrim.lib TKTopAlgo.lib TKBRep.lib TKGeomAlgo.lib TKPShape.lib TKXSBase.lib TKIGES.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKShHealing.lib TKSTL.lib TKVRML.lib"
 				OutputFile="$(OutDir)/shell.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CASROOT)\win32\lib"
+				AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				ProgramDatabaseFile="$(OutDir)/shell.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/shell.lib"
 				TargetMachine="1"
 			/>
@@ -91,9 +94,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -124,7 +124,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\OCC\;$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC)"
 				PreprocessorDefinitions="WNT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -146,11 +146,13 @@
 				AdditionalDependencies="OCC.lib TKV3d.lib TKV2d.lib TKHLR.lib TKService.lib PTKernel.lib TKShapeSchema.lib TKBool.lib TKMath.lib TKBO.lib TKernel.lib TKPrim.lib TKTopAlgo.lib TKBRep.lib TKGeomAlgo.lib TKPShape.lib TKXSBase.lib TKIGES.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKShHealing.lib TKSTL.lib TKVRML.lib"
 				OutputFile="$(OutDir)/shell.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CASROOT)\win32\vc8\lib"
+				AdditionalLibraryDirectories="..\OCC\$(OutDir);$(CSF_OPT_LIB32)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/shell.lib"
 				TargetMachine="1"
 			/>
@@ -172,9 +174,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
index c02faffbf1..2a86767937 100644
--- a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -113,11 +113,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -128,24 +128,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -156,11 +156,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -171,22 +171,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -199,12 +199,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Geometry.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -215,22 +215,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Geometry.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Geometry.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Geometry.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -243,12 +243,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe</OutputFile>
+      <OutputFile>../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
index f9c28dd55d..81706b7dc9 100644
--- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,12 +82,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -118,8 +118,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -144,24 +144,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -180,12 +180,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -216,8 +216,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -242,22 +242,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -278,13 +278,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -315,8 +315,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -341,22 +341,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -377,13 +377,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-				OutputFile="../../../..\\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
+				OutputFile="../../../..\\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
index 891f4a11c0..6688448721 100644
--- a/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
+++ b/samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,12 +83,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -118,8 +118,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -144,24 +144,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Geometry.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Geometry.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Geometry.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -180,12 +180,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Geometry.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -215,8 +215,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -241,22 +241,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -277,13 +277,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -313,8 +313,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -339,22 +339,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Geometry.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Geometry.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2d"
+				AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Geometry.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Geometry.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -375,13 +375,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
-				OutputFile="../../../..\\$(OS_TYPE)\$(VCVER)\bind/Geometry.exe"
+				OutputFile="../../../..\\win$(ARCH)\$(VCVER)\bind/Geometry.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Geometry.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Geometry.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
index c6a8b44298..a092667d81 100644
--- a/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,22 +85,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -112,11 +112,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,22 +127,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -154,11 +154,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,24 +169,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -197,10 +197,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,24 +211,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/TopologyTransformations.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/TopologyTransformations.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/TopologyTransformations.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -239,10 +239,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
index 5c2279a2d4..d3c8d7bf37 100644
--- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,22 +46,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -81,12 +81,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,22 +143,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -178,12 +178,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,24 +240,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -276,11 +276,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,24 +337,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -373,11 +373,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
index 5b10c377c4..8389abf841 100644
--- a/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
+++ b/samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,22 +47,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -82,12 +82,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,22 +143,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/TopologyTransformations.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/TopologyTransformations.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/TopologyTransformations.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -178,12 +178,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Modeling.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Modeling.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,24 +239,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -275,11 +275,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,24 +335,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/TopologyTransformations.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/TopologyTransformations.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,.,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/TopologyTransformations.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/TopologyTransformations.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -371,11 +371,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib  TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Modeling.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Modeling.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
index 2a322ec7e4..7312fac5c1 100644
--- a/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
+++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,24 +127,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,22 +169,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,22 +211,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer2d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Viewer2d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer2d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
index 02f3004dc0..c16bbd5d0e 100644
--- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
+++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
index efdfbb5931..f9dbebb894 100644
--- a/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
+++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer2d.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer2d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer2d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer2d.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer2d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer2d.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Viewer2d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer2d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer2d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer2d.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer2d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
index 664fd7ef07..34bfc5244f 100644
--- a/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
+++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,24 +127,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,22 +169,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -197,11 +197,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -212,22 +212,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Viewer3d.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Viewer3d.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Viewer3d.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -240,11 +240,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
index eb2c10418f..b3ae647170 100644
--- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
+++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -276,12 +276,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -312,8 +312,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -338,22 +338,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -374,12 +374,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
index eb014793d1..9312d501b0 100644
--- a/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
+++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Viewer3d.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Viewer3d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Viewer3d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -275,12 +275,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -310,8 +310,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -336,22 +336,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Viewer3d.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Viewer3d.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Viewer3d.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Viewer3d.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -372,12 +372,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Viewer3d.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Viewer3d.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Viewer3d.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Viewer3d.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
index 7a55c64610..74b76ff6af 100755
--- a/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
@@ -256,16 +256,14 @@ aShape = Transformer.Shape();
   // display original shape in shaded display mode
   Handle_AIS_Shape aShapeIO = drawShape(aShape, Graphic3d_NOM_BRASS, Standard_False);
   getAISContext()->SetDisplayMode(aShapeIO, AIS_Shaded, Standard_False);
+  // Set increased polygon offset for the main shape to avoid depth collision with textured faces
+  aShapeIO->SetPolygonOffsets(Aspect_POM_Fill, 1.5, 0.5);
   DISP(aShapeIO);
 
   Handle_AIS_TexturedShape aTFace1 = Texturize(aFaces(16), "carrelage1.gif", 1, 1, 3, 2);
-  //offset visual shape to avoid overlapping
-  aTFace1->SetPolygonOffsets(Aspect_POM_Fill, 0.99, -2.0);
   DISP(aTFace1);
 
   Handle_AIS_TexturedShape aTFace2 = Texturize(aFaces(21), "carrelage1.gif", 1, 1, 3, 2);
-  //offset a visual shape to avoid overlapping
-  aTFace2->SetPolygonOffsets(Aspect_POM_Fill, 0.99, -2.0);
   DISP(aTFace2);
 
   getViewer()->Update();
diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
index ef6bc35293..3a024e7a1b 100644
--- a/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
+++ b/samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,24 +127,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,22 +169,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,22 +211,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/ImportExport.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/ImportExport.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/ImportExport.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
index 158eb2dd11..819de37b7f 100644
--- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
+++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
index d87a911aee..bf51b00bbd 100644
--- a/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
+++ b/samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/ImportExport.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/ImportExport.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/ImportExport.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.exe"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bin/ImportExport.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bin/ImportExport.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/ImportExport.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/ImportExport.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/ImportExport.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/ImportExport.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.exe"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\bind/ImportExport.pdb"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\bind/ImportExport.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
index 7368794ade..05459c0e9d 100644
--- a/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
+++ b/samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,24 +127,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,22 +169,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,22 +211,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Ocaf.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Ocaf.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)\inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OPT_INC);$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Ocaf.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
index f3b1ed2b71..c752bde825 100644
--- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
+++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
index 25375e47f5..1f6324fe1e 100644
--- a/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
+++ b/samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Ocaf.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Ocaf.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Ocaf.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Ocaf.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Ocaf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Ocaf.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Ocaf.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)\inc,$(CASROOT)\..\tools\ocafbrowser\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OPT_INC),$(CASROOT)\..\tools\ocafbrowser\inc"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Ocaf.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Ocaf.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Ocaf.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Ocaf.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
index cde9033ec7..153124713d 100644
--- a/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
+++ b/samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Triangulation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,24 +127,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Triangulation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,22 +169,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Triangulation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,22 +211,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Triangulation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Triangulation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CASROOT)\inc;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;..\..\..\;$(CSF_OPT_INC);..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Triangulation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Triangulation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Triangulation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
index 8ff3d9aa3a..33b2632b21 100644
--- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
+++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Triangulation.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Triangulation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Triangulation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Triangulation.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Triangulation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Triangulation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Triangulation.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Triangulation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Triangulation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Triangulation.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Triangulation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Triangulation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
index 06cf1d8fe7..844ced2ef8 100644
--- a/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
+++ b/samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Triangulation.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Triangulation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Triangulation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Triangulation.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Triangulation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Triangulation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Triangulation.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Triangulation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Triangulation.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Triangulation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Triangulation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Triangulation.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Triangulation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)\inc,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OPT_INC),..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Triangulation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Triangulation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Triangulation.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Triangulation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
index 9e1dfd5f3a..9438c9b6bc 100644
--- a/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
+++ b/samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,24 +85,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -113,10 +113,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/HLR.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/HLR.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/HLR.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,24 +127,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -155,10 +155,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/HLR.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/HLR.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/HLR.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,22 +169,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -196,11 +196,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/HLR.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/HLR.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/HLR.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,22 +211,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/HLR.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/HLR.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/HLR.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/HLR.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -238,11 +238,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/HLR.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/HLR.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/HLR.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/HLR.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
index f54d35661b..38b6bced23 100644
--- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
+++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/HLR.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/HLR.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/HLR.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,11 +82,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/HLR.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/HLR.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/HLR.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,22 +240,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/HLR.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/HLR.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/HLR.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -275,12 +275,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,22 +337,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/HLR.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/HLR.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/HLR.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -372,12 +372,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
index d8e9a84983..defea11018 100644
--- a/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
+++ b/samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/HLR.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/HLR.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/HLR.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,11 +83,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,24 +143,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/HLR.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/HLR.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/HLR.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -179,11 +179,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/HLR.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/HLR.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,22 +239,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/HLR.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/HLR.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/HLR.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -274,12 +274,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,22 +335,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/HLR.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/HLR.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/HLR.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/HLR.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -370,12 +370,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/HLR.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/HLR.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
index 64d9e94dc1..8b8474931e 100644
--- a/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
+++ b/samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,22 +85,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -112,11 +112,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Animation.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Animation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Animation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -127,22 +127,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -154,11 +154,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Animation.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Animation.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Animation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
@@ -169,24 +169,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -197,10 +197,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Animation.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Animation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Animation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -211,24 +211,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Animation.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Animation.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\..\;..\..\..\..\..\..\Common;$(CASROOT)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\;..\..\..\..\..\..\Common;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Animation.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Animation.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -240,10 +240,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Animation.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Animation.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Animation.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Animation.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
index 78a69784b1..4a8e6cdd72 100644
--- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
+++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,22 +46,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Animation.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Animation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Animation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -81,12 +81,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,22 +143,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Animation.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Animation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Animation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -178,12 +178,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
@@ -214,8 +214,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -240,24 +240,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Animation.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Animation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Animation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -276,11 +276,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -311,8 +311,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -337,24 +337,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Animation.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Animation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Animation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -373,11 +373,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
index 0637469fe1..f1e3ee7974 100644
--- a/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
+++ b/samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,22 +47,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Animation.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Animation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Animation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -82,12 +82,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -117,8 +117,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -143,22 +143,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Animation.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Animation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Animation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -178,12 +178,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Animation.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Animation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -213,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -239,24 +239,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Animation.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;CSFDB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Animation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Animation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -275,11 +275,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -309,8 +309,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -335,24 +335,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Animation.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Animation.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)\inc"
+				AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Animation.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Animation.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -371,11 +371,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Animation.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Animation.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
index 3a101ad1cf..c8c06ac0cc 100644
--- a/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
+++ b/samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,14 +85,14 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)\inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -100,10 +100,10 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -114,11 +114,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Convert.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Convert.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Convert.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>false</OptimizeReferences>
       <TargetMachine>MachineX86</TargetMachine>
@@ -130,14 +130,14 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)\inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -145,10 +145,10 @@
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -159,11 +159,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Convert.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bin/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;..\..\..\..\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bin/Convert.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bin/Convert.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>false</OptimizeReferences>
       <TargetMachine>MachineX64</TargetMachine>
@@ -175,23 +175,23 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)\inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -203,12 +203,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Convert.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Convert.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Convert.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -219,23 +219,23 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/Convert.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/Convert.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)\inc;../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OPT_INC);../../../Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/Convert.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/Convert.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -247,12 +247,12 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Convert.exe</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\bind/Convert.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;..\..\..\..\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ManifestFile>.\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
+      <AdditionalLibraryDirectories>..\..\..\..\win$(ARCH)\$(VCVER)\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ManifestFile>.\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\bind/Convert.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\bind/Convert.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
diff --git a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
index 8880eb44a0..8bc9fb3b81 100644
--- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
+++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,24 +46,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Convert.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Convert.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Convert.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -82,12 +82,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ManifestFile=".\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ManifestFile=".\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.pdb"
 				SubSystem="2"
 				OptimizeReferences="1"
 				TargetMachine="1"
@@ -119,8 +119,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -145,24 +145,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Convert.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Convert.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Convert.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -181,12 +181,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ManifestFile=".\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ManifestFile=".\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.pdb"
 				SubSystem="2"
 				OptimizeReferences="1"
 				TargetMachine="17"
@@ -218,8 +218,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -244,22 +244,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Convert.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Convert.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Convert.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -279,13 +279,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
-				ManifestFile=".\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+				ManifestFile=".\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -316,8 +316,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -342,22 +342,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Convert.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Convert.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Convert.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -377,13 +377,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
-				ManifestFile=".\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+				ManifestFile=".\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.pdb"
 				SubSystem="2"
 				TargetMachine="17"
 			/>
diff --git a/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
index ac297ccd3b..2922d4f5ce 100644
--- a/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
+++ b/samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,24 +47,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Convert.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Convert.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Convert.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -83,12 +83,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ManifestFile=".\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB32)"
+				ManifestFile=".\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.pdb"
 				SubSystem="2"
 				OptimizeReferences="1"
 				RandomizedBaseAddress="1"
@@ -119,8 +119,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bin"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bin"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -145,24 +145,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/Convert.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;WNT;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/Convert.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/Convert.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -181,12 +181,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\lib,..\..\..\..\\$(OS_TYPE)\$(VCVER)\lib"
-				ManifestFile=".\$(OS_TYPE)\obj\$(TargetFileName).intermediate.manifest"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bin/Convert.pdb"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\lib,$(CSF_OPT_LIB64)"
+				ManifestFile=".\win$(ARCH)\obj\$(TargetFileName).intermediate.manifest"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bin/Convert.pdb"
 				SubSystem="2"
 				OptimizeReferences="1"
 				RandomizedBaseAddress="1"
@@ -217,8 +217,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -243,22 +243,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Convert.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Convert.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Convert.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -278,13 +278,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
-				ManifestFile=".\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB32D)"
+				ManifestFile=".\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -314,8 +314,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../..\$(OS_TYPE)\$(VCVER)\bind"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../..\win$(ARCH)\$(VCVER)\bind"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -340,22 +340,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/Convert.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/Convert.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)\inc,../../../Common"
+				AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OPT_INC),../../../Common"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="StdAfx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/Convert.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/Convert.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -375,13 +375,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKGeomAlgo.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib TKBRep.lib TKG2d.lib TKG3d.lib TKGeomBase.lib mfcsample.lib"
-				OutputFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.exe"
+				OutputFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\\$(OS_TYPE)\$(VCVER)\libd,..\..\..\..\\$(OS_TYPE)\$(VCVER)\libd"
-				ManifestFile=".\$(OS_TYPE)\objd\$(TargetFileName).intermediate.manifest"
+				AdditionalLibraryDirectories="..\..\..\..\\win$(ARCH)\$(VCVER)\libd,$(CSF_OPT_LIB64D)"
+				ManifestFile=".\win$(ARCH)\objd\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../..\$(OS_TYPE)\$(VCVER)\bind/Convert.pdb"
+				ProgramDatabaseFile="../../../..\win$(ARCH)\$(VCVER)\bind/Convert.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/Run.bat b/samples/mfc/standard/Run.bat
deleted file mode 100755
index bc7ad0ee29..0000000000
--- a/samples/mfc/standard/Run.bat
+++ /dev/null
@@ -1,55 +0,0 @@
-@ECHO OFF
-
-call %~dp0..\..\ros\env.bat
-
-if "%4" EQU "" (
-  echo Launch selected sample as follows: 
-  echo Run.bat [^vc8^|^vc9^|^vc10^] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^]
-  echo Use option -d to run Debug mode
-  EXIT /B
-)
-
-SET VCVER=%1
-SET OS_TYPE=%2
-
-if not "%3" EQU "" (
-    if /I "%3" == "Release" (
-        set CASDEB=
-    ) else if /I "%3" == "Debug" (
-        set CASDEB=d
-    ) else (
-        echo Error: third argument ^(%3^) should specify build mode,
-        echo one of: Debug or Release
-        exit /B
-    )
-)
-
-IF not "%CASDEB%" EQU "" (
-	SET EXEDIR=%~dp0%OS_TYPE%\%VCVER%\bind
-	SET LIBDIR=%~dp0%OS_TYPE%\%VCVER%\libd
-	SET CSF_GraphicShr=%CASROOT%\%OS_TYPE%\%VCVER%\bind\TKOpenGl.dll
-) else (
-	SET EXEDIR=%~dp0%OS_TYPE%\%VCVER%\bin
-	SET LIBDIR=%~dp0%OS_TYPE%\%VCVER%\lib
-	SET CSF_GraphicShr=%CASROOT%\%OS_TYPE%\%VCVER%\bin\TKOpenGl.dll
-)
-
-SET PATH=%LIBDIR%;%BIN_DIR%;%PATH%
-
-SET RES_DIR=.\res
-
-set CSF_ResourcesDefaults=%CASROOT%\..\samples\mfc\06_Ocaf\res
-set CSF_PluginDefaults=%CASROOT%\..\samples\mfc\06_Ocaf\res
-
-IF NOT EXIST %EXEDIR%\%4.exe goto ERR_EXE
-
-start %EXEDIR%\%4.exe
-
-GOTO END
-
-:ERR_EXE
-ECHO Executable %EXEDIR%\%~n1.exe not found."
-ECHO Probably you didn't compile the application.
-EXIT /B
-
-:END
diff --git a/samples/mfc/standard/Run_MSVC.bat b/samples/mfc/standard/Run_MSVC.bat
deleted file mode 100755
index b204e4e37a..0000000000
--- a/samples/mfc/standard/Run_MSVC.bat
+++ /dev/null
@@ -1,29 +0,0 @@
-REM @ECHO OFF
-
-CALL "%~dp0env.bat" %1 %2 %3
-
-IF NOT DEFINED VCVER GOTO ERR_VCVER
-
-IF NOT DEFINED OS_TYPE GOTO ERR_OSTYPE
-
-IF %VCVER%==vc8 (
-start devenv.exe All-%VCVER%.sln /useenv
-) ELSE (
-IF %VCVER%==vc9 ( 
-start "MSDEV" "devenv.exe" All-%VCVER%.sln /useenv
-) ELSE (
-IF %VCVER%==vc10 (   
-start "MSDEV" "devenv.exe" All-%VCVER%.sln /useenv
-) ) )
-
-GOTO END
-
-:ERR_VCVER
-ECHO Environment variable "VCVER" has not been defined. Abort.
-GOTO END
-
-:ERR_OSTYPE
-ECHO Environment variable "OS_TYPE" has not been defined. Abort.
-GOTO END
-
-:END
diff --git a/samples/mfc/standard/env.bat b/samples/mfc/standard/env.bat
old mode 100755
new mode 100644
index c898c3b347..3c67be2629
--- a/samples/mfc/standard/env.bat
+++ b/samples/mfc/standard/env.bat
@@ -1,79 +1,9 @@
-@ECHO OFF
-
-rem Set environment for building OCCT mfc samples
-rem Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
-rem second argument specifies architecture) (win32 or win64)
-rem - third argument specifies build mode,
-
-rem Set build environment 
-call "%~dp0..\..\ros\env_build.bat" %1 %2
-
-rem Set build mode
-set CASDEB=d
-if not "%3" EQU "" (
-    if /I "%3" == "Release" (
-        set CASDEB=
-    ) else if /I "%3" == "Debug" (
-        set CASDEB=d
-    ) else (
-        echo Error: third argument ^(%3^) should specify build mode,
-        echo one of: Debug or Release
-        exit /B
-    )
-)
-)
-
-rem Workaround for problems of building by VS2010 in 64 bit mode
-if /I "%VCVER%" == "vc10" (
-	if  "%ARCH%" == "64" (
-		echo Attention: The error can occured during the compilation in Visual Studio 2010, 
-		echo 		64 bit mode with embedding manifests ^(TRACKER : error TRK0002: Failed to execute command:^).
-		echo 		It's an error of Visual Studio 2010 which will be corrected in future versions of Visual Studio. 
-		echo		More details can be found here: 
-		echo 		https://connect.microsoft.com/VisualStudio/feedback/details/505682/x64-c-c-projects-cannot-compile
-	)
-)
-
-SET OS_TYPE=win%ARCH%
-
-IF NOT DEFINED CASROOT GOTO ERR_CASROOT
-
-IF NOT DEFINED OS_TYPE GOTO ERR_OSTYPE
-
-IF NOT EXIST "%CASROOT%\%OS_TYPE%\%VCVER%\bin\TKernel.dll" GOTO ERR_CASCADE
-
 IF not "%CASDEB%" EQU "" (
-SET CASLIBS=%CASROOT%\%OS_TYPE%\%VCVER%\bind
-SET BIN_DIR=%OS_TYPE%\%VCVER%\bind
-SET LIB_DIR=%OS_TYPE%\%VCVER%\libd
-SET CSF_GraphicShr=%CASROOT%\%OS_TYPE%\%VCVER%\bind\TKOpenGl.dll
+SET BIN_DIR=win%ARCH%\%VCVER%\bind
+SET LIB_DIR=win%ARCH%\%VCVER%\libd
 ) ELSE (
-SET CASLIBS=%CASROOT%\%OS_TYPE%\%VCVER%\bin
-SET BIN_DIR=%OS_TYPE%\%VCVER%\bin
-SET LIB_DIR=%OS_TYPE%\%VCVER%\lib
-SET CSF_GraphicShr=%CASROOT%\%OS_TYPE%\%VCVER%\bin\TKOpenGl.dll
+SET BIN_DIR=win%ARCH%\%VCVER%\bin
+SET LIB_DIR=win%ARCH%\%VCVER%\lib
 )
 
-SET PATH=%~dp0%LIB_DIR%;%~dp0%BIN_DIR%;%CASLIBS%;%PATH%
-
-SET RES_DIR=.\res
-
-set CSF_ResourcesDefaults=%CASROOT%\..\samples\mfc\06_Ocaf\res
-set CSF_PluginDefaults=%CASROOT%\..\samples\mfc\06_Ocaf\res
-
-GOTO END
-
-:ERR_CASROOT
-ECHO Environment variable "CASROOT" has not been defined. Abort.
-EXIT /B
-
-:ERR_CASCADE
-ECHO Environment variable "CASROOT" defined incorrectly. Abort.
-EXIT /B
-
-:ERR_OSTYPE
-ECHO Environment variable "OS_TYPE" has not been defined. Abort.
-EXIT /B
-
-:END
-
+SET PATH=%~dp0%LIB_DIR%;%~dp0%BIN_DIR%;%PATH%
\ No newline at end of file
diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
index 1a7155beb1..160458b2f4 100644
--- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
@@ -66,17 +66,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../$(OS_TYPE)\$(VCVER)\libd\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../../win$(ARCH)\$(VCVER)\libd\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../$(OS_TYPE)\$(VCVER)\libd\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\$(OS_TYPE)\objd\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../../win$(ARCH)\$(VCVER)\libd\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\win$(ARCH)\objd\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../$(OS_TYPE)\$(VCVER)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../../win$(ARCH)\$(VCVER)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../$(OS_TYPE)\$(VCVER)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\$(OS_TYPE)\obj\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../../win$(ARCH)\$(VCVER)\lib\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\win$(ARCH)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -85,22 +85,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(CASROOT)\inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -112,11 +112,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>
       </ImportLibrary>
@@ -129,22 +129,22 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\objd/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\objd/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(CASROOT)\inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\objd/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\objd/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\objd/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\objd/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\objd/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\objd/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\objd/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -156,11 +156,11 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>
       </ImportLibrary>
@@ -173,24 +173,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(CASROOT)\inc;..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(CSF_OPT_INC);..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -201,10 +201,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>
       </ImportLibrary>
@@ -217,24 +217,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\$(OS_TYPE)\obj/mfcsample.tlb</TypeLibraryName>
+      <TypeLibraryName>.\win$(ARCH)\obj/mfcsample.tlb</TypeLibraryName>
       <HeaderFileName>
       </HeaderFileName>
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(CASROOT)\inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(CSF_OPT_INC);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\$(OS_TYPE)\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(OS_TYPE)\obj/</AssemblerListingLocation>
-      <ObjectFileName>.\$(OS_TYPE)\obj/</ObjectFileName>
-      <ProgramDataBaseFileName>.\$(OS_TYPE)\obj/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>.\win$(ARCH)\obj/mfcsample.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\win$(ARCH)\obj/</AssemblerListingLocation>
+      <ObjectFileName>.\win$(ARCH)\obj/</ObjectFileName>
+      <ProgramDataBaseFileName>.\win$(ARCH)\obj/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
@@ -247,10 +247,10 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV2d.lib;TKV3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll</OutputFile>
+      <OutputFile>../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb</ProgramDatabaseFile>
+      <AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>
       </ImportLibrary>
diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
index f1c9abc07e..be26ba8d67 100644
--- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\libd"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\libd"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -46,22 +46,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/mfcsample.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/mfcsample.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/mfcsample.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -81,12 +81,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb"
 				SubSystem="2"
 				ImportLibrary=""
 				TargetMachine="1"
@@ -118,8 +118,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\libd"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\libd"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -144,22 +144,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/mfcsample.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(CASROOT)\inc&quot;;..\..\..\..\Common"
+				AdditionalIncludeDirectories="&quot;$(CSF_OPT_INC)&quot;;..\..\..\..\Common"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/mfcsample.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/mfcsample.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -179,12 +179,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb"
 				SubSystem="2"
 				ImportLibrary=""
 				TargetMachine="17"
@@ -216,8 +216,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\lib"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\lib"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -242,24 +242,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/mfcsample.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/mfcsample.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/mfcsample.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -278,11 +278,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb"
 				SubSystem="2"
 				ImportLibrary=""
 				TargetMachine="1"
@@ -314,8 +314,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\lib"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\lib"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -340,24 +340,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/mfcsample.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/mfcsample.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/mfcsample.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -376,11 +376,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb"
 				SubSystem="2"
 				ImportLibrary=""
 				TargetMachine="17"
diff --git a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
index bf0c7ae4a5..973e20946c 100644
--- a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
+++ b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\libd"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\libd"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -47,22 +47,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\objd/mfcsample.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/mfcsample.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/mfcsample.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -82,12 +82,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -118,8 +118,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\libd"
-			IntermediateDirectory=".\$(OS_TYPE)\objd"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\libd"
+			IntermediateDirectory=".\win$(ARCH)\objd"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -144,22 +144,22 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\objd/mfcsample.tlb"
+				TypeLibraryName=".\win$(ARCH)\objd/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
 				PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;_AFXEXT;CSFDB;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\objd/mfcsample.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\objd/"
-				ObjectFile=".\$(OS_TYPE)\objd/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\objd/"
+				PrecompiledHeaderFile=".\win$(ARCH)\objd/mfcsample.pch"
+				AssemblerListingLocation=".\win$(ARCH)\objd/"
+				ObjectFile=".\win$(ARCH)\objd/"
+				ProgramDataBaseFileName=".\win$(ARCH)\objd/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -179,12 +179,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.dll"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\libd"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\libd/mfcsample.pdb"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\libd/mfcsample.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -215,8 +215,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\lib"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\lib"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -241,24 +241,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\$(OS_TYPE)\obj/mfcsample.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/mfcsample.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/mfcsample.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -277,11 +277,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -312,8 +312,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="../../../../$(OS_TYPE)\$(VCVER)\lib"
-			IntermediateDirectory=".\$(OS_TYPE)\obj"
+			OutputDirectory="../../../../win$(ARCH)\$(VCVER)\lib"
+			IntermediateDirectory=".\win$(ARCH)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="2"
@@ -338,24 +338,24 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\$(OS_TYPE)\obj/mfcsample.tlb"
+				TypeLibraryName=".\win$(ARCH)\obj/mfcsample.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CASROOT)\inc,..\..\..\..\Common"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC),..\..\..\..\Common"
 				PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;_AFXEXT;WNT;CSFDB;WINVER=0x0500"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\$(OS_TYPE)\obj/mfcsample.pch"
-				AssemblerListingLocation=".\$(OS_TYPE)\obj/"
-				ObjectFile=".\$(OS_TYPE)\obj/"
-				ProgramDataBaseFileName=".\$(OS_TYPE)\obj/"
+				PrecompiledHeaderFile=".\win$(ARCH)\obj/mfcsample.pch"
+				AssemblerListingLocation=".\win$(ARCH)\obj/"
+				ObjectFile=".\win$(ARCH)\obj/"
+				ProgramDataBaseFileName=".\win$(ARCH)\obj/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -374,11 +374,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKMesh.lib TKV2d.lib TKV3d.lib"
-				OutputFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.dll"
+				OutputFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\$(OS_TYPE)\$(VCVER)\lib"
-				ProgramDatabaseFile="../../../../$(OS_TYPE)\$(VCVER)\lib/mfcsample.pdb"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
+				ProgramDatabaseFile="../../../../win$(ARCH)\$(VCVER)\lib/mfcsample.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
diff --git a/samples/mfc/standard/msvc.bat b/samples/mfc/standard/msvc.bat
new file mode 100644
index 0000000000..7a4baac693
--- /dev/null
+++ b/samples/mfc/standard/msvc.bat
@@ -0,0 +1,4 @@
+call ../../../env.bat %1 %2 %3
+call %~dp0env.bat
+if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% All-%VCVER%.sln
+if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" All-%VCVER%.sln
\ No newline at end of file
diff --git a/samples/mfc/standard/readme.txt b/samples/mfc/standard/readme.txt
index a64d493019..ff49f0021f 100755
--- a/samples/mfc/standard/readme.txt
+++ b/samples/mfc/standard/readme.txt
@@ -28,7 +28,7 @@
     |				   needed in every OCC sample. >    
     |
     |
-    |-- env.bat       		This file is called from Run_MSVC.bat.
+    |-- env.bat       		This file is called from msvc.bat.
 
 				   
 2. Launching Open CASCADE Technology samples:
@@ -36,22 +36,22 @@
 
 To run the Open CASCADE Technology samples:
     
-   > execute Run.bat [vc8|vc9|vc10] [win32|win64] [Release|Debug] [SampleName]
+   > execute run.bat [vc8|vc9|vc10] [win32|win64] [Release|Debug] [SampleName]
 
 To run the Animation sample:
 
-   > execute Run.bat vc8 win32 Debug Animation
+   > execute run.bat vc8 win32 Debug Animation
 
 3. Modifying and rebuilding samples:
 --------------------------------------------
 
 You can modify, compile and launch all sample projects in MS Visual C++ at once:
   
-    > execute Run_MSVC.bat [vc8|vc9|vc10] [win32|win64] [Release|Debug]
+    > execute msvc.bat [vc8|vc9|vc10] [win32|win64] [Release|Debug]
 
 To run all sample projects in MS Visual C++ at once: 
     
-    > execute Run_MSVC.bat vc8 win32 Debug
+    > execute msvc.bat vc8 win32 Debug
 
 
 Note: make sure your PATH environment variable contains a directory, 
diff --git a/samples/mfc/standard/run.bat b/samples/mfc/standard/run.bat
new file mode 100644
index 0000000000..8e604df0b9
--- /dev/null
+++ b/samples/mfc/standard/run.bat
@@ -0,0 +1,23 @@
+echo %4
+if "%4" EQU "" (
+  echo Launch selected sample as follows: 
+  echo Run.bat [^vc8^|^vc9^|^vc10^] [^win32^|^win64^] [^Release^|^Debug^] [^SampleName^]
+  echo Use option -d to run Debug mode
+  EXIT /B
+)
+
+call ../../../env.bat %1 %2 %3
+call %~dp0env.bat
+
+IF NOT EXIST %BIN_DIR%\%4.exe goto ERR_EXE
+
+start %BIN_DIR%\%4.exe
+
+GOTO END
+
+:ERR_EXE
+ECHO Executable %BIN_DIR%\%~n1.exe not found."
+ECHO Probably you didn't compile the application.
+EXIT /B
+
+:END
diff --git a/samples/qt/IESample/IESample-vc10.sln b/samples/qt/IESample/IESample-vc10.sln
index 435a46503a..f358270ad7 100644
--- a/samples/qt/IESample/IESample-vc10.sln
+++ b/samples/qt/IESample/IESample-vc10.sln
@@ -1,4 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}"
 EndProject
 Global
diff --git a/samples/qt/IESample/IESample-vc8.sln b/samples/qt/IESample/IESample-vc8.sln
index 16c5b7517f..9c1504153f 100644
--- a/samples/qt/IESample/IESample-vc8.sln
+++ b/samples/qt/IESample/IESample-vc8.sln
@@ -1,4 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IESample", "IESample.vcproj", "{7FD0453F-8AC0-3EE3-9C11-DD413EF20A44}"
 EndProject
 Global
diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro
index 67dc66bda4..dc227f85a1 100644
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -6,8 +6,9 @@ TARGET = IESample
 HEADERS = src/*.h
 SOURCES = src/*.cxx
 
-INCLUDEPATH = $(CASROOT) $(CASROOT)/inc $(QTDIR)/include/QtCore \
-              $(QTDIR)/include/QtGui $(QTDIR)/include
+INCLUDES = $$(CSF_OPT_INC)
+PATHS = $$split(INCLUDES,";")
+for(path, PATHS):INCLUDEPATH += $${path}
 
 TS_FILES = ./src/Common-icon.ts \
            ./src/Common-string.ts \
@@ -42,110 +43,99 @@ win32 {
     CONFIG(debug, debug|release) {
 	DEFINES += _DEBUG
 	!contains(QMAKE_HOST.arch, x86_64) {
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
+		LIBS = -L$(CSF_OPT_LIB32D)
+		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
 		DESTDIR = ./win32/vc7/bind
 		OBJECTS_DIR = ./win32/vc7/objd
 		MOC_DIR = ./win32/vc7/srcd
-		LIBS = -L$(CASROOT)/win32/vc7/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win32/vc8/bind
 		OBJECTS_DIR = ./win32/vc8/objd
 		MOC_DIR = ./win32/vc8/srcd
-		LIBS = -L$(CASROOT)/win32/vc8/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win32/vc9/bind
 		OBJECTS_DIR = ./win32/vc9/objd
 		MOC_DIR = ./win32/vc9/srcd
-		LIBS = -L$(CASROOT)/win32/vc9/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win32/vc10/bind
 		OBJECTS_DIR = ./win32/vc10/objd
 		MOC_DIR = ./win32/vc10/srcd
-		LIBS = -L$(CASROOT)/win32/vc10/libd
 	    }
 	} else {
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
+		LIBS = -L$(CSF_OPT_LIB64D)
+		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win64/vc8/bind
 		OBJECTS_DIR = ./win64/vc8/objd
 		MOC_DIR = ./win64/vc8/srcd
-		LIBS = -L$(CASROOT)/win64/vc8/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win64/vc9/bind
 		OBJECTS_DIR = ./win64/vc9/objd
 		MOC_DIR = ./win64/vc9/srcd
-		LIBS = -L$(CASROOT)/win64/vc9/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win64/vc10/bind
 		OBJECTS_DIR = ./win64/vc10/objd
 		MOC_DIR = ./win64/vc10/srcd
-		LIBS = -L$(CASROOT)/win64/vc10/libd
 	    }
 	}
     } else {
 	DEFINES += NDEBUG
 	!contains(QMAKE_HOST.arch, x86_64) {
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
+		LIBS = -L$(CSF_OPT_LIB32)
+		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
 		DESTDIR = ./win32/vc7/bin
 		OBJECTS_DIR = ./win32/vc7/obj
 		MOC_DIR = ./win32/vc7/src
-		LIBS = -L$(CASROOT)/win32/vc7/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win32/vc8/bin
 		OBJECTS_DIR = ./win32/vc8/obj
 		MOC_DIR = ./win32/vc8/src
-		LIBS = -L$(CASROOT)/win32/vc8/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win32/vc9/bin
 		OBJECTS_DIR = ./win32/vc9/obj
 		MOC_DIR = ./win32/vc9/src
-		LIBS = -L$(CASROOT)/win32/vc9/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win32/vc10/bin
 		OBJECTS_DIR = ./win32/vc10/obj
 		MOC_DIR = ./win32/vc10/src
-		LIBS = -L$(CASROOT)/win32/vc10/lib
 	    }
 	} else {
-	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
+		LIBS = -L$(CSF_OPT_LIB64)
+		contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win64/vc8/bin
 		OBJECTS_DIR = ./win64/vc8/obj
 		MOC_DIR = ./win64/vc8/src
-		LIBS = -L$(CASROOT)/win64/vc8/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win64/vc9/bin
 		OBJECTS_DIR = ./win64/vc9/obj
 		MOC_DIR = ./win64/vc9/src
-		LIBS = -L$(CASROOT)/win64/vc9/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win64/vc10/bin
 		OBJECTS_DIR = ./win64/vc10/obj
 		MOC_DIR = ./win64/vc10/src
-		LIBS = -L$(CASROOT)/win64/vc10/lib
 	    }
 	}
     }
     DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }
 
-LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
-        -lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
-        -lTKSTEPBase -lTKShapeSchema -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
-        -lTKXSBase -lTKPShape -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
-        -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset \
-	-L$(QTDIR)/lib -lQtCore -lQtGui
+LIBS += TKernel.lib PTKernel.lib TKMath.lib TKService.lib TKV3d.lib TKV2d.lib \
+        TKBRep.lib TKIGES.lib TKSTL.lib TKVRML.lib TKSTEP.lib TKSTEPAttr.lib TKSTEP209.lib \
+        TKSTEPBase.lib TKShapeSchema.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib \
+        TKXSBase.lib TKPShape.lib TKShHealing.lib TKHLR.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib \
+        TKCDF.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib \
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
+lrelease.commands = lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
 lrelease.output = ./res/${QMAKE_FILE_BASE}.qm
 lrelease.input = TS_FILES
 lrelease.clean = ./res/${QMAKE_FILE_BASE}.qm
diff --git a/samples/qt/IESample/Run_MSVC.bat b/samples/qt/IESample/Run_MSVC.bat
deleted file mode 100755
index 4daacb50ef..0000000000
--- a/samples/qt/IESample/Run_MSVC.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-@echo off
-rem Launch MS VC with environment prepared for building OCCT qt tutorial
-
-rem Set build environment 
-
-call %~dp0env.bat
-
-call %~dp0..\..\..\ros\env_build.bat vc8 win32
-
-rem Define path to project file
-set PRJFILE=%~dp0IESample-vc8.sln
-
-rem Launch Visual Studio - either professional (devenv) or Express, as available
-if exist "%DevEnvDir%\devenv.exe"  (
-    start devenv.exe "%PRJFILE%" /useenv
-) else if exist "%DevEnvDir%\VCExpress.exe"  (
-    start VCExpress.exe "%PRJFILE%" /useenv
-) else (
-    echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-    echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
-)
-
-)
-
diff --git a/samples/qt/IESample/env.bat b/samples/qt/IESample/env.bat
index 77e99ff830..d42ee2c7ef 100755
--- a/samples/qt/IESample/env.bat
+++ b/samples/qt/IESample/env.bat
@@ -1,32 +1,3 @@
-@ECHO OFF
-
-call "%~dp0..\..\..\ros\env.bat"
-
-IF NOT DEFINED CASROOT GOTO ERR_CASROOT
-
-IF NOT EXIST "%CASROOT%\win32\vc8\bin\TKernel.dll" GOTO ERR_CASCADE
-
-SET CASLIBS=%CASROOT%\win32\vc8\bin
-
-SET ROOT=%CASROOT%\..
-
-set RES_DIR=%~dp0res
-set BIN_DIR=%~dp0win32\vc8\bin
+SET RES_DIR=%~dp0res
 SET CSF_ResourcesDefaults=%RES_DIR%
 SET CSF_IEResourcesDefaults=%RES_DIR%
-
-SET PATH=%CASLIBS%;%QTDIR%\bin;%PATH%
-
-GOTO END
-
-:ERR_CASROOT
-ECHO Environment variable "CASROOT" has not been defined. Abort.
-pause
-exit /B
-
-:ERR_CASCADE
-ECHO Environment variable "CASROOT" defined incorrectly. Abort.
-pause
-exit /B
-
-:END
diff --git a/samples/qt/IESample/generation-vc-projects.bat b/samples/qt/IESample/generation-vc-projects.bat
index 3bb98b3bdb..2d5385c168 100644
--- a/samples/qt/IESample/generation-vc-projects.bat
+++ b/samples/qt/IESample/generation-vc-projects.bat
@@ -3,17 +3,8 @@ REM Variable QTDIR and PATH to qmake executable must be defined without fail
 
 REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)
+REM third argument specifies Debug or Release mode
 
-call "%~dp0..\..\..\ros\env_build.bat" %1 %2
+call ..\..\..\env.bat %1 %2 %3
 
-IF NOT DEFINED QTDIR GOTO ERR_QTDIR
-
-SET PATH=%QTDIR%\bin;%PATH%
-
-qmake -tp vc -r Tutorial.pro
-
-GOTO END
-:ERR_QTDIR
-ECHO Environment variable "QTDIR" has not been defined. Abort.
-
-:END
+qmake -tp vc -r IESample.pro
diff --git a/samples/qt/IESample/msvc.bat b/samples/qt/IESample/msvc.bat
new file mode 100644
index 0000000000..075afd778f
--- /dev/null
+++ b/samples/qt/IESample/msvc.bat
@@ -0,0 +1,4 @@
+call ../../../env.bat %1 %2 %3
+call %~dp0env.bat
+if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% IESample-%VCVER%.sln
+if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" IESample-%VCVER%.sln
\ No newline at end of file
diff --git a/samples/qt/IESample/Run.bat b/samples/qt/IESample/run.bat
old mode 100755
new mode 100644
similarity index 56%
rename from samples/qt/IESample/Run.bat
rename to samples/qt/IESample/run.bat
index d06fa5541e..754c2eb145
--- a/samples/qt/IESample/Run.bat
+++ b/samples/qt/IESample/run.bat
@@ -1,19 +1,11 @@
-@echo off
+call ../../../env.bat %1 %2 %3
+call %~dp0env.bat
 
-call "%~dp0env.bat"
-
-if not exist win32\vc8\obj goto QTSET 
-
-if not exist "%QTDIR%" goto QTSET
-
-goto QT
-
-:QTSET
-
-set QTDIR=%ROOT%\3rdparty\win32\qt
-set PATH=%QTDIR%;%PATH%
-
-:QT
+IF not "%CASDEB%" EQU "" (
+SET BIN_DIR=win%ARCH%\%VCVER%\bind
+) ELSE (
+SET BIN_DIR=win%ARCH%\%VCVER%\bin
+)
 
 if not exist "%BIN_DIR%\IESample.exe" goto ERR_EXE
 
@@ -28,4 +20,4 @@ echo Probably you didn't compile the application.
 pause
 goto END
 
-:END
+:END
\ No newline at end of file
diff --git a/samples/qt/Tutorial/Run.bat b/samples/qt/Tutorial/Run.bat
deleted file mode 100755
index 41bcbc807b..0000000000
--- a/samples/qt/Tutorial/Run.bat
+++ /dev/null
@@ -1,35 +0,0 @@
-@ECHO OFF
-
-call "%~dp0env.bat"
-
-IF NOT EXIST win32\vc8\obj goto QTSET 
-
-IF NOT EXIST "%QTDIR%" goto QTSET
-
-goto QT
-
-:QTSET
-
-SET QTDIR=%ROOT%\3rdparty\win32\qt
-SET PATH=%QTDIR%;%PATH%
-
-:QT
-
-if not exist "%BIN_DIR%\Tutorial.exe" goto ERR_EXE
-
-echo %QTDIR%
-echo Starting IESample .....
-start /D "%BIN_DIR%" Tutorial.exe
-
-
-
-GOTO END
-
-:ERR_EXE
-ECHO Executable %BIN_DIR%\Tutorial.exe not found."
-ECHO Probably you didn't compile the application.
-pause
-GOTO END
-
-:END
-
diff --git a/samples/qt/Tutorial/Run_MSVC.bat b/samples/qt/Tutorial/Run_MSVC.bat
deleted file mode 100755
index 42e5a0099e..0000000000
--- a/samples/qt/Tutorial/Run_MSVC.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-@echo off
-rem Launch MS VC with environment prepared for building OCCT qt tutorial
-
-rem Set build environment 
-
-call %~dp0env.bat
-
-call %~dp0..\..\..\ros\env_build.bat vc8 win32
-
-rem Define path to project file
-set PRJFILE=%~dp0Tutorial-vc8.sln
-
-rem Launch Visual Studio - either professional (devenv) or Express, as available
-if exist "%DevEnvDir%\devenv.exe"  (
-    start devenv.exe "%PRJFILE%" /useenv
-) else if exist "%DevEnvDir%\VCExpress.exe"  (
-    start VCExpress.exe "%PRJFILE%" /useenv
-) else (
-    echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-    echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
-)
-
-
diff --git a/samples/qt/Tutorial/Tutorial-vc10.sln b/samples/qt/Tutorial/Tutorial-vc10.sln
index 70099ec9ad..ba41beef9b 100644
--- a/samples/qt/Tutorial/Tutorial-vc10.sln
+++ b/samples/qt/Tutorial/Tutorial-vc10.sln
@@ -1,4 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcproj", "{59DEDC8A-A5ED-31E8-8F2B-8D996E3A41D6}"
 EndProject
 Global
diff --git a/samples/qt/Tutorial/Tutorial-vc8.sln b/samples/qt/Tutorial/Tutorial-vc8.sln
index 0f4e2bf9ef..efd0859e9a 100644
--- a/samples/qt/Tutorial/Tutorial-vc8.sln
+++ b/samples/qt/Tutorial/Tutorial-vc8.sln
@@ -1,4 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcproj", "{59DEDC8A-A5ED-31E8-8F2B-8D996E3A41D6}"
 EndProject
 Global
diff --git a/samples/qt/Tutorial/Tutorial-vc9.sln b/samples/qt/Tutorial/Tutorial-vc9.sln
index 6acedaf9d7..f1ef1ba3ef 100644
--- a/samples/qt/Tutorial/Tutorial-vc9.sln
+++ b/samples/qt/Tutorial/Tutorial-vc9.sln
@@ -1,4 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcproj", "{59DEDC8A-A5ED-31E8-8F2B-8D996E3A41D6}"
 EndProject
 Global
diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro
index 4ca59ea83a..92c5ce172c 100755
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -6,8 +6,9 @@ TARGET = Tutorial
 HEADERS = src/*.h
 SOURCES = src/*.cxx
 
-INCLUDEPATH = $(CASROOT) $(CASROOT)/inc $(CASROOT)/src/WOKTclLib $(QTDIR)/include/QtCore \
-              $(QTDIR)/include/QtGui $(QTDIR)/include
+INCLUDES = $$(CSF_OPT_INC)
+PATHS = $$split(INCLUDES,";")
+for(path, PATHS):INCLUDEPATH += $${path}
 
 TS_FILES = ./src/Common-icon.ts \
            ./src/Common-string.ts \
@@ -43,110 +44,99 @@ win32 {
     CONFIG(debug, debug|release) {
 	DEFINES += _DEBUG
 	!contains(QMAKE_HOST.arch, x86_64) {
+		LIBS = -L$(CSF_OPT_LIB32D)
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
 		DESTDIR = ./win32/vc7/bind
 		OBJECTS_DIR = ./win32/vc7/objd
 		MOC_DIR = ./win32/vc7/srcd
-		LIBS = -L$(CASROOT)/win32/vc7/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win32/vc8/bind
 		OBJECTS_DIR = ./win32/vc8/objd
 		MOC_DIR = ./win32/vc8/srcd
-		LIBS = -L$(CASROOT)/win32/vc8/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win32/vc9/bind
 		OBJECTS_DIR = ./win32/vc9/objd
 		MOC_DIR = ./win32/vc9/srcd
-		LIBS = -L$(CASROOT)/win32/vc9/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win32/vc10/bind
 		OBJECTS_DIR = ./win32/vc10/objd
 		MOC_DIR = ./win32/vc10/srcd
-		LIBS = -L$(CASROOT)/win32/vc10/libd
 	    }
 	} else {
+		LIBS = -L$(CSF_OPT_LIB64D)
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win64/vc8/bind
 		OBJECTS_DIR = ./win64/vc8/objd
 		MOC_DIR = ./win64/vc8/srcd
-		LIBS = -L$(CASROOT)/win64/vc8/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win64/vc9/bind
 		OBJECTS_DIR = ./win64/vc9/objd
 		MOC_DIR = ./win64/vc9/srcd
-		LIBS = -L$(CASROOT)/win64/vc9/libd
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win64/vc10/bind
 		OBJECTS_DIR = ./win64/vc10/objd
 		MOC_DIR = ./win64/vc10/srcd
-		LIBS = -L$(CASROOT)/win64/vc10/libd
 	    }
 	}
     } else {
 	DEFINES += NDEBUG
 	!contains(QMAKE_HOST.arch, x86_64) {
+		LIBS = -L$(CSF_OPT_LIB32)
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
 		DESTDIR = ./win32/vc7/bin
 		OBJECTS_DIR = ./win32/vc7/obj
 		MOC_DIR = ./win32/vc7/src
-		LIBS = -L$(CASROOT)/win32/vc7/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win32/vc8/bin
 		OBJECTS_DIR = ./win32/vc8/obj
 		MOC_DIR = ./win32/vc8/src
-		LIBS = -L$(CASROOT)/win32/vc8/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win32/vc9/bin
 		OBJECTS_DIR = ./win32/vc9/obj
 		MOC_DIR = ./win32/vc9/src
-		LIBS = -L$(CASROOT)/win32/vc9/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win32/vc10/bin
 		OBJECTS_DIR = ./win32/vc10/obj
 		MOC_DIR = ./win32/vc10/src
-		LIBS = -L$(CASROOT)/win32/vc10/lib
 	    }
 	} else {
+		LIBS = -L$(CSF_OPT_LIB64)
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
 		DESTDIR = ./win64/vc8/bin
 		OBJECTS_DIR = ./win64/vc8/obj
 		MOC_DIR = ./win64/vc8/src
-		LIBS = -L$(CASROOT)/win64/vc8/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
 		DESTDIR = ./win64/vc9/bin
 		OBJECTS_DIR = ./win64/vc9/obj
 		MOC_DIR = ./win64/vc9/src
-		LIBS = -L$(CASROOT)/win64/vc9/lib
 	    }
 	    contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
 		DESTDIR = ./win64/vc10/bin
 		OBJECTS_DIR = ./win64/vc10/obj
 		MOC_DIR = ./win64/vc10/src
-		LIBS = -L$(CASROOT)/win64/vc10/lib
 	    }
 	}
     }
     DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }
 
-LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
-        -lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
-        -lTKSTEPBase -lTKShapeSchema -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
-        -lTKXSBase -lTKPShape -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
-        -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset \
-	-L$(QTDIR)/lib -lQtCore -lQtGui
+LIBS += TKernel.lib PTKernel.lib TKMath.lib TKService.lib TKV3d.lib TKV2d.lib \
+        TKBRep.lib TKIGES.lib TKSTL.lib TKVRML.lib TKSTEP.lib TKSTEPAttr.lib TKSTEP209.lib \
+        TKSTEPBase.lib TKShapeSchema.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib \
+        TKXSBase.lib TKPShape.lib TKShHealing.lib TKHLR.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib \
+        TKCDF.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib \
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
+lrelease.commands = lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
 lrelease.output = ./res/${QMAKE_FILE_BASE}.qm
 lrelease.input = TS_FILES
 lrelease.clean = ./res/${QMAKE_FILE_BASE}.qm
diff --git a/samples/qt/Tutorial/env.bat b/samples/qt/Tutorial/env.bat
index 5b152a9b56..d42ee2c7ef 100755
--- a/samples/qt/Tutorial/env.bat
+++ b/samples/qt/Tutorial/env.bat
@@ -1,33 +1,3 @@
-@ECHO OFF
-
-call "%~dp0..\..\..\ros\env.bat"
-
-IF NOT DEFINED CASROOT GOTO ERR_CASROOT
-
-IF NOT EXIST "%CASROOT%\win32\vc8\bin\TKernel.dll" GOTO ERR_CASCADE
-
-SET CASLIBS=%CASROOT%\win32\vc8\bin
-
-SET ROOT=%CASROOT%\..
-
-set RES_DIR=%~dp0res
-set BIN_DIR=%~dp0win32\vc8\bin
-
+SET RES_DIR=%~dp0res
 SET CSF_ResourcesDefaults=%RES_DIR%
-SET CSF_TuturialResourcesDefaults=%RES_DIR%
-
-SET PATH=%CASLIBS%;%QTDIR%\bin;%PATH%
-
-GOTO END
-
-:ERR_CASROOT
-ECHO Environment variable "CASROOT" has not been defined. Abort.
-pause
-exit /B
-
-:ERR_CASCADE
-ECHO Environment variable "CASROOT" defined incorrectly. Abort.
-pause
-exit /B
-
-:END
+SET CSF_IEResourcesDefaults=%RES_DIR%
diff --git a/samples/qt/Tutorial/generation-vc-projects.bat b/samples/qt/Tutorial/generation-vc-projects.bat
index 3bb98b3bdb..b306354459 100644
--- a/samples/qt/Tutorial/generation-vc-projects.bat
+++ b/samples/qt/Tutorial/generation-vc-projects.bat
@@ -3,17 +3,8 @@ REM Variable QTDIR and PATH to qmake executable must be defined without fail
 
 REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
 REM second argument specifies architecture) (win32 or win64)
+REM third argument specifies Debug or Release mode
 
-call "%~dp0..\..\..\ros\env_build.bat" %1 %2
-
-IF NOT DEFINED QTDIR GOTO ERR_QTDIR
-
-SET PATH=%QTDIR%\bin;%PATH%
+call ..\..\..\env.bat %1 %2 %3
 
 qmake -tp vc -r Tutorial.pro
-
-GOTO END
-:ERR_QTDIR
-ECHO Environment variable "QTDIR" has not been defined. Abort.
-
-:END
diff --git a/samples/qt/Tutorial/msvc.bat b/samples/qt/Tutorial/msvc.bat
new file mode 100644
index 0000000000..d67dfad306
--- /dev/null
+++ b/samples/qt/Tutorial/msvc.bat
@@ -0,0 +1,4 @@
+call ../../../env.bat %1 %2 %3
+call %~dp0env.bat
+if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% Tutorial-%VCVER%.sln
+if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" Tutorial-%VCVER%.sln
\ No newline at end of file
diff --git a/samples/qt/Tutorial/run.bat b/samples/qt/Tutorial/run.bat
new file mode 100644
index 0000000000..77e423a187
--- /dev/null
+++ b/samples/qt/Tutorial/run.bat
@@ -0,0 +1,23 @@
+call ../../../env.bat %1 %2 %3
+call %~dp0env.bat
+
+IF not "%CASDEB%" EQU "" (
+SET BIN_DIR=win%ARCH%\%VCVER%\bind
+) ELSE (
+SET BIN_DIR=win%ARCH%\%VCVER%\bin
+)
+
+if not exist "%BIN_DIR%\Tutorial.exe" goto ERR_EXE
+
+echo Starting Tutorial .....
+start /D "%BIN_DIR%" Tutorial.exe
+
+goto END
+
+:ERR_EXE
+echo Executable %BIN_DIR%\Tutorial.exe not found."
+echo Probably you didn't compile the application.
+pause
+goto END
+
+:END
\ No newline at end of file
diff --git a/samples/qt/Tutorial/src/MakeBottle.cxx b/samples/qt/Tutorial/src/MakeBottle.cxx
index 1542d286a0..ebe45b9f01 100755
--- a/samples/qt/Tutorial/src/MakeBottle.cxx
+++ b/samples/qt/Tutorial/src/MakeBottle.cxx
@@ -166,21 +166,21 @@ MakeBottle(const Standard_Real myWidth , const Standard_Real myHeight ,
 	Handle(Geom_CylindricalSurface) aCyl2 = new Geom_CylindricalSurface(neckAx2 , myNeckRadius * 1.05);
 
 	//Threading : Define 2D Curves
-	gp_Pnt2d aPnt(2. * PI , myNeckHeight / 2.);
-  gp_Dir2d aDir(2. * PI , myNeckHeight / 4.);
+	gp_Pnt2d aPnt(2. * M_PI , myNeckHeight / 2.);
+  gp_Dir2d aDir(2. * M_PI , myNeckHeight / 4.);
   gp_Ax2d aAx2d(aPnt , aDir);
 
-	Standard_Real aMajor = 2. * PI;
+	Standard_Real aMajor = 2. * M_PI;
   Standard_Real aMinor = myNeckHeight / 10;
 
   Handle(Geom2d_Ellipse) anEllipse1 = new Geom2d_Ellipse(aAx2d , aMajor , aMinor);
   Handle(Geom2d_Ellipse) anEllipse2 = new Geom2d_Ellipse(aAx2d , aMajor , aMinor / 4);
 
-	Handle(Geom2d_TrimmedCurve) aArc1 = new Geom2d_TrimmedCurve(anEllipse1 , 0 , PI);
-	Handle(Geom2d_TrimmedCurve) aArc2 = new Geom2d_TrimmedCurve(anEllipse2 , 0 , PI);
+	Handle(Geom2d_TrimmedCurve) aArc1 = new Geom2d_TrimmedCurve(anEllipse1 , 0 , M_PI);
+	Handle(Geom2d_TrimmedCurve) aArc2 = new Geom2d_TrimmedCurve(anEllipse2 , 0 , M_PI);
 
 	gp_Pnt2d anEllipsePnt1 = anEllipse1->Value(0);
-	gp_Pnt2d anEllipsePnt2 = anEllipse1->Value(PI);
+	gp_Pnt2d anEllipsePnt2 = anEllipse1->Value(M_PI);
 	
 	Handle(Geom2d_TrimmedCurve) aSegment = GCE2d_MakeSegment(anEllipsePnt1 , anEllipsePnt2);
 
diff --git a/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj b/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj
index a408fe2c8a..7bda01bb53 100755
--- a/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj
+++ b/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="OpenGl"
 	ProjectGUID="{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}"
+	RootNamespace="OpenGl"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -47,7 +49,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CASROOT)\inc,$(CASROOT)\drv\OpenGl"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENGL_EXPORTS;WNT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -73,13 +75,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib TKernel.lib TKMath.lib TKGeomBase.lib TKV3d.lib TKService.lib TKG3d.lib TKVoxel.lib vfw32.lib odbc32.lib odbccp32.lib gl2ps.lib ftgl_dynamic_MTD_vc8.lib"
+				AdditionalDependencies="opengl32.lib glu32.lib TKernel.lib TKMath.lib TKGeomBase.lib TKV3d.lib TKService.lib TKG3d.lib TKVoxel.lib vfw32.lib odbc32.lib odbccp32.lib gl2ps.lib ftgl_dynamic_MTD.lib"
 				OutputFile="Debug/VoxelOpenGl.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\libd"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/VoxelOpenGl.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary=".\Debug/VoxelOpenGl.lib"
 				TargetMachine="1"
 			/>
@@ -103,9 +107,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -145,7 +146,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CASROOT)\inc,$(CASROOT)\drv\OpenGl"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OPENGL_EXPORTS;WNT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -174,8 +175,10 @@
 				OutputFile="Release/VoxelOpenGl.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\lib"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
 				ProgramDatabaseFile=".\Release/VoxelOpenGl.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary=".\Release/VoxelOpenGl.lib"
 				TargetMachine="1"
 			/>
@@ -199,9 +202,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -215,103 +215,115 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_addnames.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\glext.h"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_antialias.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Context.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_applid.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Display.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_attri.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_GraduatedTrihedron.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_AVIWriter.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_GraphicDriver.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_bintcol.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Trihedron.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_bintrefl.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_View.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_bsurfprop.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Window.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_charexpan.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Workspace.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_charspace.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ArbVBO.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_curve.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectFace.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_degmodel.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectFace.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_depthcue.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectLine.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_dind.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectLine.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_dotexturemap.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectMarker.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_edgecol.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectMarker.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_edgeflag.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectText.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_edgetyp.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectText.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_edgewid.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AVIWriter.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_execstruct.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Context.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_Extension.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_CView.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_facecull.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Display.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_facedmode.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Display.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_filters.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Display_1.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_FontMgr.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Display_2.cxx"
+				>
+			</File>
+			<File
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Element.hxx"
+				>
+			</File>
+			<File
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ExtFBO.hxx"
+				>
+			</File>
+			<File
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_FontMgr.cxx"
 				>
 			</File>
 			<File
@@ -319,219 +331,175 @@
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_funcs.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_FrameBuffer.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_graduatedtrihedron.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore11.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore12.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_1.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore13.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_2.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore14.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_3.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore15.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_4.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore20.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_5.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraduatedTrihedron.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_6.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_7.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_703.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_1.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_705.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_2.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_707.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_3.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_709.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_4.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_710.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_7.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_711.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_703.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_712.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_705.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_713.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_710.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_8.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_713.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_9.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_8.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_Export.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_9.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_Layer.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_Export.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_GraphicDriver_print.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_Layer.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_highlight.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_print.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_hlind.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Group.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_ImageBox.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Group.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_indexpolygons.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ImageBox.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_initelem.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_LayerList.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_inquire.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_LayerList.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_intcol.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Light.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_intrefl.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Marker.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_intshademtd.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Marker.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_intstyle.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_MarkerSet.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_intstyleind.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_MarkerSet.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_label.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Matrix.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_LightBox.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Matrix.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_lightstate.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_NamedStatus.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_localtran3.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Polygon.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_Memory.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Polygon.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_mrkr.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Polyline.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_mrkrcol.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Polyline.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_mrkrset.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PrimitiveArray.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_mrkrsize.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_mrkrtype.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_pick.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_pickid.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_polygon.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_polygonholes.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_polygonoffset.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_polyl.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_polylcol.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_polyltyp.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_polylwid.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_PrimitiveArray.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PrimitiveArray.hxx"
 				>
 			</File>
 			<File
@@ -539,11 +507,19 @@
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_qstrip.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PriorityList.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_remnames.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PriorityList.hxx"
+				>
+			</File>
+			<File
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Resource.cxx"
+				>
+			</File>
+			<File
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Resource.hxx"
 				>
 			</File>
 			<File
@@ -559,459 +535,95 @@
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_subrs.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Structure.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_subrvis.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Structure.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_surfprop.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_telem_util.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem_util.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_telem_view.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_text.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Text.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textalignment.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Text.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textangle.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_TextParam.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textcol.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_TextureBox.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textcolsubtitle.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Trihedron.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textdisplaytype.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Trihedron.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textfont.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_View.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textfontaspect.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_View.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textheight.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_View_1.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_TextRender.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_View_2.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textstyle.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Window.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_texture.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Window.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_TextureBox.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_textzoomable.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace.hxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_util.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_1.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_utilgr.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_2.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tmesh.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_3.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_activateview.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_4.cxx"
 				>
 			</File>
 			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_antialiasing.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_backfacing.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_background.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_begin.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_begin_animation.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_begin_immediat_mode.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_begin_layer_mode.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_bezier.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_bezier_weight.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_blink.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_boundarybox.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_cleargroup.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_clearstructure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_cliplimit.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_closegroup.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_connect.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_contextstructure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_curve.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_deactivateview.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_degeneratestructure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_depthcueing.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_depthtest.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_disconnect.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_displaystructure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_element_exploration.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_end.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_erasestructure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_facecontextgroup.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_gradient_background.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_togl_graduatedtrihedron.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_group.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_highlightcolor.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_init_pick.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_inquirefacilities.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_inquirelight.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_inquireplane.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_inquireview.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_light.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_light_exploration.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_linecontextgroup.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_marker.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_marker_set.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_markercontextgroup.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_namesetstructure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_opengroup.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_parray.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_pick.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_pickid.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_plane.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_polygon.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_polygon_holes.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_polygon_indices.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_polygon_set.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_polyline.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_print.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_project_raster.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_quadrangle.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_ratio_window.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_redraw.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_removegroup.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_removestructure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_removeview.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_set_environment.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_setlight.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_setplane.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_setvisualisation.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_structure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_structure_exploration.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_text.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_textcontextgroup.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_texture.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_transformstructure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_transparency.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_triangle.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_triedron.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_unproject_raster.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_update.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_userdraw.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_view.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_view_exploration.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_viewmapping.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_togl_vieworientation.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tox.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_transform_persistence.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_triedron.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tsm.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_txgl.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_undefined.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_userdraw.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_view.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_vind.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_ws.cxx"
+				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_5.cxx"
 				>
 			</File>
 			<File
@@ -1019,203 +631,7 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_animation.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_AVIWriter.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_callback.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_cmn_varargs.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_context.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_degeneration.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_Extension.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_FontMgr.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_graduatedtrihedron.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_ImageBox.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_inquire.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_LightBox.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_Memory.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PrinterContext.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ResourceCleaner.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ResourceTexture.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ResourceVBO.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem_attri.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem_depthcue.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem_filters.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem_highlight.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem_inquire.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem_pick.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem_util.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_telem_view.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_TextRender.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_TextureBox.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_all.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_elems.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_funcs.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_pick.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_subrs.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_subrvis.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_tox.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_util.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_utilgr.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tgl_vis.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_traces.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_transform_persistence.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_triangulate.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_triedron.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_trsf_stack.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tsm.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_tsm_ws.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\opengl\OpenGl_txgl.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\voxelclient\VoxelClient_VisDrawer.h"
-				>
-			</File>
-		</Filter>
+		
 		<Filter
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
diff --git a/samples/qt/voxeldemo/Run.bat b/samples/qt/voxeldemo/Run.bat
deleted file mode 100755
index 5ff6e2da70..0000000000
--- a/samples/qt/voxeldemo/Run.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@ECHO OFF
-
-call %~dp0env.bat
-
-@echo Starting VoxelDemo .....
-start .\%BIN_DIR%\VoxelDemo.exe
diff --git a/samples/qt/voxeldemo/Run_MSVC.bat b/samples/qt/voxeldemo/Run_MSVC.bat
deleted file mode 100755
index efd6c18fb9..0000000000
--- a/samples/qt/voxeldemo/Run_MSVC.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@echo off
-rem Launch MS VC with environment prepared for building OCCT qt Voxel demo
-
-rem Set build environment 
-
-call %~dp0..\..\..\ros\env_build.bat vc8 win32
-
-
-SET BIN_DIR=Release
-SET CSF_GraphicShr=OpenGl\Release\VoxelOpenGl.dll
-
-SET PATH=OpenGl\Release;%QTDIR%\bin;%QTDIR%;%PATH%
-
-SET CSF_TEX_FONT=2
-SET MMGT_REENTRANT=1
-
-
-rem Define path to project file
-set PRJFILE=%~dp0VoxelDemo.sln
-
-rem Launch Visual Studio - either professional (devenv) or Express, as available
-if exist "%DevEnvDir%\devenv.exe" (
-    start devenv.exe "%PRJFILE%" /useenv
-) else if exist "%DevEnvDir%\VCExpress.exe"  (
-    start VCExpress.exe "%PRJFILE%" /useenv
-) else (
-    echo Error: Could not find MS Visual Studio ^(%VCVER%^)
-    echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
-)
-
diff --git a/samples/qt/voxeldemo/VoxelDemo-vc9.sln b/samples/qt/voxeldemo/VoxelDemo-vc9.sln
new file mode 100644
index 0000000000..c9e690cf94
--- /dev/null
+++ b/samples/qt/voxeldemo/VoxelDemo-vc9.sln
@@ -0,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGl", "OpenGl\OpenGl.vcproj", "{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5} = {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.Build.0 = Debug|Win32
+		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.ActiveCfg = Release|Win32
+		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.Build.0 = Release|Win32
+		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.Build.0 = Debug|Win32
+		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.ActiveCfg = Release|Win32
+		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/samples/qt/voxeldemo/VoxelDemo.vcproj b/samples/qt/voxeldemo/VoxelDemo.vcproj
index ac6c4c5810..a5ffc00c1a 100755
--- a/samples/qt/voxeldemo/VoxelDemo.vcproj
+++ b/samples/qt/voxeldemo/VoxelDemo.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="VoxelDemo"
 	ProjectGUID="{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -44,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\inc,$(QTDIR)\include,$(QTDIR)\include\QtCore,$(QTDIR)\include\QtGui,$(CASROOT)\inc"
+				AdditionalIncludeDirectories=".\inc,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WNT;QT_THREAD_SUPPORT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -73,9 +74,11 @@
 				OutputFile=".\Release/VoxelDemo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\lib,$(QTDIR)\lib"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
 				ProgramDatabaseFile=".\Release/VoxelDemo.pdb"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -98,9 +101,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\inc,$(CASROOT)\inc,$(QTDIR)\include,$(QTDIR)\include\QtCore,$(QTDIR)\include\QtGui"
+				AdditionalIncludeDirectories=".\inc,$(CSF_OPT_INC)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WNT;QT_THREAD_SUPPORT;TEST"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -165,11 +165,13 @@
 				OutputFile=".\Debug/VoxelDemo.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CASROOT)\win32\vc8\libd,$(QTDIR)\lib"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
 				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/VoxelDemo.pdb"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -192,9 +194,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -331,7 +330,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="$(QTDIR)\bin\moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
 						Outputs=".\moc\moc_$(InputName).cxx"
 					/>
 				</FileConfiguration>
@@ -341,7 +340,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="$(QTDIR)\bin\moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
 						Outputs="moc\moc_$(InputName).cxx"
 					/>
 				</FileConfiguration>
@@ -363,7 +362,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="$(QTDIR)\bin\moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
 						Outputs=".\moc\moc_$(InputName).cxx"
 					/>
 				</FileConfiguration>
@@ -373,7 +372,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="$(QTDIR)\bin\moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
+						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
 						Outputs=".\moc\moc_$(InputName).cxx"
 					/>
 				</FileConfiguration>
diff --git a/samples/qt/voxeldemo/env.bat b/samples/qt/voxeldemo/env.bat
index 278519a09c..b07d52967e 100755
--- a/samples/qt/voxeldemo/env.bat
+++ b/samples/qt/voxeldemo/env.bat
@@ -1,11 +1,16 @@
 @ECHO OFF
 
-call %~dp0..\..\..\ros\env.bat
-
+IF not "%CASDEB%" EQU "" (
+SET BIN_DIR=Debug
+) ELSE (
 SET BIN_DIR=Release
-SET CSF_GraphicShr=OpenGl\Release\VoxelOpenGl.dll
+)
 
-SET PATH=OpenGl\Release;%QTDIR%\bin;%QTDIR%;%PATH%
+SET PATH=%~dp0%BIN_DIR%;%PATH%
+
+SET CSF_GraphicShr=OpenGl\%BIN_DIR%\VoxelOpenGl.dll
+
+SET PATH=%~dp0OpenGl\%BIN_DIR%;%PATH%
 
 SET CSF_TEX_FONT=2
 SET MMGT_REENTRANT=1
diff --git a/samples/qt/voxeldemo/msvc.bat b/samples/qt/voxeldemo/msvc.bat
new file mode 100644
index 0000000000..f0e56be8cd
--- /dev/null
+++ b/samples/qt/voxeldemo/msvc.bat
@@ -0,0 +1,4 @@
+call ../../../env.bat %1 %2 %3
+call %~dp0env.bat
+if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% VoxelDemo-%VCVER%.sln
+if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" VoxelDemo-%VCVER%.sln
\ No newline at end of file
diff --git a/samples/qt/voxeldemo/run.bat b/samples/qt/voxeldemo/run.bat
new file mode 100644
index 0000000000..d6571cce86
--- /dev/null
+++ b/samples/qt/voxeldemo/run.bat
@@ -0,0 +1,18 @@
+call ../../../env.bat %1 %2 %3
+
+call %~dp0env.bat
+
+if not exist "%BIN_DIR%\VoxelDemo.exe" goto ERR_EXE
+
+echo Starting VoxelDemo .....
+start /D "%BIN_DIR%" VoxelDemo.exe
+
+goto END
+
+:ERR_EXE
+echo Executable %BIN_DIR%\VoxelDemo.exe not found."
+echo Probably you didn't compile the application.
+pause
+goto END
+
+:END
\ No newline at end of file
diff --git a/samples/qt/voxeldemo/src/Application.cpp b/samples/qt/voxeldemo/src/Application.cpp
index 25fffb2f98..c4379b042f 100755
--- a/samples/qt/voxeldemo/src/Application.cpp
+++ b/samples/qt/voxeldemo/src/Application.cpp
@@ -1810,7 +1810,7 @@ void Application::displayWaves()
             di *= -1;
             i += di;
         }
-        double rad = -PI / 2.0 + double(i) / (double) nbx * PI;
+        double rad = -M_PI / 2.0 + double(i) / (double) nbx * M_PI;
         double c = cos(rad);
         xvalues[ix] = 15.0 * c;
         if (xvalues[ix] == 0)