diff --git a/guidelines/Banned-Contact.md b/developer/banned-contacts.md
similarity index 98%
rename from guidelines/Banned-Contact.md
rename to developer/banned-contacts.md
index bfefb2d81930cfaac1ac744e78444d7525060384..c189954dcd85eef5ea04a1ce8ce7193ec50b34b0 100644
--- a/guidelines/Banned-Contact.md
+++ b/developer/banned-contacts.md
@@ -1,5 +1,5 @@
-Banned contact
-==============
+Banned contacts
+===============
 
 Following information are here for development purposes and may not
 reflect the current state of any Ring client.
diff --git a/guidelines/Coding-rules.md b/developer/coding-style.md
similarity index 97%
rename from guidelines/Coding-rules.md
rename to developer/coding-style.md
index 13bc007c4f239306b947682b760f068c30a15294..9101b9a0237ad8d617144d10f053b64a4b7d9fae 100644
--- a/guidelines/Coding-rules.md
+++ b/developer/coding-style.md
@@ -1,4 +1,4 @@
-Coding rules
+Coding style
 ============
 
 **This page gives rules and/or guidances to all
diff --git a/others/gsoc.md b/developer/gsoc.md
similarity index 100%
rename from others/gsoc.md
rename to developer/gsoc.md
diff --git a/developer/index.rst b/developer/index.rst
index f52624c409f7317c98e6850a446f185900f93f34..c8f0a9a2ee263b6ff0acba2ff1cf429b656c2b07 100644
--- a/developer/index.rst
+++ b/developer/index.rst
@@ -31,10 +31,17 @@ designed and how its various parts work together.
    tensorflow-Plugin
    important-rfcs
    improving-quality-of-jami
-   LRC-documentation
+   libjamiclient-documentation
    name-server-protocol
    protocol
    release-process
    technical-overview
    jami-identifiers
    choosing-crf-value-for-encoder
+   banned-contacts
+   coding-style
+   libjamiclient-coding-style
+   qt-qml-coding-style
+   qt-qml-testing-tools
+   ui-ux-development
+   gsoc
diff --git a/guidelines/Libringclient-Coding-Rules.md b/developer/libjamiclient-coding-style.md
similarity index 99%
rename from guidelines/Libringclient-Coding-Rules.md
rename to developer/libjamiclient-coding-style.md
index 7ddd7e7376aa74e53e8f43706dd75e03d6f8450d..2e47a08c83241da491589fad2af86b469db9a8fa 100644
--- a/guidelines/Libringclient-Coding-Rules.md
+++ b/developer/libjamiclient-coding-style.md
@@ -1,4 +1,4 @@
-Libringclient coding rules
+libjamiclient coding style
 ==========================
 
 **This page gives rules and/or guidances to all
diff --git a/developer/LRC-documentation.md b/developer/libjamiclient-documentation.md
similarity index 97%
rename from developer/LRC-documentation.md
rename to developer/libjamiclient-documentation.md
index cc6d5df0715f1012437116d4d7b050dffe5b54cc..c5ef3c88e04adf07fe58f8668740f12fcd1dce26 100644
--- a/developer/LRC-documentation.md
+++ b/developer/libjamiclient-documentation.md
@@ -1,5 +1,5 @@
-LRC documentation
-=================
+libjamiclient documentation
+===========================
 
 *This page is a stub.*
 
diff --git a/guidelines/Qt-and-QML-coding-guidelines.md b/developer/qt-qml-coding-style.md
similarity index 98%
rename from guidelines/Qt-and-QML-coding-guidelines.md
rename to developer/qt-qml-coding-style.md
index cecb8e7588d1ece51e8f949c561b445bb4b1da06..0f26e1d79c17fa3bb2122c090621d51b753cf60c 100644
--- a/guidelines/Qt-and-QML-coding-guidelines.md
+++ b/developer/qt-qml-coding-style.md
@@ -1,5 +1,5 @@
-Qt and QML coding guidelines
-============================
+Qt and QML coding style
+=======================
 
 ## Qt/c++
 ### Signal and slot naming
diff --git a/guidelines/Qt-and-QML-testing-tools.md b/developer/qt-qml-testing-tools.md
similarity index 100%
rename from guidelines/Qt-and-QML-testing-tools.md
rename to developer/qt-qml-testing-tools.md
diff --git a/guidelines/UI-and-UX-development.md b/developer/ui-ux-development.md
similarity index 100%
rename from guidelines/UI-and-UX-development.md
rename to developer/ui-ux-development.md
diff --git a/misc.rst b/misc.rst
index 3df3e8d6d01d0260b7f9bb4f4b1324536b488752..4a17f669aee66086a7a0f7b1eebcd13538e2a93a 100644
--- a/misc.rst
+++ b/misc.rst
@@ -12,13 +12,6 @@ may change at any time.
 .. toctree::
    :maxdepth: 1
 
-   guidelines/Banned-Contact
-   guidelines/Coding-rules
-   guidelines/Libringclient-Coding-Rules
-   guidelines/Qt-and-QML-coding-guidelines
-   guidelines/Qt-and-QML-testing-tools
-   guidelines/UI-and-UX-development
-   others/gsoc
    tutorials/Jami-distributed-network
    tutorials/Réseau-distribué-Jami
    tutorials/Questions-récurrentes