diff --git a/external/parthenon b/external/parthenon
index e77e5cc..53fdf38 160000
--- a/external/parthenon
+++ b/external/parthenon
@@ -1 +1 @@
-Subproject commit e77e5cc99f2b675eda0ab7b0c88fb518d381859d
+Subproject commit 53fdf38825f99ae33f475b62f089003255ad1d62
diff --git a/external/singularity-eos b/external/singularity-eos
index 00738fe..4093f31 160000
--- a/external/singularity-eos
+++ b/external/singularity-eos
@@ -1 +1 @@
-Subproject commit 00738fec8ef7f7129e86a48ca775c623c9861996
+Subproject commit 4093f31864d49f3688884e397481d0ecd89f87e9
diff --git a/src/grid/geometry.hpp b/src/grid/geometry.hpp
index abafce3..34ad460 100644
--- a/src/grid/geometry.hpp
+++ b/src/grid/geometry.hpp
@@ -6,7 +6,7 @@
 #include <Kokkos_Macros.hpp>
 
 #include <coordinates/coordinates.hpp>
-#include <pack/sparse_pack.hpp>
+#include <pack/sparse_pack/sparse_pack.hpp>
 #include <ports-of-call/variant.hpp>
 
 #include "dispatcher/options.hpp"
diff --git a/src/grid/pybind/grid_bindings.cpp b/src/grid/pybind/grid_bindings.cpp
index e905e47..ddfa2f6 100644
--- a/src/grid/pybind/grid_bindings.cpp
+++ b/src/grid/pybind/grid_bindings.cpp
@@ -5,9 +5,9 @@
 #include <string>
 #include <vector>
 
-#include <pack/make_pack_descriptor.hpp>
-#include <pack/pack_descriptor.hpp>
-#include <pack/sparse_pack.hpp>
+#include <pack/sparse_pack/make_pack_descriptor.hpp>
+#include <pack/sparse_pack/pack_descriptor.hpp>
+#include <pack/sparse_pack/sparse_pack.hpp>
 
 #include "kamayan/pybind/kamayan_bindings.hpp"
 #include "kamayan/pybind/kamayan_nanobind.h"
@@ -18,7 +18,6 @@
 #include "kamayan_utils/parallel.hpp"
 #include "kamayan_utils/type_list.hpp"
 #include "pack/pack_utils.hpp"
-#include "pack/sparse_pack_base.hpp"
 
 namespace kamayan {
 
@@ -60,7 +59,7 @@ struct SparsePack_py {
 
  private:
   parthenon::SparsePack<> pack;
-  parthenon::SparsePackIdxMap map;
+  parthenon::PackIdxMap map;
   std::weak_ptr<Config> config_;
 };