diff --git a/README.md b/README.md
index 4f6d681..5d20a61 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,14 @@ Il frontend di Geografia
https://www.figma.com/file/Q5zVqd0YQNPZ8qWW4CjPDR/Geografia?node-id=0%3A1
+TODO:
+
+ - Completare view su tutti i componenti
+ - Sezione Write messages
+ - Stilizzare app
+ - Strutturare Handler
+ - Implementare libreria telegram
+
Ci sono 3 componenti principali dell'app:
- Backend a.k.a interprete (?) - https://git.tropici.net/ifdo/geografia
- Handler
diff --git a/geografia-vue/src/assets/demo_messages.json b/geografia-vue/src/assets/demo_messages.json
new file mode 100644
index 0000000..804c1b6
--- /dev/null
+++ b/geografia-vue/src/assets/demo_messages.json
@@ -0,0 +1,64 @@
+{
+ "history": [
+ {
+ "id": 1,
+ "picture": "../assets/cat_skate.png",
+ "name": "test-name1",
+ "last_message": "馃惐鉀革笍鉃★笍?",
+ "seen": false,
+ "date": "25/08/22",
+ "new_messages": 1,
+ "is_user": false
+ },
+ {
+ "id": 2,
+ "picture": "../assets/cat_skate.png",
+ "name": "test-name2",
+ "last_message": "馃惐鉀革笍鉃★笍?",
+ "seen": false,
+ "date": "25/08/22",
+ "new_messages": 1,
+ "is_user": true
+ },
+ {
+ "id": 3,
+ "picture": "../assets/cat_skate.png",
+ "name": "test-name3",
+ "last_message": "馃惐鉀革笍鉃★笍?",
+ "seen": false,
+ "date": "25/08/22",
+ "new_messages": 1,
+ "is_user": false
+ },
+ {
+ "id": 4,
+ "picture": "../assets/cat_skate.png",
+ "name": "test-name4",
+ "last_message": "馃惐鉀革笍鉃★笍?",
+ "seen": false,
+ "date": "25/08/22",
+ "new_messages": 1,
+ "is_user": true
+ },
+ {
+ "id": 5,
+ "picture": "../assets/cat_skate.png",
+ "name": "test-name5",
+ "last_message": "馃惐鉀革笍鉃★笍?",
+ "seen": false,
+ "date": "25/08/22",
+ "new_messages": 1,
+ "is_user": false
+ },
+ {
+ "id": 6,
+ "picture": "../assets/cat_skate.png",
+ "name": "test-name6",
+ "last_message": "馃惐鉀革笍鉃★笍?",
+ "seen": false,
+ "date": "25/08/22",
+ "new_messages": 1,
+ "is_user": true
+ }
+ ]
+}
diff --git a/geografia-vue/src/components/ChatHistory.vue b/geografia-vue/src/components/ChatHistory.vue
deleted file mode 100644
index 215ec64..0000000
--- a/geografia-vue/src/components/ChatHistory.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/geografia-vue/src/components/Keyboard.vue b/geografia-vue/src/components/keyboard/Keyboard.vue
similarity index 100%
rename from geografia-vue/src/components/Keyboard.vue
rename to geografia-vue/src/components/keyboard/Keyboard.vue
diff --git a/geografia-vue/src/components/KeyboardWord.vue b/geografia-vue/src/components/keyboard/KeyboardWord.vue
similarity index 100%
rename from geografia-vue/src/components/KeyboardWord.vue
rename to geografia-vue/src/components/keyboard/KeyboardWord.vue
diff --git a/geografia-vue/src/components/MessageComposition.vue b/geografia-vue/src/components/keyboard/MessageComposition.vue
similarity index 100%
rename from geografia-vue/src/components/MessageComposition.vue
rename to geografia-vue/src/components/keyboard/MessageComposition.vue
diff --git a/geografia-vue/src/components/single_chat/ChatHistory.vue b/geografia-vue/src/components/single_chat/ChatHistory.vue
new file mode 100644
index 0000000..2f330f4
--- /dev/null
+++ b/geografia-vue/src/components/single_chat/ChatHistory.vue
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/geografia-vue/src/components/ChatMsg.vue b/geografia-vue/src/components/single_chat/ChatMsg.vue
similarity index 100%
rename from geografia-vue/src/components/ChatMsg.vue
rename to geografia-vue/src/components/single_chat/ChatMsg.vue
diff --git a/geografia-vue/src/components/ChatView.vue b/geografia-vue/src/components/single_chat/ChatView.vue
similarity index 89%
rename from geografia-vue/src/components/ChatView.vue
rename to geografia-vue/src/components/single_chat/ChatView.vue
index bbe674f..9e7ac65 100644
--- a/geografia-vue/src/components/ChatView.vue
+++ b/geografia-vue/src/components/single_chat/ChatView.vue
@@ -1,5 +1,5 @@