diff --git a/documentation/30-design-and-architecture/design-specification.md b/documentation/30-architecture-and-design/design-specification.md
similarity index 100%
rename from documentation/30-design-and-architecture/design-specification.md
rename to documentation/30-architecture-and-design/design-specification.md
diff --git a/documentation/30-design-and-architecture/readme.txt b/documentation/30-architecture-and-design/readme.txt
similarity index 100%
rename from documentation/30-design-and-architecture/readme.txt
rename to documentation/30-architecture-and-design/readme.txt
diff --git a/documentation/30-design-and-architecture/software-architecture.md b/documentation/30-architecture-and-design/software-architecture.md
similarity index 100%
rename from documentation/30-design-and-architecture/software-architecture.md
rename to documentation/30-architecture-and-design/software-architecture.md
diff --git a/documentation/60-offers-and-billing/.gitkeep b/documentation/60-production/tbd.md
similarity index 100%
rename from documentation/60-offers-and-billing/.gitkeep
rename to documentation/60-production/tbd.md
diff --git a/documentation/70-sales-and-marketing/60-offers-and-billing/.gitkeep b/documentation/70-sales-and-marketing/60-offers-and-billing/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/documentation/60-offers-and-billing/esimerkki-lasku.md b/documentation/70-sales-and-marketing/60-offers-and-billing/esimerkki-lasku.md
similarity index 100%
rename from documentation/60-offers-and-billing/esimerkki-lasku.md
rename to documentation/70-sales-and-marketing/60-offers-and-billing/esimerkki-lasku.md
diff --git a/documentation/60-offers-and-billing/esimerkki-lasku.pdf b/documentation/70-sales-and-marketing/60-offers-and-billing/esimerkki-lasku.pdf
similarity index 100%
rename from documentation/60-offers-and-billing/esimerkki-lasku.pdf
rename to documentation/70-sales-and-marketing/60-offers-and-billing/esimerkki-lasku.pdf
diff --git a/documentation/60-offers-and-billing/harjoitus-lasku.md b/documentation/70-sales-and-marketing/60-offers-and-billing/harjoitus-lasku.md
similarity index 100%
rename from documentation/60-offers-and-billing/harjoitus-lasku.md
rename to documentation/70-sales-and-marketing/60-offers-and-billing/harjoitus-lasku.md
diff --git a/documentation/60-offers-and-billing/lasku-toimeksiantajalle.md b/documentation/70-sales-and-marketing/60-offers-and-billing/lasku-toimeksiantajalle.md
similarity index 100%
rename from documentation/60-offers-and-billing/lasku-toimeksiantajalle.md
rename to documentation/70-sales-and-marketing/60-offers-and-billing/lasku-toimeksiantajalle.md
diff --git a/documentation/60-offers-and-billing/tarjous-pohja.md b/documentation/70-sales-and-marketing/60-offers-and-billing/tarjous-pohja.md
similarity index 100%
rename from documentation/60-offers-and-billing/tarjous-pohja.md
rename to documentation/70-sales-and-marketing/60-offers-and-billing/tarjous-pohja.md
diff --git a/documentation/90-deliverables/kayttoohje.md b/documentation/80-reports-and-notes/90-deliverables/kayttoohje.md
similarity index 100%
rename from documentation/90-deliverables/kayttoohje.md
rename to documentation/80-reports-and-notes/90-deliverables/kayttoohje.md
diff --git a/documentation/90-deliverables/palvelu-info.md b/documentation/80-reports-and-notes/90-deliverables/palvelu-info.md
similarity index 100%
rename from documentation/90-deliverables/palvelu-info.md
rename to documentation/80-reports-and-notes/90-deliverables/palvelu-info.md
diff --git a/documentation/95-learning/pohja-henkilokohtainen-oppimiraportti.md b/documentation/90-lessons-learned/pohja-henkilokohtainen-oppimiraportti.md
similarity index 100%
rename from documentation/95-learning/pohja-henkilokohtainen-oppimiraportti.md
rename to documentation/90-lessons-learned/pohja-henkilokohtainen-oppimiraportti.md