diff --git a/unit/unit.vcxproj b/unit/unit.vcxproj
index d32a2b9e..aac48f08 100644
--- a/unit/unit.vcxproj
+++ b/unit/unit.vcxproj
@@ -35,6 +35,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -114,7 +115,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(DEV_CPPUNIT_VS2010)/include;../src;../src/phreeqcpp;../src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(DEV_CPPUNIT_VS2010)/include;../src;../src/phreeqcpp;../src/phreeqcpp/common;../src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CPPUNIT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -168,19 +169,26 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(DEV_CPPUNIT_VS2010)/include;../src;../src/phreeqcpp;../src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(DEV_CPPUNIT_VS2010)/include;../src;../src/phreeqcpp;../src/phreeqcpp/common;../src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>CPPUNIT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(DEV_CPPUNIT_VS2010)/libx64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\CSelectedOutput.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\common\Parser.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\common\PHRQ_base.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\common\PHRQ_io.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\common\Utils.cxx" />
+    <ClCompile Include="..\src\phreeqcpp\Dictionary.cpp" />
     <ClCompile Include="..\src\phreeqcpp\PhreeqcKeywords\Keywords.cpp" />
     <ClCompile Include="..\src\phreeqcpp\SelectedOutput.cpp" />
     <ClCompile Include="..\src\phreeqcpp\UserPunch.cpp" />
@@ -239,11 +247,8 @@
     <ClCompile Include="..\src\phreeqcpp\KineticsComp.cxx" />
     <ClCompile Include="..\src\phreeqcpp\NameDouble.cxx" />
     <ClCompile Include="..\src\phreeqcpp\NumKeyword.cxx" />
-    <ClCompile Include="..\src\phreeqcpp\Parser.cxx" />
     <ClCompile Include="..\src\phreeqcpp\PBasic.cpp" />
     <ClCompile Include="..\src\phreeqcpp\Phreeqc.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\PHRQ_base.cxx" />
-    <ClCompile Include="..\src\phreeqcpp\PHRQ_io.cpp" />
     <ClCompile Include="..\src\phreeqcpp\PPassemblage.cxx" />
     <ClCompile Include="..\src\phreeqcpp\PPassemblageComp.cxx" />
     <ClCompile Include="..\src\phreeqcpp\Pressure.cxx" />
@@ -263,7 +268,6 @@
     <ClCompile Include="..\src\phreeqcpp\System.cxx" />
     <ClCompile Include="..\src\phreeqcpp\Temperature.cxx" />
     <ClCompile Include="..\src\phreeqcpp\Use.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\Utils.cxx" />
     <ClCompile Include="..\src\phreeqcpp\advection.cpp" />
     <ClCompile Include="..\src\phreeqcpp\basicsubs.cpp" />
     <ClCompile Include="..\src\phreeqcpp\cl1.cpp" />
@@ -276,7 +280,6 @@
     <ClCompile Include="..\src\phreeqcpp\cvdense.cpp" />
     <ClCompile Include="..\src\phreeqcpp\cvode.cpp" />
     <ClCompile Include="..\src\phreeqcpp\dense.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\dw.cpp" />
     <ClCompile Include="..\src\phreeqcpp\gases.cpp" />
     <ClCompile Include="..\src\phreeqcpp\input.cpp" />
     <ClCompile Include="..\src\phreeqcpp\integrate.cpp" />
diff --git a/unit/unit.vcxproj.filters b/unit/unit.vcxproj.filters
index a7d4679e..adb3ac37 100644
--- a/unit/unit.vcxproj.filters
+++ b/unit/unit.vcxproj.filters
@@ -19,6 +19,9 @@
       <UniqueIdentifier>{669fe4ce-b3a3-4cf3-9041-941eea1eff9b}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
+    <Filter Include="Source Files\src\phreeqcpp\common">
+      <UniqueIdentifier>{1d4c4b49-5315-439b-afa0-4a52b432661e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="TestCVar.cpp">
@@ -87,21 +90,12 @@
     <ClCompile Include="..\src\phreeqcpp\NumKeyword.cxx">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\Parser.cxx">
-      <Filter>Source Files\src\phreeqcpp</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\PBasic.cpp">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\Phreeqc.cpp">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\PHRQ_base.cxx">
-      <Filter>Source Files\src\phreeqcpp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\PHRQ_io.cpp">
-      <Filter>Source Files\src\phreeqcpp</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\PPassemblage.cxx">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
@@ -159,9 +153,6 @@
     <ClCompile Include="..\src\phreeqcpp\Use.cpp">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\Utils.cxx">
-      <Filter>Source Files\src\phreeqcpp</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\CSelectedOutput.cpp">
       <Filter>Source Files\src</Filter>
     </ClCompile>
@@ -189,9 +180,6 @@
     <ClCompile Include="..\src\phreeqcpp\dense.cpp">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\dw.cpp">
-      <Filter>Source Files\src\phreeqcpp</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\gases.cpp">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
@@ -288,6 +276,21 @@
     <ClCompile Include="..\src\phreeqcpp\PhreeqcKeywords\Keywords.cpp">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\common\Parser.cxx">
+      <Filter>Source Files\src\phreeqcpp\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\common\PHRQ_base.cxx">
+      <Filter>Source Files\src\phreeqcpp\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\common\PHRQ_io.cpp">
+      <Filter>Source Files\src\phreeqcpp\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\common\Utils.cxx">
+      <Filter>Source Files\src\phreeqcpp\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\Dictionary.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="TestCVar.h">