diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
index 58609d6..b5acc1f 100644
--- a/.github/workflows/jekyll.yml
+++ b/.github/workflows/jekyll.yml
@@ -60,9 +60,9 @@ jobs:
       - name: Build apidocs
         run: ./gradlew apidocs
       - name: Copy javadoc
-        run: cp -a build/javadoc webpages/_site/vm-operator/
+        run: cp -a build/javadoc webpages/_site/
       - name: Index pagefind
-        run: cd webpages && npx pagefind --source "_site/vm-operator"          
+        run: cd webpages && npx pagefind --source "_site"          
       - name: Upload artifact
         # Automatically uploads an artifact from the './_site' directory by default
         uses: actions/upload-pages-artifact@v3
diff --git a/misc/javadoc.bottom.txt b/misc/javadoc.bottom.txt
index c858345..dfc3373 100644
--- a/misc/javadoc.bottom.txt
+++ b/misc/javadoc.bottom.txt
@@ -22,13 +22,14 @@
       _paq.push(['trackPageView']);
       _paq.push(['enableLinkTracking']);
       (function() {
-        var u="//piwik.mnl.de/";
+        var u="https://piwik.mnl.de/";
         _paq.push(['setTrackerUrl', u+'piwik.php']);
         _paq.push(['setSiteId', '17']);
         var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
         g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
       })();
     </script>
-    <noscript><p><img referrerpolicy="no-referrer-when-downgrade" src="//piwik.mnl.de/matomo.php?idsite=17&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+    <noscript><p><img referrerpolicy="no-referrer-when-downgrade"
+      src="//piwik.mnl.de/matomo.php?idsite=17&amp;rec=1&amp;action_name=VM-Operator" style="border:0;" alt="" /></p></noscript>
     <!-- End Matomo Code -->
 </div>
\ No newline at end of file
diff --git a/webpages/vm-operator/02_2_operator.png b/webpages/02_2_operator.png
similarity index 100%
rename from webpages/vm-operator/02_2_operator.png
rename to webpages/02_2_operator.png
diff --git a/webpages/vm-operator/VM-Operator-GUI-preview.png b/webpages/VM-Operator-GUI-preview.png
similarity index 100%
rename from webpages/vm-operator/VM-Operator-GUI-preview.png
rename to webpages/VM-Operator-GUI-preview.png
diff --git a/webpages/vm-operator/VM-Operator-GUI-view.png b/webpages/VM-Operator-GUI-view.png
similarity index 100%
rename from webpages/vm-operator/VM-Operator-GUI-view.png
rename to webpages/VM-Operator-GUI-view.png
diff --git a/webpages/vm-operator/VM-Operator-with-font.svg b/webpages/VM-Operator-with-font.svg
similarity index 100%
rename from webpages/vm-operator/VM-Operator-with-font.svg
rename to webpages/VM-Operator-with-font.svg
diff --git a/webpages/vm-operator/VM-Operator.svg b/webpages/VM-Operator.svg
similarity index 100%
rename from webpages/vm-operator/VM-Operator.svg
rename to webpages/VM-Operator.svg
diff --git a/webpages/vm-operator/VmAccess-preview.png b/webpages/VmAccess-preview.png
similarity index 100%
rename from webpages/vm-operator/VmAccess-preview.png
rename to webpages/VmAccess-preview.png
diff --git a/webpages/_includes/matomo.html b/webpages/_includes/matomo.html
index 75978bc..adb7c30 100644
--- a/webpages/_includes/matomo.html
+++ b/webpages/_includes/matomo.html
@@ -9,7 +9,7 @@
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    var u="//piwik.mnl.de/";
+    var u="https://piwik.mnl.de/";
     _paq.push(['setTrackerUrl', u+'piwik.php']);
     _paq.push(['setSiteId', '17']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
@@ -17,7 +17,7 @@
   })();
 </script>
 <noscript>
-<img src="https://piwik.mnl.de/piwik.php?idsite=17&amp;rec=1&amp;action_name=JGrapes" style="border:0" alt="" />
+<img src="https://piwik.mnl.de/piwik.php?idsite=17&amp;rec=1&amp;action_name=VM-Operator" style="border:0" alt="" />
 </noscript>
 <!-- End Matomo Code -->
 
diff --git a/webpages/_layouts/vm-operator.html b/webpages/_layouts/vm-operator.html
index 6d0df26..590412a 100644
--- a/webpages/_layouts/vm-operator.html
+++ b/webpages/_layouts/vm-operator.html
@@ -5,18 +5,19 @@
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <meta name="referrer" content="no-referrer">
     <link rel="icon" type="image/svg+xml" href="favicon.svg" sizes="any">
-    <link rel="stylesheet" href="../stylesheets/styles.css">
-    <link rel="stylesheet" href="../stylesheets/pygment_trac.css">
+    <link rel="stylesheet" href="stylesheets/styles.css">
+    <link rel="stylesheet" href="stylesheets/pygment_trac.css">
     <meta name="viewport" content="width=device-width">
     <!--[if lt IE 9]>
     <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
-    <link href="/vm-operator/pagefind/pagefind-ui.css" rel="stylesheet">
-    <script src="/vm-operator/pagefind/pagefind-ui.js"></script>
+    <link href="pagefind/pagefind-ui.css" rel="stylesheet">
+    <script src="pagefind/pagefind-ui.js"></script>
     <script>
         window.addEventListener('DOMContentLoaded', (event) => {
           new PagefindUI({ element: "#search", showSubResults: true,
-          bundlePath: "/vm-operator/pagefind/",
+          // Regrettably works with absolute path only
+          bundlePath: "/pagefind/",
           // See https://github.com/CloudCannon/pagefind/issues/530
           processResult: function (result) {
               if (result?.meta?.image) {
@@ -40,7 +41,7 @@
       <header>
         <div>
         <div style="float: left;">
-          <div class="index-title"><a style="color: #222;" href="https://jdrupes.org/vm-operator/">VM-Operator</a></div>
+          <div class="index-title"><a style="color: #222;" href="https://vm-operator.jdrupes.org/">VM-Operator</a></div>
           <div class="index-subtitle">By <a href="https://github.com/mnlipp/">Michael N. Lipp</a></div>
           <p><a rel="me" href="https://fosstodon.org/@mnl"><img alt="Mastodon Follow" 
             src="https://img.shields.io/mastodon/follow/108843609567976408?domain=https%3A%2F%2Ffosstodon.org&style=social"></a></p>
@@ -68,7 +69,7 @@
         <li><p class="part-entry"><a href="user-gui.html">For Users</a></p></li>
         </ul>
         <p class="part-list-title"><a href="upgrading.html">Upgrading</a></p>
-        <p class="part-list-title"><a href="https://jdrupes.org/vm-operator/latest-release/javadoc/index.html">Javadoc</a></p>
+        <p class="part-list-title"><a href="https://vm-operator.jdrupes.org/javadoc/index.html">Javadoc</a></p>
 
       </header>
       <section>
diff --git a/webpages/vm-operator/admin-gui.md b/webpages/admin-gui.md
similarity index 100%
rename from webpages/vm-operator/admin-gui.md
rename to webpages/admin-gui.md
diff --git a/webpages/vm-operator/controller.md b/webpages/controller.md
similarity index 100%
rename from webpages/vm-operator/controller.md
rename to webpages/controller.md
diff --git a/webpages/vm-operator/favicon.svg b/webpages/favicon.svg
similarity index 100%
rename from webpages/vm-operator/favicon.svg
rename to webpages/favicon.svg
diff --git a/webpages/vm-operator/index-pic.svg b/webpages/index-pic.svg
similarity index 100%
rename from webpages/vm-operator/index-pic.svg
rename to webpages/index-pic.svg
diff --git a/webpages/index.html b/webpages/index.html
deleted file mode 100644
index daa1b9c..0000000
--- a/webpages/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="refresh" content="0; URL=vm-operator/index.html">
-    <title>Redirecting...</title>
-</head>
-<body>
-    <p>If you are not redirected automatically, <a href="vm-operator/index.html">click here</a>.</p>
-</body>
-</html>
diff --git a/webpages/vm-operator/index.md b/webpages/index.md
similarity index 100%
rename from webpages/vm-operator/index.md
rename to webpages/index.md
diff --git a/webpages/vm-operator/manager.md b/webpages/manager.md
similarity index 100%
rename from webpages/vm-operator/manager.md
rename to webpages/manager.md
diff --git a/webpages/vm-operator/pools.md b/webpages/pools.md
similarity index 100%
rename from webpages/vm-operator/pools.md
rename to webpages/pools.md
diff --git a/webpages/vm-operator/robots.txt b/webpages/robots.txt
similarity index 100%
rename from webpages/vm-operator/robots.txt
rename to webpages/robots.txt
diff --git a/webpages/vm-operator/runner.md b/webpages/runner.md
similarity index 100%
rename from webpages/vm-operator/runner.md
rename to webpages/runner.md
diff --git a/webpages/vm-operator/upgrading.md b/webpages/upgrading.md
similarity index 100%
rename from webpages/vm-operator/upgrading.md
rename to webpages/upgrading.md
diff --git a/webpages/vm-operator/user-gui.md b/webpages/user-gui.md
similarity index 100%
rename from webpages/vm-operator/user-gui.md
rename to webpages/user-gui.md
diff --git a/webpages/vm-operator/webgui.md b/webpages/webgui.md
similarity index 100%
rename from webpages/vm-operator/webgui.md
rename to webpages/webgui.md