diff --git a/04.me_user/01.languages/page.en.md b/04.my-m3p2/01.languages/page.en.md
similarity index 100%
rename from 04.me_user/01.languages/page.en.md
rename to 04.my-m3p2/01.languages/page.en.md
diff --git a/04.me_user/01.languages/page.es.md b/04.my-m3p2/01.languages/page.es.md
similarity index 100%
rename from 04.me_user/01.languages/page.es.md
rename to 04.my-m3p2/01.languages/page.es.md
diff --git a/04.me_user/01.languages/page.fr.md b/04.my-m3p2/01.languages/page.fr.md
similarity index 100%
rename from 04.me_user/01.languages/page.fr.md
rename to 04.my-m3p2/01.languages/page.fr.md
diff --git a/04.me_user/01.languages/topics.en.md b/04.my-m3p2/01.languages/topics.en.md
similarity index 100%
rename from 04.me_user/01.languages/topics.en.md
rename to 04.my-m3p2/01.languages/topics.en.md
diff --git a/04.me_user/01.languages/topics.es.md b/04.my-m3p2/01.languages/topics.es.md
similarity index 100%
rename from 04.me_user/01.languages/topics.es.md
rename to 04.my-m3p2/01.languages/topics.es.md
diff --git a/04.me_user/01.languages/topics.fr.md b/04.my-m3p2/01.languages/topics.fr.md
similarity index 100%
rename from 04.me_user/01.languages/topics.fr.md
rename to 04.my-m3p2/01.languages/topics.fr.md
diff --git a/04.me_user/02.modes/page.en.md b/04.my-m3p2/02.modes/page.en.md
similarity index 100%
rename from 04.me_user/02.modes/page.en.md
rename to 04.my-m3p2/02.modes/page.en.md
diff --git a/04.me_user/02.modes/page.es.md b/04.my-m3p2/02.modes/page.es.md
similarity index 100%
rename from 04.me_user/02.modes/page.es.md
rename to 04.my-m3p2/02.modes/page.es.md
diff --git a/04.me_user/02.modes/page.fr.md b/04.my-m3p2/02.modes/page.fr.md
similarity index 100%
rename from 04.me_user/02.modes/page.fr.md
rename to 04.my-m3p2/02.modes/page.fr.md
diff --git a/04.me_user/02.modes/topics.en.md b/04.my-m3p2/02.modes/topics.en.md
similarity index 100%
rename from 04.me_user/02.modes/topics.en.md
rename to 04.my-m3p2/02.modes/topics.en.md
diff --git a/04.me_user/02.modes/topics.es.md b/04.my-m3p2/02.modes/topics.es.md
similarity index 100%
rename from 04.me_user/02.modes/topics.es.md
rename to 04.my-m3p2/02.modes/topics.es.md
diff --git a/04.me_user/02.modes/topics.fr.md b/04.my-m3p2/02.modes/topics.fr.md
similarity index 100%
rename from 04.me_user/02.modes/topics.fr.md
rename to 04.my-m3p2/02.modes/topics.fr.md
diff --git a/04.me_user/03.project/page.en.md b/04.my-m3p2/03.project/page.en.md
similarity index 100%
rename from 04.me_user/03.project/page.en.md
rename to 04.my-m3p2/03.project/page.en.md
diff --git a/04.me_user/03.project/page.es.md b/04.my-m3p2/03.project/page.es.md
similarity index 100%
rename from 04.me_user/03.project/page.es.md
rename to 04.my-m3p2/03.project/page.es.md
diff --git a/04.me_user/03.project/page.fr.md b/04.my-m3p2/03.project/page.fr.md
similarity index 100%
rename from 04.me_user/03.project/page.fr.md
rename to 04.my-m3p2/03.project/page.fr.md
diff --git a/04.me_user/03.project/topics.en.md b/04.my-m3p2/03.project/topics.en.md
similarity index 100%
rename from 04.me_user/03.project/topics.en.md
rename to 04.my-m3p2/03.project/topics.en.md
diff --git a/04.me_user/03.project/topics.es.md b/04.my-m3p2/03.project/topics.es.md
similarity index 100%
rename from 04.me_user/03.project/topics.es.md
rename to 04.my-m3p2/03.project/topics.es.md
diff --git a/04.me_user/03.project/topics.fr.md b/04.my-m3p2/03.project/topics.fr.md
similarity index 100%
rename from 04.me_user/03.project/topics.fr.md
rename to 04.my-m3p2/03.project/topics.fr.md
diff --git a/04.me_user/page.en.md b/04.my-m3p2/page.en.md
similarity index 100%
rename from 04.me_user/page.en.md
rename to 04.my-m3p2/page.en.md
diff --git a/04.me_user/topics.en.md b/04.my-m3p2/topics.en.md
similarity index 100%
rename from 04.me_user/topics.en.md
rename to 04.my-m3p2/topics.en.md
diff --git a/04.me_user/topics.es.md b/04.my-m3p2/topics.es.md
similarity index 100%
rename from 04.me_user/topics.es.md
rename to 04.my-m3p2/topics.es.md
diff --git a/04.me_user/topics.fr.md b/04.my-m3p2/topics.fr.md
similarity index 100%
rename from 04.me_user/topics.fr.md
rename to 04.my-m3p2/topics.fr.md
diff --git a/05.M3P2 team/topics.es.md b/05.M3P2 team/topics.es.md
deleted file mode 100644
index 75da77114..000000000
--- a/05.M3P2 team/topics.es.md	
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: 'El equipo<br> M3P2'
-slug: m3p2_team
----
-
-### El equipo M3P2
\ No newline at end of file
diff --git a/05.M3P2 team/topics.fr.md b/05.M3P2 team/topics.fr.md
deleted file mode 100644
index 7adfc0037..000000000
--- a/05.M3P2 team/topics.fr.md	
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: 'L''équipe<br> M3P2'
-slug: m3p2_objectives
----
-
-### L'équipe M3P2
\ No newline at end of file
diff --git a/05.M3P2 team/frontmatter.yaml b/05.m3p2-team/frontmatter.yaml
similarity index 100%
rename from 05.M3P2 team/frontmatter.yaml
rename to 05.m3p2-team/frontmatter.yaml
diff --git a/05.M3P2 team/topics.en.md b/05.m3p2-team/topics.en.md
similarity index 50%
rename from 05.M3P2 team/topics.en.md
rename to 05.m3p2-team/topics.en.md
index 9c1005c6d..802e219ce 100644
--- a/05.M3P2 team/topics.en.md	
+++ b/05.m3p2-team/topics.en.md
@@ -1,6 +1,6 @@
 ---
 title: 'The Team<br>M3P2'
-slug: m3p2_team
+slug: m3p2-team
 ---
 
 ### The M3P2 Team 
\ No newline at end of file
diff --git a/05.m3p2-team/topics.es.md b/05.m3p2-team/topics.es.md
new file mode 100644
index 000000000..eae3af374
--- /dev/null
+++ b/05.m3p2-team/topics.es.md
@@ -0,0 +1,6 @@
+---
+title: 'El equipo<br>M3P2'
+slug: m3p2-equipo
+---
+
+### El equipo M3P2
\ No newline at end of file
diff --git a/05.m3p2-team/topics.fr.md b/05.m3p2-team/topics.fr.md
new file mode 100644
index 000000000..c5e303743
--- /dev/null
+++ b/05.m3p2-team/topics.fr.md
@@ -0,0 +1,6 @@
+---
+title: "L'équipe<br>M3P2"
+slug: m3p2-equipe
+---
+
+### L'équipe M3P2
\ No newline at end of file
diff --git a/06.partner institutes/frontmatter.yaml b/07.sponsors/06.partner-institutes/frontmatter.yaml
similarity index 100%
rename from 06.partner institutes/frontmatter.yaml
rename to 07.sponsors/06.partner-institutes/frontmatter.yaml
diff --git a/06.partner institutes/topics.en.md b/07.sponsors/06.partner-institutes/topics.en.md
similarity index 100%
rename from 06.partner institutes/topics.en.md
rename to 07.sponsors/06.partner-institutes/topics.en.md
diff --git a/06.partner institutes/topics.es.md b/07.sponsors/06.partner-institutes/topics.es.md
similarity index 100%
rename from 06.partner institutes/topics.es.md
rename to 07.sponsors/06.partner-institutes/topics.es.md
diff --git a/06.partner institutes/topics.fr.md b/07.sponsors/06.partner-institutes/topics.fr.md
similarity index 100%
rename from 06.partner institutes/topics.fr.md
rename to 07.sponsors/06.partner-institutes/topics.fr.md