diff --git a/03.M3P2 pedagogy/frontmatter.yaml b/02.m3p2-objectives/frontmatter.yaml
similarity index 89%
rename from 03.M3P2 pedagogy/frontmatter.yaml
rename to 02.m3p2-objectives/frontmatter.yaml
index c74f31816..0c04a95ef 100644
--- a/03.M3P2 pedagogy/frontmatter.yaml
+++ b/02.m3p2-objectives/frontmatter.yaml
@@ -1,6 +1,8 @@
# This page configuration is shared by all locales, in this directory.
# You can override it in the individual frontmatter of the pages.
+visible: true
+
content:
# https://learn.getgrav.org/15/content/collections#summary-of-collection-options
items: @self.children
diff --git a/02.M3P2 objectives/textbook.en.md b/02.m3p2-objectives/textbook.en.md
similarity index 99%
rename from 02.M3P2 objectives/textbook.en.md
rename to 02.m3p2-objectives/textbook.en.md
index 43a70f67a..f70b0a84f 100644
--- a/02.M3P2 objectives/textbook.en.md
+++ b/02.m3p2-objectives/textbook.en.md
@@ -1,7 +1,6 @@
---
title: 'M3P2
Objectives'
-slug: m3p2_objectives
-visible: true
+slug: m3p2-objectives
---
#### What M3P2 is ?
diff --git a/02.M3P2 objectives/textbook.es.md b/02.m3p2-objectives/textbook.es.md
similarity index 99%
rename from 02.M3P2 objectives/textbook.es.md
rename to 02.m3p2-objectives/textbook.es.md
index ff53e6f9f..bb5f01e82 100644
--- a/02.M3P2 objectives/textbook.es.md
+++ b/02.m3p2-objectives/textbook.es.md
@@ -1,7 +1,6 @@
---
title: 'M3P2
Objectivos'
-slug: m3p2_objectives
-visible: true
+slug: m3p2-objectives
---
#### ¿ Qué es M3P2 ?
diff --git a/02.M3P2 objectives/textbook.fr.md b/02.m3p2-objectives/textbook.fr.md
similarity index 99%
rename from 02.M3P2 objectives/textbook.fr.md
rename to 02.m3p2-objectives/textbook.fr.md
index f13fd22cd..1f9609081 100644
--- a/02.M3P2 objectives/textbook.fr.md
+++ b/02.m3p2-objectives/textbook.fr.md
@@ -1,7 +1,6 @@
---
title: 'M3P2
Objectifs'
-slug: m3p2_objectives
-visible: true
+slug: m3p2-objectives
---
#### Qu'est-ce M3P2 ?
diff --git a/03.M3P2 pedagogy/topics.en.md b/03.M3P2 pedagogy/topics.en.md
deleted file mode 100644
index 44c9720a8..000000000
--- a/03.M3P2 pedagogy/topics.en.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: 'Pedagogical
method'
-slug: m3p2_pedagogy
----
-
-### The pedagogical method
\ No newline at end of file
diff --git a/03.M3P2 pedagogy/topics.es.md b/03.M3P2 pedagogy/topics.es.md
deleted file mode 100644
index 963dd656e..000000000
--- a/03.M3P2 pedagogy/topics.es.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: 'Método
pedagógico'
-slug: m3p2_pedagogy
----
-
-### El método pedagógico
\ No newline at end of file
diff --git a/03.M3P2 pedagogy/topics.fr.md b/03.M3P2 pedagogy/topics.fr.md
deleted file mode 100644
index 61259351b..000000000
--- a/03.M3P2 pedagogy/topics.fr.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: 'Méthode
pédagogique'
-slug: m3p2_pedagogy
----
-
-### La méthode pédagogique
\ No newline at end of file
diff --git a/02.M3P2 objectives/frontmatter.yaml b/03.m3p2-pedagogy/frontmatter.yaml
similarity index 100%
rename from 02.M3P2 objectives/frontmatter.yaml
rename to 03.m3p2-pedagogy/frontmatter.yaml
diff --git a/03.m3p2-pedagogy/topics.en.md b/03.m3p2-pedagogy/topics.en.md
new file mode 100644
index 000000000..1722a5cf0
--- /dev/null
+++ b/03.m3p2-pedagogy/topics.en.md
@@ -0,0 +1,6 @@
+---
+title: 'Pedagogical
method'
+slug: m3p2-pedagogy
+---
+
+### The pedagogical method
\ No newline at end of file
diff --git a/03.m3p2-pedagogy/topics.es.md b/03.m3p2-pedagogy/topics.es.md
new file mode 100644
index 000000000..afb064952
--- /dev/null
+++ b/03.m3p2-pedagogy/topics.es.md
@@ -0,0 +1,6 @@
+---
+title: 'Método
pedagógico'
+slug: m3p2-pedagogy
+---
+
+### El método pedagógico
\ No newline at end of file
diff --git a/03.m3p2-pedagogy/topics.fr.md b/03.m3p2-pedagogy/topics.fr.md
new file mode 100644
index 000000000..228eef555
--- /dev/null
+++ b/03.m3p2-pedagogy/topics.fr.md
@@ -0,0 +1,6 @@
+---
+title: 'Méthode
pédagogique'
+slug: m3p2-pedagogy
+---
+
+### La méthode pédagogique
\ No newline at end of file