diff --git a/Principia.sln b/Principia.sln
index a26bb1e720..ee98f12e3f 100644
--- a/Principia.sln
+++ b/Principia.sln
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Property Sheets", "
 		google_protobuf.props = google_protobuf.props
 		include_solution.props = include_solution.props
 		principia.props = principia.props
+		llnl_zfp.props = llnl_zfp.props
 		profiling.props = profiling.props
 		suppress_useless_warnings.props = suppress_useless_warnings.props
 	EndProjectSection
diff --git a/base/base.vcxproj b/base/base.vcxproj
index 6581f69ff0..6cf019c435 100644
--- a/base/base.vcxproj
+++ b/base/base.vcxproj
@@ -6,13 +6,13 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)principia.props" />
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="..\third_party_zfp.props" />
+    <Import Project="..\llnl_zfp.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_LLVM|x64'">
-    <Import Project="..\third_party_zfp.props" />
+    <Import Project="..\llnl_zfp.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="..\third_party_zfp.props" />
+    <Import Project="..\llnl_zfp.props" />
   </ImportGroup>
   <ItemGroup>
     <ClInclude Include="array.hpp" />
diff --git a/third_party_zfp.props b/llnl_zfp.props
similarity index 58%
rename from third_party_zfp.props
rename to llnl_zfp.props
index 6fb7bc2fa0..60c865ec75 100644
--- a/third_party_zfp.props
+++ b/llnl_zfp.props
@@ -5,10 +5,10 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\Third Party\zfp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\LLNL\zfp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\Third Party\zfp\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\LLNL\zfp\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>zfp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
diff --git a/rebuild_all_solutions.ps1 b/rebuild_all_solutions.ps1
index d397148888..2c74521b0f 100644
--- a/rebuild_all_solutions.ps1
+++ b/rebuild_all_solutions.ps1
@@ -9,55 +9,37 @@ $dependencies = @(".\Google\glog\msvc\glog.sln",
                   ".\Google\benchmark\msvc\google-benchmark.sln",
                   ".\Google\gipfeli\msvc\gipfeli.sln",
                   ".\Google\abseil-cpp\msvc\abseil-cpp.sln",
-                  ".\Third Party\zfp\msvc\zfp.sln")
+                  ".\LLNL\zfp\msvc\zfp.sln")
 
-New-Item -ItemType Directory -Force -Path "Google"
-New-Item -ItemType Directory -Force -Path "Third Party"
-
-push-location -path "Google"
-foreach ($repository in @("glog", "googletest", "protobuf", "benchmark",
-                          "gipfeli", "abseil-cpp", "chromium")) {
-  if (!(test-path -path $repository)) {
-    git clone ("https://github.com/mockingbirdnest/" + $repository + ".git")
-  }
-  push-location $repository
-  git checkout master
-  git pull
-  if (!$?) {
-    if ($args[0] -eq "--force") {
-      git reset --hard origin/master
-      git clean -fdx
-    } else {
-      pop-location
-      pop-location
-      exit 1
+foreach ($directory_and_repositories in @(
+         @("Boost",  @("multiprecision")),
+         @("Google", @("glog", "googletest", "protobuf", "benchmark",
+                       "gipfeli", "abseil-cpp", "chromium")),
+         @("LLNL",   @("zfp")))) {
+  $directory, $repositories = $directory_and_repositories
+  New-Item -ItemType Directory -Force -Path $directory
+  Push-Location -Path $directory
+  foreach ($repository in $repositories) {
+    if (!(Test-Path -Path $repository)) {
+      git clone ("https://github.com/mockingbirdnest/" + $repository + ".git")
     }
-  }
-  pop-location
-}
-pop-location
-
-push-location -path "Third Party"
-foreach ($repository in @("zfp")) {
-  if (!(test-path -path $repository)) {
-    git clone ("https://github.com/mockingbirdnest/" + $repository + ".git")
-  }
-  push-location $repository
-  git checkout master
-  git pull
-  if (!$?) {
-    if ($args[0] -eq "--force") {
-      git reset --hard origin/master
-      git clean -fdx
-    } else {
-      pop-location
-      pop-location
-      exit 1
+    Push-Location $repository
+    git fetch
+    git checkout origin/HEAD
+    if (!$?) {
+      if ($args[0] -eq "--force") {
+        git reset --hard origin/HEAD
+        git clean -fdx
+      } else {
+        Pop-Location
+        Pop-Location
+        exit 1
+      }
     }
+    Pop-Location
   }
-  pop-location
+  Pop-Location
 }
-pop-location
 
 function build_solutions($solutions) {
   foreach ($configuration in "Debug", "Release") {
diff --git a/shared/base.vcxitems b/shared/base.vcxitems
index 96d32c6daa..bcd47c6248 100644
--- a/shared/base.vcxitems
+++ b/shared/base.vcxitems
@@ -6,7 +6,7 @@
     <ItemsProjectGuid>{a82cb04c-42e1-4ebe-9816-6fc033a9c2b5}</ItemsProjectGuid>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
-    <Import Project="..\third_party_zfp.props" />
+    <Import Project="..\llnl_zfp.props" />
   </ImportGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/third_party_optional.props b/third_party_optional.props
deleted file mode 100644
index b9134efca5..0000000000
--- a/third_party_optional.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\Third Party\Optional;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file