diff --git a/doc/benchmarking.md b/doc/benchmarking.md
deleted file mode 100644
index 9abbfba84ed..00000000000
--- a/doc/benchmarking.md
+++ /dev/null
@@ -1,2 +0,0 @@
-:::{include} ../BENCHMARKING.md
-:::
\ No newline at end of file
diff --git a/doc/contributing.md b/doc/contributing.md
deleted file mode 100644
index 7aa0c5bc2cd..00000000000
--- a/doc/contributing.md
+++ /dev/null
@@ -1,2 +0,0 @@
-:::{include} ../CONTRIBUTING.md
-:::
\ No newline at end of file
diff --git a/doc/index.md b/doc/index.md
index ee38bba9894..a28ed4aeea1 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -24,9 +24,9 @@ The Ginkgo library can be grouped into {doxy}`modules` and these modules form th
 
 Tutorial <https://github.com/ginkgo-project/ginkgo/wiki/Tutorial:-Building-a-Poisson-Solver>
 Examples <_doxygen/html/Examples.html#https://>
-Publications <publications>
-contributing
-Using Ginkgo <using-ginkgo>
+Publications <user-guide/publications>
+user-guide/contributing
+Using Ginkgo <user-guide/using-ginkgo>
 API <_doxygen/html/index.html#https://>
 :::
 
diff --git a/doc/testing.md b/doc/testing.md
deleted file mode 100644
index 46e03481937..00000000000
--- a/doc/testing.md
+++ /dev/null
@@ -1,2 +0,0 @@
-:::{include} ../TESTING.md
-:::
\ No newline at end of file
diff --git a/doc/user-guide/benchmarking.md b/doc/user-guide/benchmarking.md
new file mode 100644
index 00000000000..b9bbe844e70
--- /dev/null
+++ b/doc/user-guide/benchmarking.md
@@ -0,0 +1,2 @@
+:::{include} ../../BENCHMARKING.md
+:::
\ No newline at end of file
diff --git a/doc/user-guide/contributing.md b/doc/user-guide/contributing.md
new file mode 100644
index 00000000000..7bbeceaa7d3
--- /dev/null
+++ b/doc/user-guide/contributing.md
@@ -0,0 +1,2 @@
+:::{include} ../../CONTRIBUTING.md
+:::
\ No newline at end of file
diff --git a/doc/publications.md b/doc/user-guide/publications.md
similarity index 84%
rename from doc/publications.md
rename to doc/user-guide/publications.md
index c6024007927..85b9066bf63 100644
--- a/doc/publications.md
+++ b/doc/user-guide/publications.md
@@ -1,4 +1,4 @@
-:::{include} ../CITING.md
+:::{include} ../../CITING.md
 :::
 
 :::{toctree}
diff --git a/doc/user-guide/testing.md b/doc/user-guide/testing.md
new file mode 100644
index 00000000000..b129992a559
--- /dev/null
+++ b/doc/user-guide/testing.md
@@ -0,0 +1,2 @@
+:::{include} ../../TESTING.md
+:::
\ No newline at end of file
diff --git a/doc/using-ginkgo.md b/doc/user-guide/using-ginkgo.md
similarity index 65%
rename from doc/using-ginkgo.md
rename to doc/user-guide/using-ginkgo.md
index cdbbdb1590b..9b33ae62d19 100644
--- a/doc/using-ginkgo.md
+++ b/doc/user-guide/using-ginkgo.md
@@ -1,4 +1,4 @@
-:::{include} ../INSTALL.md
+:::{include} ../../INSTALL.md
 :::
 
 :::{toctree}