diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index bcb5701e4..49bd6a8ca 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -13,14 +13,30 @@ jobs:
     - name: apt-update
       run: sudo apt-get update -qq
     - name: apt-get doxygen
-      run: sudo apt-get install -y doxygen
-    - name: build doc
+      run: sudo apt-get install -y doxygen graphviz
+    - name: build docs
       run: make docs
-    - name: deploy
-      uses: peaceiris/actions-gh-pages@v4
+    - name: Upload static files as artifact
+      id: deployment
+      uses: actions/upload-pages-artifact@v3 # or specific "vX.X.X" version tag for this action
       with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./doc/html/
-        enable_jekyll: false
-        allow_empty_commit: false
-        force_orphan: true
+          path: docs/html/
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build-documentation
+      # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
+    permissions:
+      pages: write      # to deploy to Pages
+      id-token: write   # to verify the deployment originates from an appropriate source
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+
+
+
diff --git a/Makefile b/Makefile
index 5b345f7be..98cf33f82 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 ######################################################################################
 
 ## path stuff
-DOCS_PATH:=./doc
+DOCS_PATH:=./docs
 DEMO_PATH=demo
 SRC_PATH=src
 
@@ -64,14 +64,14 @@ nuke: $(addprefix $(SRC_PATH)/, $(SRC))
 
 docs: $(DOCS_PATH)/html/index.html 
 
-$(DOCS_PATH)/html/index.html: $(DOCS_PATH)/doxygen-awesome-css/doxygen-awesome.css $(DOXYFILE)
+$(DOCS_PATH)/html/index.html: $(DOCS_PATH)/html/doxygen-awesome-css/doxygen-awesome.css $(DOXYFILE)
 	doxygen $(DOXYFILE)
 
 $(DOXYFILE):
 	doxygen -g $@
 
-$(DOCS_PATH)/doxygen-awesome-css/doxygen-awesome.css:
-	git clone https://github.com/jothepro/doxygen-awesome-css.git $(DOCS_PATH)/doxygen-awesome-css --branch v2.3.4
+$(DOCS_PATH)/html/doxygen-awesome-css/doxygen-awesome.css:
+	git clone https://github.com/jothepro/doxygen-awesome-css.git $(DOCS_PATH)/html/doxygen-awesome-css --branch v2.3.4
 
 
 
diff --git a/doc/Doxyfile b/docs/Doxyfile
similarity index 99%
rename from doc/Doxyfile
rename to docs/Doxyfile
index 003d71a87..004b420fd 100644
--- a/doc/Doxyfile
+++ b/docs/Doxyfile
@@ -67,7 +67,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ./doc
+OUTPUT_DIRECTORY       = ./docs
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
 # sub-directories (in 2 levels) under the output directory of each output format
@@ -1333,7 +1333,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = ./doc/doxygen-awesome-css/doxygen-awesome.css
+HTML_EXTRA_STYLESHEET  = ./docs/html/doxygen-awesome-css/doxygen-awesome.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note