diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dba08826..a01c080c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     name: ${{ matrix.os }}-ghc-${{ matrix.ghc }}
     runs-on: ${{ matrix.os }}
     env:
-      cabal-build-dir: b
+      cabal-build-dir: dist-newstyle
     strategy:
       matrix:
         os:
@@ -105,13 +105,13 @@ jobs:
           || true
 
       - name: Documentation (Generation)
+        if: |
+            matrix.os == 'ubuntu-latest'
+            && matrix.ghc == '9.12'
         run: >
-          cabal haddock
-          --builddir=${{ env.cabal-build-dir }}
-          --enable-documentation
-          --haddock-hyperlink-source
-          --haddock-html-location
-          'https://hackage.haskell.org/package/$pkg-$version/docs'
+          cabal haddock-project
+          --hackage
+          --output=gh-pages
 
       - name: Documentation (Staging)
         if: |
@@ -119,8 +119,6 @@ jobs:
             && matrix.os == 'ubuntu-latest'
             && matrix.ghc == '9.12'
         run: >
-          mv ${{ env.cabal-build-dir }}/build/*/*/*/doc/html/* gh-pages
-
           touch gh-pages/.nojekyll
 
       - name: Documentation (Deployment)
diff --git a/cabal.project b/cabal.project
index eb81b3e7..717c158d 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1 +1,2 @@
-packages: monoidmap.cabal
+packages:
+  packages/*
diff --git a/CHANGELOG.md b/packages/monoidmap/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to packages/monoidmap/CHANGELOG.md
diff --git a/LICENSE b/packages/monoidmap/LICENSE
similarity index 100%
rename from LICENSE
rename to packages/monoidmap/LICENSE
diff --git a/README.md b/packages/monoidmap/README.md
similarity index 100%
rename from README.md
rename to packages/monoidmap/README.md
diff --git a/components/monoidmap/Data/MonoidMap.hs b/packages/monoidmap/components/monoidmap/Data/MonoidMap.hs
similarity index 100%
rename from components/monoidmap/Data/MonoidMap.hs
rename to packages/monoidmap/components/monoidmap/Data/MonoidMap.hs
diff --git a/monoidmap.cabal b/packages/monoidmap/monoidmap.cabal
similarity index 100%
rename from monoidmap.cabal
rename to packages/monoidmap/monoidmap.cabal