diff --git a/THEME-README.md b/docs/THEME-README.md
similarity index 100%
rename from THEME-README.md
rename to docs/THEME-README.md
diff --git a/docs/comments_diagrams.mdj b/docs/diagrams/comments_diagrams.mdj
similarity index 100%
rename from docs/comments_diagrams.mdj
rename to docs/diagrams/comments_diagrams.mdj
diff --git a/docs/comments_domain_diagram.png b/docs/diagrams/comments_domain_diagram.png
similarity index 100%
rename from docs/comments_domain_diagram.png
rename to docs/diagrams/comments_domain_diagram.png
diff --git a/docs/comments_use_case_diagram.png b/docs/diagrams/comments_use_case_diagram.png
similarity index 100%
rename from docs/comments_use_case_diagram.png
rename to docs/diagrams/comments_use_case_diagram.png
diff --git a/docs/domain_model.pdf b/docs/diagrams/domain_model.pdf
similarity index 100%
rename from docs/domain_model.pdf
rename to docs/diagrams/domain_model.pdf
diff --git a/docs/domain_model.png b/docs/diagrams/domain_model.png
similarity index 100%
rename from docs/domain_model.png
rename to docs/diagrams/domain_model.png
diff --git a/docs/domain_model.uxf b/docs/diagrams/domain_model.uxf
similarity index 100%
rename from docs/domain_model.uxf
rename to docs/diagrams/domain_model.uxf
diff --git a/docs/use_case_diagram.pdf b/docs/diagrams/use_case_diagram.pdf
similarity index 100%
rename from docs/use_case_diagram.pdf
rename to docs/diagrams/use_case_diagram.pdf
diff --git a/docs/use_case_diagram.png b/docs/diagrams/use_case_diagram.png
similarity index 100%
rename from docs/use_case_diagram.png
rename to docs/diagrams/use_case_diagram.png
diff --git a/docs/use_case_diagram.uxf b/docs/diagrams/use_case_diagram.uxf
similarity index 100%
rename from docs/use_case_diagram.uxf
rename to docs/diagrams/use_case_diagram.uxf
diff --git a/docs/roadmap.md b/docs/roadmap.md
new file mode 100644
index 0000000000000000000000000000000000000000..dd2ee27edf253717e1291b9f6b55d98e94fcab6c
--- /dev/null
+++ b/docs/roadmap.md
@@ -0,0 +1,52 @@
+# 1.1
+
+## Design improvements
+
+## Features
+- add PWA functionality
+- Theme Manager
+
+## Comments
+- interaction via websockets
+- voting to comments
+- read, factorite, correct as attributes
+- sorting
+- export
+- search
+- presentation mode with color indication for participants
+- threshold to hide negative comments from view
+- give user option to withdraw their vote on a comment
+
+
+# 1.2
+
+## Performance improvements
+- use lazy-loading
+- enable Ahead-of-Time compiler
+- improve service worker strategy (load preference for offline/online etc.)
+- Production server performance analysis
+
+## Web Accessibility Initiative
+
+
+# 1.3
+
+## Improved role system
+
+### Break up role concept by not needing to log into specific roles
+
+### Moderators
+- implement moderators that have the same access rights (without being able to delete the room) as the owner of a room
+- add dialog to room to manage moderators
+- add blacklist/whitelist mode for comments
+- implement moderator view to monitor/manage incoming comments
+
+
+# 1.4
+
+## Bonus
+- mark room as "bonus" on creation
+- bonus rooms save the users id on comment and answer creation
+
+## New feedback view
+- implement a circle for the feedback