diff --git a/docs/git-submodule-workflow.md b/docs/git-submodule-workflow.md
index dbf46e28..9ffc4ba3 100644
--- a/docs/git-submodule-workflow.md
+++ b/docs/git-submodule-workflow.md
@@ -1,5 +1,7 @@
 # Git Submodule Workflow
 
+**ATTENTION: Adding submodules at the wrong place of the project will actually f&%k up your git if you want to remove them again. So please take all those steps with care!!!**
+
 1. Create a new repository on bitbucket
 2. Clone it and create the main file: `my_component.js`
 ```javascript
diff --git a/docs/refactor-todo.md b/docs/refactor-todo.md
new file mode 100644
index 00000000..76fdec19
--- /dev/null
+++ b/docs/refactor-todo.md
@@ -0,0 +1,13 @@
+# Refactor TODO
+
+*This should be a living document. So if you have any ideas for refactoring stuff, then feel free to add them to this document*
+
+- Get rid of all Mixins.
+- Make all standalone components independent from things like global utilities (GeneralUtils is maybe used in table for example)
+- Check if all polyfills are appropriately initialized and available: Compare to this
+- Extract all standalone components to their own folder structure and write application independent tests (+ figure out how to do that in a productive way) (fetch lib especially)
+- Refactor forms to generic-declarative form component
+- Check for mobile compatibility: Is site responsive anywhere?
+queryParams of the piece_list_store should all be reflected in the url and not a single component each should manipulate the URL bar (refactor pagination, use actions and state)
+- Refactor string-templating for api_urls
+- Use classNames plugin instead of if-conditional-classes