diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7035db..3a0cc45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ pages:
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - "documentation/**/*"
+        - "docs/**/*"
         - "mkdocs.yml"
         - ".gitmodules"
 
diff --git a/docs/documentation/.pages b/docs/documentation/.pages
new file mode 100644
index 0000000..36cad66
--- /dev/null
+++ b/docs/documentation/.pages
@@ -0,0 +1,2 @@
+nav:
+  - 🏚️ TI Portfolio Website: index.md
diff --git a/documentation/docs/agreement.md b/docs/documentation/agreement.md
similarity index 100%
rename from documentation/docs/agreement.md
rename to docs/documentation/agreement.md
diff --git a/documentation/docs/Android/androidStudio.md b/docs/documentation/android/androidStudio.md
similarity index 100%
rename from documentation/docs/Android/androidStudio.md
rename to docs/documentation/android/androidStudio.md
diff --git a/documentation/docs/assets/allouch-en-vanVelsen-2020-social-robots-for-elderly-care.pdf b/docs/documentation/assets/allouch-en-vanVelsen-2020-social-robots-for-elderly-care.pdf
similarity index 100%
rename from documentation/docs/assets/allouch-en-vanVelsen-2020-social-robots-for-elderly-care.pdf
rename to docs/documentation/assets/allouch-en-vanVelsen-2020-social-robots-for-elderly-care.pdf
diff --git a/documentation/docs/assets/amstelhuis.jpg b/docs/documentation/assets/amstelhuis.jpg
similarity index 100%
rename from documentation/docs/assets/amstelhuis.jpg
rename to docs/documentation/assets/amstelhuis.jpg
diff --git a/documentation/docs/assets/choregraphe.jpg b/docs/documentation/assets/choregraphe.jpg
similarity index 100%
rename from documentation/docs/assets/choregraphe.jpg
rename to docs/documentation/assets/choregraphe.jpg
diff --git a/documentation/docs/assets/little-endian.jpg b/docs/documentation/assets/little-endian.jpg
similarity index 100%
rename from documentation/docs/assets/little-endian.jpg
rename to docs/documentation/assets/little-endian.jpg
diff --git a/documentation/docs/assets/nao-robots.png b/docs/documentation/assets/nao-robots.png
similarity index 100%
rename from documentation/docs/assets/nao-robots.png
rename to docs/documentation/assets/nao-robots.png
diff --git a/documentation/docs/assets/nao.png b/docs/documentation/assets/nao.png
similarity index 100%
rename from documentation/docs/assets/nao.png
rename to docs/documentation/assets/nao.png
diff --git a/documentation/docs/assets/oba-buurtcampus.png b/docs/documentation/assets/oba-buurtcampus.png
similarity index 100%
rename from documentation/docs/assets/oba-buurtcampus.png
rename to docs/documentation/assets/oba-buurtcampus.png
diff --git a/documentation/docs/assets/pepper_banner.png b/docs/documentation/assets/pepper_banner.png
similarity index 100%
rename from documentation/docs/assets/pepper_banner.png
rename to docs/documentation/assets/pepper_banner.png
diff --git a/documentation/docs/assets/pepper_whole.png b/docs/documentation/assets/pepper_whole.png
similarity index 100%
rename from documentation/docs/assets/pepper_whole.png
rename to docs/documentation/assets/pepper_whole.png
diff --git a/documentation/docs/assets/robot.svg b/docs/documentation/assets/robot.svg
similarity index 100%
rename from documentation/docs/assets/robot.svg
rename to docs/documentation/assets/robot.svg
diff --git a/documentation/docs/assets/supported_language.png b/docs/documentation/assets/supported_language.png
similarity index 100%
rename from documentation/docs/assets/supported_language.png
rename to docs/documentation/assets/supported_language.png
diff --git a/documentation/docs/brainstorm/ideas.md b/docs/documentation/brainstorm/ideas.md
similarity index 100%
rename from documentation/docs/brainstorm/ideas.md
rename to docs/documentation/brainstorm/ideas.md
diff --git a/documentation/docs/diagrams/assets/projectDiagram.png b/docs/documentation/diagrams/assets/projectDiagram.png
similarity index 100%
rename from documentation/docs/diagrams/assets/projectDiagram.png
rename to docs/documentation/diagrams/assets/projectDiagram.png
diff --git a/documentation/docs/diagrams/projectDiagram.drawio b/docs/documentation/diagrams/projectDiagram.drawio
similarity index 100%
rename from documentation/docs/diagrams/projectDiagram.drawio
rename to docs/documentation/diagrams/projectDiagram.drawio
diff --git a/documentation/docs/index.md b/docs/documentation/index.md
similarity index 100%
rename from documentation/docs/index.md
rename to docs/documentation/index.md
diff --git a/documentation/docs/opdracht/assignment.md b/docs/documentation/opdracht/assignment.md
similarity index 100%
rename from documentation/docs/opdracht/assignment.md
rename to docs/documentation/opdracht/assignment.md
diff --git a/documentation/docs/opdracht/clients.md b/docs/documentation/opdracht/clients.md
similarity index 100%
rename from documentation/docs/opdracht/clients.md
rename to docs/documentation/opdracht/clients.md
diff --git a/documentation/docs/opdracht/criteria.md b/docs/documentation/opdracht/criteria.md
similarity index 100%
rename from documentation/docs/opdracht/criteria.md
rename to docs/documentation/opdracht/criteria.md
diff --git a/documentation/docs/opdracht/links.md b/docs/documentation/opdracht/links.md
similarity index 100%
rename from documentation/docs/opdracht/links.md
rename to docs/documentation/opdracht/links.md
diff --git a/documentation/docs/opdracht/planning.md b/docs/documentation/opdracht/planning.md
similarity index 100%
rename from documentation/docs/opdracht/planning.md
rename to docs/documentation/opdracht/planning.md
diff --git a/documentation/docs/opdracht/research.md b/docs/documentation/opdracht/research.md
similarity index 100%
rename from documentation/docs/opdracht/research.md
rename to docs/documentation/opdracht/research.md
diff --git a/documentation/docs/robots/Comparisons.md b/docs/documentation/robots/Comparisons.md
similarity index 100%
rename from documentation/docs/robots/Comparisons.md
rename to docs/documentation/robots/Comparisons.md
diff --git a/documentation/docs/robots/NAOBOT.png b/docs/documentation/robots/NAOBOT.png
similarity index 100%
rename from documentation/docs/robots/NAOBOT.png
rename to docs/documentation/robots/NAOBOT.png
diff --git a/documentation/docs/robots/little-endian.md b/docs/documentation/robots/little-endian.md
similarity index 100%
rename from documentation/docs/robots/little-endian.md
rename to docs/documentation/robots/little-endian.md
diff --git a/documentation/docs/robots/nao.md b/docs/documentation/robots/nao.md
similarity index 100%
rename from documentation/docs/robots/nao.md
rename to docs/documentation/robots/nao.md
diff --git a/documentation/docs/robots/pepper.md b/docs/documentation/robots/pepper.md
similarity index 100%
rename from documentation/docs/robots/pepper.md
rename to docs/documentation/robots/pepper.md
diff --git a/documentation/teamdocumentatie/.gitkeep b/docs/teamdocumentatie/.gitkeep
similarity index 100%
rename from documentation/teamdocumentatie/.gitkeep
rename to docs/teamdocumentatie/.gitkeep
diff --git a/documentation/teamdocumentatie/sprint-reports/sprint-report-s1.md b/docs/teamdocumentatie/sprint-reports/sprint-report-s1.md
similarity index 100%
rename from documentation/teamdocumentatie/sprint-reports/sprint-report-s1.md
rename to docs/teamdocumentatie/sprint-reports/sprint-report-s1.md
diff --git a/documentation/teamdocumentatie/sprint-reports/sprint-report-s2.md b/docs/teamdocumentatie/sprint-reports/sprint-report-s2.md
similarity index 100%
rename from documentation/teamdocumentatie/sprint-reports/sprint-report-s2.md
rename to docs/teamdocumentatie/sprint-reports/sprint-report-s2.md
diff --git a/documentation/teamdocumentatie/sprint-reports/sprint-report-s3.md b/docs/teamdocumentatie/sprint-reports/sprint-report-s3.md
similarity index 100%
rename from documentation/teamdocumentatie/sprint-reports/sprint-report-s3.md
rename to docs/teamdocumentatie/sprint-reports/sprint-report-s3.md
diff --git a/documentation/teamdocumentatie/template_onderzoeksverslag.md b/docs/teamdocumentatie/template_onderzoeksverslag.md
similarity index 100%
rename from documentation/teamdocumentatie/template_onderzoeksverslag.md
rename to docs/teamdocumentatie/template_onderzoeksverslag.md
diff --git a/documentation/teamdocumentatie/template_probleemdefinitie.md b/docs/teamdocumentatie/template_probleemdefinitie.md
similarity index 100%
rename from documentation/teamdocumentatie/template_probleemdefinitie.md
rename to docs/teamdocumentatie/template_probleemdefinitie.md
diff --git a/documentation/teamdocumentatie/template_sprint_report.md b/docs/teamdocumentatie/template_sprint_report.md
similarity index 100%
rename from documentation/teamdocumentatie/template_sprint_report.md
rename to docs/teamdocumentatie/template_sprint_report.md
diff --git a/documentation/docs/.pages b/documentation/docs/.pages
deleted file mode 100644
index bd1578e..0000000
--- a/documentation/docs/.pages
+++ /dev/null
@@ -1,2 +0,0 @@
-nav:
-  - TI Portfolio Website: index.md
diff --git a/documentation/docs/brainstorm/mindmap.md b/documentation/docs/brainstorm/mindmap.md
deleted file mode 100644
index e69de29..0000000