diff --git a/unit/unit.vcproj.GS.charlton.user b/unit/unit.vcproj.GS.charlton.user
index a26ce50e..781a1dcb 100644
--- a/unit/unit.vcproj.GS.charlton.user
+++ b/unit/unit.vcproj.GS.charlton.user
@@ -22,7 +22,7 @@
 				SQLDebugging=""
 				Environment=""
 				EnvironmentMerge="true"
-				DebuggerFlavor="0"
+				DebuggerFlavor=""
 				MPIRunCommand=""
 				MPIRunArguments=""
 				MPIRunWorkingDirectory=""
diff --git a/unit/unit.vcxproj b/unit/unit.vcxproj
index f89152bc..43f30bc6 100644
--- a/unit/unit.vcxproj
+++ b/unit/unit.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -273,48 +273,48 @@
     <ClCompile Include="..\src\phreeqcpp\Temperature.cxx" />
     <ClCompile Include="..\src\phreeqcpp\Use.cpp" />
     <ClCompile Include="..\src\phreeqcpp\Utils.cxx" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\advection.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\basicsubs.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\cl1.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\cl1mp.cpp">
+    <ClCompile Include="..\src\phreeqcpp\advection.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\basicsubs.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\cl1.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\cl1mp.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\cvdense.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\cvode.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\dense.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\dw.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\gases.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\input.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\integrate.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\inverse.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\isotopes.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\kinetics.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\mainsubs.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\model.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\nvector.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\nvector_serial.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\parse.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\phqalloc.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\PHRQ_io_output.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\pitzer.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\pitzer_structures.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\prep.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\print.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\read.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\readtr.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\sit.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\smalldense.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\spread.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\step.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\structures.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\sundialsmath.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\tally.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\tidy.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\transport.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\utilities.cpp" />
+    <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" />
+    <ClCompile Include="..\src\phreeqcpp\inverse.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\isotopes.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\kinetics.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\mainsubs.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\model.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\nvector.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\nvector_serial.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\parse.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\phqalloc.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\PHRQ_io_output.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\pitzer.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\pitzer_structures.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\prep.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\print.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\read.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\readtr.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\sit.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\smalldense.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\spread.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\step.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\structures.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\sundialsmath.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\tally.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\tidy.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\transport.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\utilities.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="TestCVar.h" />
diff --git a/unit/unit.vcxproj.filters b/unit/unit.vcxproj.filters
index 1bba45f4..ccbe8712 100644
--- a/unit/unit.vcxproj.filters
+++ b/unit/unit.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -177,115 +177,115 @@
     <ClCompile Include="..\src\phreeqcpp\Utils.cxx">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\advection.cpp">
+    <ClCompile Include="..\src\phreeqcpp\advection.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\basicsubs.cpp">
+    <ClCompile Include="..\src\phreeqcpp\basicsubs.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\cl1.cpp">
+    <ClCompile Include="..\src\phreeqcpp\cl1.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\cl1mp.cpp">
+    <ClCompile Include="..\src\phreeqcpp\cl1mp.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\cvdense.cpp">
+    <ClCompile Include="..\src\phreeqcpp\cvdense.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\cvode.cpp">
+    <ClCompile Include="..\src\phreeqcpp\cvode.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\dense.cpp">
+    <ClCompile Include="..\src\phreeqcpp\dense.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\dw.cpp">
+    <ClCompile Include="..\src\phreeqcpp\dw.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\gases.cpp">
+    <ClCompile Include="..\src\phreeqcpp\gases.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\input.cpp">
+    <ClCompile Include="..\src\phreeqcpp\input.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\integrate.cpp">
+    <ClCompile Include="..\src\phreeqcpp\integrate.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\inverse.cpp">
+    <ClCompile Include="..\src\phreeqcpp\inverse.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\isotopes.cpp">
+    <ClCompile Include="..\src\phreeqcpp\isotopes.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\kinetics.cpp">
+    <ClCompile Include="..\src\phreeqcpp\kinetics.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\mainsubs.cpp">
+    <ClCompile Include="..\src\phreeqcpp\mainsubs.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\model.cpp">
+    <ClCompile Include="..\src\phreeqcpp\model.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\nvector.cpp">
+    <ClCompile Include="..\src\phreeqcpp\nvector.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\nvector_serial.cpp">
+    <ClCompile Include="..\src\phreeqcpp\nvector_serial.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\parse.cpp">
+    <ClCompile Include="..\src\phreeqcpp\parse.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\phqalloc.cpp">
+    <ClCompile Include="..\src\phreeqcpp\phqalloc.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\PHRQ_io_output.cpp">
+    <ClCompile Include="..\src\phreeqcpp\PHRQ_io_output.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\pitzer.cpp">
+    <ClCompile Include="..\src\phreeqcpp\pitzer.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\pitzer_structures.cpp">
+    <ClCompile Include="..\src\phreeqcpp\pitzer_structures.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\prep.cpp">
+    <ClCompile Include="..\src\phreeqcpp\prep.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\print.cpp">
+    <ClCompile Include="..\src\phreeqcpp\print.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\read.cpp">
+    <ClCompile Include="..\src\phreeqcpp\read.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\readtr.cpp">
+    <ClCompile Include="..\src\phreeqcpp\readtr.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\sit.cpp">
+    <ClCompile Include="..\src\phreeqcpp\sit.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\smalldense.cpp">
+    <ClCompile Include="..\src\phreeqcpp\smalldense.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\spread.cpp">
+    <ClCompile Include="..\src\phreeqcpp\spread.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\step.cpp">
+    <ClCompile Include="..\src\phreeqcpp\step.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\structures.cpp">
+    <ClCompile Include="..\src\phreeqcpp\structures.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\sundialsmath.cpp">
+    <ClCompile Include="..\src\phreeqcpp\sundialsmath.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\tally.cpp">
+    <ClCompile Include="..\src\phreeqcpp\tally.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\tidy.cpp">
+    <ClCompile Include="..\src\phreeqcpp\tidy.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\transport.cpp">
+    <ClCompile Include="..\src\phreeqcpp\transport.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phreeqc\utilities.cpp">
+    <ClCompile Include="..\src\phreeqcpp\utilities.cpp">
       <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
     </ClCompile>
   </ItemGroup>