diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 4c2693a..3fd61d1 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -16,7 +16,7 @@ jobs:
       max-parallel: 3
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        package-name: ["geos-ats", "geos-mesh-doctor", "geos-mesh-tools", "geos-xml-tools", "hdf5-wrapper", "pygeosx-tools", "geos-timehistory"]
+        package-name: ["geos-ats", "geos-mesh-doctor", "geos-mesh-tools", "geos-timehistory", "geos-xml-tools", "hdf5-wrapper", "pygeos-tools"]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/geos-xml-tools/pyproject.toml b/geos-xml-tools/pyproject.toml
index 591d50b..3763271 100644
--- a/geos-xml-tools/pyproject.toml
+++ b/geos-xml-tools/pyproject.toml
@@ -10,12 +10,8 @@ maintainers = [
     {name = "Christopher Sherman", email = "sherman27@llnl.gov" }
 ]
 license = {text = "LGPL-2.1"}
-classifiers = [
-  "Development Status :: 4 - Beta",
-  "Programming Language :: Python"
-]
 
-requires-python = ">=3.6"
+requires-python = ">=3.8"
 
 dependencies = [
     "lxml>=4.5.0",
diff --git a/hdf5-wrapper/pyproject.toml b/hdf5-wrapper/pyproject.toml
index c2f433a..b9e59a1 100644
--- a/hdf5-wrapper/pyproject.toml
+++ b/hdf5-wrapper/pyproject.toml
@@ -2,6 +2,26 @@
 requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "geos-hdf5-wrapper"
+version = "0.2.0"
+description = "Simple wrapper for h5py objects"
+maintainers = [
+    {name = "Christopher Sherman", email = "sherman27@llnl.gov" }
+]
+license = "LGPL-2.1"
+
+requires-python = ">=3.8"
+
+dependencies = [
+    "h5py>=2.10.0",
+    "numpy>=1.16.2",
+]
+
+[project.scripts]
+    hdf5_wrapper_tests = hdf5wrapper.wrapper_tests:main
+
+
 [tool.mypy]
 python_version = "3.8"
 warn_return_any = true
diff --git a/hdf5-wrapper/setup.cfg b/hdf5-wrapper/setup.cfg
deleted file mode 100644
index 13db52e..0000000
--- a/hdf5-wrapper/setup.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-[metadata]
-name = hdf5_wrapper
-version = 0.2.0
-description = Simple wrapper for h5py objects
-author = Christopher Sherman
-author_email = sherman27@llnl.gov
-license = LGPL-2.1
-
-[options]
-packages =
-    hdf5_wrapper
-install_requires =
-    h5py>=2.10.0
-    numpy>=1.16.2
-python_requires = >=3.6
-
-[options.package_data]
-hdf5_wrapper = py.typed
-
-[options.entry_points]
-console_scripts =
-    hdf5_wrapper_tests = hdf5_wrapper.wrapper_tests:main
-
diff --git a/hdf5-wrapper/hdf5_wrapper/__init__.py b/hdf5-wrapper/src/hdf5wrapper/__init__.py
similarity index 100%
rename from hdf5-wrapper/hdf5_wrapper/__init__.py
rename to hdf5-wrapper/src/hdf5wrapper/__init__.py
diff --git a/hdf5-wrapper/hdf5_wrapper/py.typed b/hdf5-wrapper/src/hdf5wrapper/py.typed
similarity index 100%
rename from hdf5-wrapper/hdf5_wrapper/py.typed
rename to hdf5-wrapper/src/hdf5wrapper/py.typed
diff --git a/hdf5-wrapper/hdf5_wrapper/use_example.py b/hdf5-wrapper/src/hdf5wrapper/use_example.py
similarity index 100%
rename from hdf5-wrapper/hdf5_wrapper/use_example.py
rename to hdf5-wrapper/src/hdf5wrapper/use_example.py
diff --git a/hdf5-wrapper/hdf5_wrapper/wrapper.py b/hdf5-wrapper/src/hdf5wrapper/wrapper.py
similarity index 100%
rename from hdf5-wrapper/hdf5_wrapper/wrapper.py
rename to hdf5-wrapper/src/hdf5wrapper/wrapper.py
diff --git a/hdf5-wrapper/hdf5_wrapper/wrapper_tests.py b/hdf5-wrapper/src/hdf5wrapper/wrapper_tests.py
similarity index 100%
rename from hdf5-wrapper/hdf5_wrapper/wrapper_tests.py
rename to hdf5-wrapper/src/hdf5wrapper/wrapper_tests.py
diff --git a/pygeos-tools/pyproject.toml b/pygeos-tools/pyproject.toml
index c2f433a..62ccff8 100644
--- a/pygeos-tools/pyproject.toml
+++ b/pygeos-tools/pyproject.toml
@@ -2,6 +2,28 @@
 requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "pygeosx-tools"
+version = "0.1.0"
+description = "Tools for interacting with pygeosx"
+author = [
+    {name = "Christopher Sherman", email = "sherman27@llnl.gov" }
+]
+license = {text = "LGPL-2.1"}
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python"
+]
+
+requires-python = ">=3.8"
+
+dependencies = [
+    "matplotlib",
+    "numpy",
+    "scipy",
+    "mpi4py",
+]
+
 [tool.mypy]
 python_version = "3.8"
 warn_return_any = true
diff --git a/pygeos-tools/setup.cfg b/pygeos-tools/setup.cfg
deleted file mode 100644
index 4df92e3..0000000
--- a/pygeos-tools/setup.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-[metadata]
-name = pygeosx_tools
-version = 0.1.0
-description = Tools for interacting with pygeosx
-author = Christopher Sherman
-author_email = sherman27@llnl.gov
-license = LGPL-2.1
-
-[options]
-packages =
-    pygeosx_tools
-install_requires =
-    matplotlib
-    numpy
-    scipy
-    mpi4py
-python_requires = >=3.6
-
-[options.package_data]
-pygeosx_tools = py.typed
diff --git a/pygeos-tools/pygeosx_tools/__init__.py b/pygeos-tools/src/pygeos/tools/__init__.py
similarity index 100%
rename from pygeos-tools/pygeosx_tools/__init__.py
rename to pygeos-tools/src/pygeos/tools/__init__.py
diff --git a/pygeos-tools/pygeosx_tools/file_io.py b/pygeos-tools/src/pygeos/tools/file_io.py
similarity index 100%
rename from pygeos-tools/pygeosx_tools/file_io.py
rename to pygeos-tools/src/pygeos/tools/file_io.py
diff --git a/pygeos-tools/pygeosx_tools/mesh_interpolation.py b/pygeos-tools/src/pygeos/tools/mesh_interpolation.py
similarity index 100%
rename from pygeos-tools/pygeosx_tools/mesh_interpolation.py
rename to pygeos-tools/src/pygeos/tools/mesh_interpolation.py
diff --git a/pygeos-tools/pygeosx_tools/py.typed b/pygeos-tools/src/pygeos/tools/py.typed
similarity index 100%
rename from pygeos-tools/pygeosx_tools/py.typed
rename to pygeos-tools/src/pygeos/tools/py.typed
diff --git a/pygeos-tools/pygeosx_tools/well_log.py b/pygeos-tools/src/pygeos/tools/well_log.py
similarity index 100%
rename from pygeos-tools/pygeosx_tools/well_log.py
rename to pygeos-tools/src/pygeos/tools/well_log.py
diff --git a/pygeos-tools/pygeosx_tools/wrapper.py b/pygeos-tools/src/pygeos/tools/wrapper.py
similarity index 100%
rename from pygeos-tools/pygeosx_tools/wrapper.py
rename to pygeos-tools/src/pygeos/tools/wrapper.py