diff --git a/docs/Instruction/tips/make_this_site.md b/docs/Instruction/tips/make_this_site.md
new file mode 100644
index 0000000000000000000000000000000000000000..27e8bdcd8403a473facf401f0da0828cdf729304
--- /dev/null
+++ b/docs/Instruction/tips/make_this_site.md
@@ -0,0 +1,106 @@
+# How to make this site
+
+## Get `fabacademy-student-template`
+
+```
+% cd repos/
+% git clone git@gitlab.fabcloud.org:fibasile/fabacademy-student-template.git fa2022_kannai_site
+% ls
+fa2022_kannai_site
+% cd fa2022_kannai_site
+% ls
+requirements.txt
+$ pip install -r requirements.txt
+```
+
+## Try Other colors
+
+```
+% cd fa2022_kannai_site
+% ls
+README.md		mkdocs.yml
+docs			requirements.txt
+% nano mkdocs.yml
+```
+
+
+mkdocs.yml
+```
+# add
+extra_css:
+  - stylesheets/extra.css
+
+theme:
+  name: material
+
+# comment out
+  #palette:
+    # try other colors https://squidfunk.github.io/mkdocs-material/getting-started/#primary-colors
+    #primary: deep
+    #accent: red
+```
+
+
+```
+% cd docs/
+% nano stylesheets/extra.css
+```
+stylesheets/extra.css
+```
+:root {
+  --md-primary-fg-color:        #5B9BAF;
+  --md-primary-fg-color--light: #5B9BAF;
+  --md-primary-fg-color--dark:  #5B9BAF;
+
+  --md-accent-fg-color: #5B9BAF;
+  --md-accent-bg-color: #5B9BAF;
+}
+```
+
+
+## Change remote repo
+
+This is instructions from fabcloud
+```
+Push an existing Git repository
+cd existing_repo
+git remote rename origin old-origin
+git remote add origin git@gitlab.fabcloud.org:academany/fabacademy/2022/labs/kannai/site.git
+git push -u origin --all
+git push -u origin --tags
+```
+
+```
+% cd fa2022_kannai_site
+% git remote -v
+origin	git@gitlab.fabcloud.org:fibasile/fabacademy-student-template.git (fetch)
+origin	git@gitlab.fabcloud.org:fibasile/fabacademy-student-template.git (push)
+
+% git remote rename origin old-origin
+% git remote -v                      
+old-origin	git@gitlab.fabcloud.org:fibasile/fabacademy-student-template.git (fetch)
+old-origin	git@gitlab.fabcloud.org:fibasile/fabacademy-student-template.git (push)
+
+% git remote add origin git@gitlab.fabcloud.org:academany/fabacademy/2022/labs/kannai/site.git
+
+% git remote -v  
+old-origin	git@gitlab.fabcloud.org:fibasile/fabacademy-student-template.git (fetch)
+old-origin	git@gitlab.fabcloud.org:fibasile/fabacademy-student-template.git (push)
+origin	git@gitlab.fabcloud.org:academany/fabacademy/2022/labs/kannai/site.git (fetch)
+origin	git@gitlab.fabcloud.org:academany/fabacademy/2022/labs/kannai/site.git (push)
+
+% git push -u origin --all
+Enumerating objects: 195, done.
+Counting objects: 100% (195/195), done.
+Delta compression using up to 4 threads
+Compressing objects: 100% (79/79), done.
+Writing objects: 100% (195/195), 410.64 KiB | 58.66 MiB/s, done.
+Total 195 (delta 104), reused 195 (delta 104)
+remote: Resolving deltas: 100% (104/104), done.
+To gitlab.fabcloud.org:academany/fabacademy/2022/labs/kannai/site.git
+ * [new branch]      master -> master
+Branch 'master' set up to track remote branch 'master' from 'origin'.
+
+% git push -u origin --tags
+Everything up-to-date
+```
diff --git a/docs/Instruction/tips_list.md b/docs/Instruction/tips_list.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/docs/Instruction/week01.md b/docs/Instruction/week01.md
new file mode 100644
index 0000000000000000000000000000000000000000..360bc37769f82f20c2f4d7ac43012dd605c46948
--- /dev/null
+++ b/docs/Instruction/week01.md
@@ -0,0 +1,3 @@
+# 1. Principles and practices / Project management
+
+No Weekly Group Assignment
diff --git a/docs/assignments/week03.md b/docs/Instruction/week02.md
similarity index 99%
rename from docs/assignments/week03.md
rename to docs/Instruction/week02.md
index e8f7c0aa91181b1de35b1385fbcf4f2ea5f57352..28f7c75e5f70c7ec057a668889f9b98dd56e5238 100644
--- a/docs/assignments/week03.md
+++ b/docs/Instruction/week02.md
@@ -1,4 +1,4 @@
-# 3. Computer Aided design
+# 2. Computer Aided design
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/assignments/week04.md b/docs/Instruction/week03.md
similarity index 99%
rename from docs/assignments/week04.md
rename to docs/Instruction/week03.md
index 025a5c185d45655f304319f24de5f28fbbf991e5..f3085790eacaf6aeb4e72994c48c5d18c97ea03a 100644
--- a/docs/assignments/week04.md
+++ b/docs/Instruction/week03.md
@@ -1,4 +1,4 @@
-# 4. Computer controlled cutting
+# 3. Computer controlled cutting
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/assignments/week05.md b/docs/Instruction/week04.md
similarity index 99%
rename from docs/assignments/week05.md
rename to docs/Instruction/week04.md
index 0389b949432b956f560df55fe132e7d1446a303c..a7d2fae55ba50ce217219323b90f356f6e8875c8 100644
--- a/docs/assignments/week05.md
+++ b/docs/Instruction/week04.md
@@ -1,4 +1,4 @@
-# 5. Electronics production
+# 4. Electronics production
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/assignments/week06.md b/docs/Instruction/week05.md
similarity index 99%
rename from docs/assignments/week06.md
rename to docs/Instruction/week05.md
index 027e62937685ab7bc2163b93be72c3dc1799de0f..229ce83f60ccbb939bfb04a487cd82f9f936fa6e 100644
--- a/docs/assignments/week06.md
+++ b/docs/Instruction/week05.md
@@ -1,4 +1,4 @@
-# 6. 3D Scanning and printing
+# 5. 3D Scanning and printing
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/assignments/week07.md b/docs/Instruction/week06.md
similarity index 99%
rename from docs/assignments/week07.md
rename to docs/Instruction/week06.md
index 44039eab4b2e2a8c89a14997b7ec928c15ad77f9..1930f37e3ac92e8521334700817d13f9a592a071 100644
--- a/docs/assignments/week07.md
+++ b/docs/Instruction/week06.md
@@ -1,4 +1,4 @@
-# 7. Electronics design
+# 6. Electronics design
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/Instruction/week07.md b/docs/Instruction/week07.md
new file mode 100644
index 0000000000000000000000000000000000000000..741e81a75bd5644b642aeb6337c71deaea87323c
--- /dev/null
+++ b/docs/Instruction/week07.md
@@ -0,0 +1,61 @@
+# 7. Computer controlled machining
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/assignments/week09.md b/docs/Instruction/week08.md
similarity index 99%
rename from docs/assignments/week09.md
rename to docs/Instruction/week08.md
index 20df450e8fb77cfccc5a0fc2f7c1890c0c8616c2..cf161101dab49f35cca25324f2335095a320f6e5 100644
--- a/docs/assignments/week09.md
+++ b/docs/Instruction/week08.md
@@ -1,4 +1,4 @@
-# 9. Embedded programming
+# 8. Embedded programming
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/Instruction/week09.md b/docs/Instruction/week09.md
new file mode 100644
index 0000000000000000000000000000000000000000..5126d24c79f5b6121205c2931c16ad6ba1f2c5fd
--- /dev/null
+++ b/docs/Instruction/week09.md
@@ -0,0 +1,61 @@
+# 9. Molding and casting
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/assignments/week17.md b/docs/Instruction/week10.md
similarity index 99%
rename from docs/assignments/week17.md
rename to docs/Instruction/week10.md
index fdcbd360c1055d69668f60e02d748c75eeb920d3..e9955f86d004a049af5b2dc09ec69e87b8a89208 100644
--- a/docs/assignments/week17.md
+++ b/docs/Instruction/week10.md
@@ -1,4 +1,4 @@
-# 17. Machine design
+# 10. Output devices
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/Instruction/week11.md b/docs/Instruction/week11.md
new file mode 100644
index 0000000000000000000000000000000000000000..3c233de12c55be174a903a576f4ad61d41d66afd
--- /dev/null
+++ b/docs/Instruction/week11.md
@@ -0,0 +1,61 @@
+# 11. Mechanical design / Machine design
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/assignments/week11.md b/docs/Instruction/week12.md
similarity index 99%
rename from docs/assignments/week11.md
rename to docs/Instruction/week12.md
index b3088f0a601af402c0e8b831c5eca9b0adee1fb8..56e158bd4e1135c275d8f980237195b732d5a815 100644
--- a/docs/assignments/week11.md
+++ b/docs/Instruction/week12.md
@@ -1,4 +1,4 @@
-# 11. Input devices
+# 12. Input devices
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/assignments/week13.md b/docs/Instruction/week13.md
similarity index 98%
rename from docs/assignments/week13.md
rename to docs/Instruction/week13.md
index 0291406ff14ad5ce727dec4c2477107d1d6b7fd8..def45a076612fa6c8dab926a3c1f57655f5e8846 100644
--- a/docs/assignments/week13.md
+++ b/docs/Instruction/week13.md
@@ -1,4 +1,4 @@
-# 13. Applications and implications
+# 13. Networking and communications
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/assignments/week14.md b/docs/Instruction/week14.md
similarity index 98%
rename from docs/assignments/week14.md
rename to docs/Instruction/week14.md
index 82c4169b0acbd6f1ea9201ee25028f7e749c0c96..e4bfd47f3697199cc5e624dc4bcca855416417e6 100644
--- a/docs/assignments/week14.md
+++ b/docs/Instruction/week14.md
@@ -1,4 +1,4 @@
-# 14. Networking and communications
+# 14. Interface and application programming
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/assignments/week18.md b/docs/Instruction/week15.md
similarity index 99%
rename from docs/assignments/week18.md
rename to docs/Instruction/week15.md
index 77b124f0457a404d58440b612a6935d9ea8b95ee..8a5e7c8b786b5f57da45c0ddc3040284a2fa353e 100644
--- a/docs/assignments/week18.md
+++ b/docs/Instruction/week15.md
@@ -1,4 +1,4 @@
-# 18. Wildcard week
+# 15. Wildcard week
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/Instruction/week16.md b/docs/Instruction/week16.md
new file mode 100644
index 0000000000000000000000000000000000000000..6e1f8834b55031e1f1bdb1cd4b64e7334aebe230
--- /dev/null
+++ b/docs/Instruction/week16.md
@@ -0,0 +1,61 @@
+# 16. Applications and implications
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Instruction/week17.md b/docs/Instruction/week17.md
new file mode 100644
index 0000000000000000000000000000000000000000..a8b43d2f7480a7bb2d6b219c1631a101ff2c8515
--- /dev/null
+++ b/docs/Instruction/week17.md
@@ -0,0 +1,61 @@
+# 17. Invention, intellectual property and income
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/assignments/week10.md b/docs/Instruction/week18.md
similarity index 99%
rename from docs/assignments/week10.md
rename to docs/Instruction/week18.md
index 03c95f84e30e20fd80767ce85854366229df1970..1e1b6a1877be3b743d9263acd6ebda5f2966f09e 100644
--- a/docs/assignments/week10.md
+++ b/docs/Instruction/week18.md
@@ -1,4 +1,4 @@
-# 10. Molding and casting
+# 18. Project development
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/projects/final-project.md b/docs/Machine_Building/final-project.md
similarity index 100%
rename from docs/projects/final-project.md
rename to docs/Machine_Building/final-project.md
diff --git a/docs/projects/sample-project.md b/docs/Machine_Building/sample-project.md
similarity index 100%
rename from docs/projects/sample-project.md
rename to docs/Machine_Building/sample-project.md
diff --git a/docs/Weekly_Group_Assignments/week01.md b/docs/Weekly_Group_Assignments/week01.md
new file mode 100644
index 0000000000000000000000000000000000000000..03c0bca1d8bebc5ded6607b7b7aed59ce9b22a66
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week01.md
@@ -0,0 +1,5 @@
+# 1. Principles and practices / Project management
+
+No Weekly Group Assignment
+
+![](../images/home/tear_deer.gif){width=300}
diff --git a/docs/Weekly_Group_Assignments/week02.md b/docs/Weekly_Group_Assignments/week02.md
new file mode 100644
index 0000000000000000000000000000000000000000..c9215c926a2ecacb56734fbc64264ee43fd41f73
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week02.md
@@ -0,0 +1,5 @@
+# 2. Computer Aided design
+
+No Weekly Group Assignment
+
+![](../images/home/tear_deer.gif){width=300}
diff --git a/docs/Weekly_Group_Assignments/week03.md b/docs/Weekly_Group_Assignments/week03.md
new file mode 100644
index 0000000000000000000000000000000000000000..f3085790eacaf6aeb4e72994c48c5d18c97ea03a
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week03.md
@@ -0,0 +1,61 @@
+# 3. Computer controlled cutting
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Weekly_Group_Assignments/week04.md b/docs/Weekly_Group_Assignments/week04.md
new file mode 100644
index 0000000000000000000000000000000000000000..a7d2fae55ba50ce217219323b90f356f6e8875c8
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week04.md
@@ -0,0 +1,61 @@
+# 4. Electronics production
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Weekly_Group_Assignments/week05.md b/docs/Weekly_Group_Assignments/week05.md
new file mode 100644
index 0000000000000000000000000000000000000000..229ce83f60ccbb939bfb04a487cd82f9f936fa6e
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week05.md
@@ -0,0 +1,61 @@
+# 5. 3D Scanning and printing
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/assignments/week02.md b/docs/Weekly_Group_Assignments/week06.md
similarity index 99%
rename from docs/assignments/week02.md
rename to docs/Weekly_Group_Assignments/week06.md
index d38843a182864c31b2572b5027cbcdb96948d9e4..1930f37e3ac92e8521334700817d13f9a592a071 100644
--- a/docs/assignments/week02.md
+++ b/docs/Weekly_Group_Assignments/week06.md
@@ -1,4 +1,4 @@
-# 2. Project management
+# 6. Electronics design
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/Weekly_Group_Assignments/week07.md b/docs/Weekly_Group_Assignments/week07.md
new file mode 100644
index 0000000000000000000000000000000000000000..741e81a75bd5644b642aeb6337c71deaea87323c
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week07.md
@@ -0,0 +1,61 @@
+# 7. Computer controlled machining
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Weekly_Group_Assignments/week08.md b/docs/Weekly_Group_Assignments/week08.md
new file mode 100644
index 0000000000000000000000000000000000000000..cf161101dab49f35cca25324f2335095a320f6e5
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week08.md
@@ -0,0 +1,61 @@
+# 8. Embedded programming
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Weekly_Group_Assignments/week09.md b/docs/Weekly_Group_Assignments/week09.md
new file mode 100644
index 0000000000000000000000000000000000000000..5126d24c79f5b6121205c2931c16ad6ba1f2c5fd
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week09.md
@@ -0,0 +1,61 @@
+# 9. Molding and casting
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Weekly_Group_Assignments/week10.md b/docs/Weekly_Group_Assignments/week10.md
new file mode 100644
index 0000000000000000000000000000000000000000..e9955f86d004a049af5b2dc09ec69e87b8a89208
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week10.md
@@ -0,0 +1,61 @@
+# 10. Output devices
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Weekly_Group_Assignments/week11.md b/docs/Weekly_Group_Assignments/week11.md
new file mode 100644
index 0000000000000000000000000000000000000000..3c233de12c55be174a903a576f4ad61d41d66afd
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week11.md
@@ -0,0 +1,61 @@
+# 11. Mechanical design / Machine design
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/assignments/week12.md b/docs/Weekly_Group_Assignments/week12.md
similarity index 99%
rename from docs/assignments/week12.md
rename to docs/Weekly_Group_Assignments/week12.md
index d4ad6396051c9d4bc00b6982a3845580f0a276c0..56e158bd4e1135c275d8f980237195b732d5a815 100644
--- a/docs/assignments/week12.md
+++ b/docs/Weekly_Group_Assignments/week12.md
@@ -1,4 +1,4 @@
-# 12. Output devices
+# 12. Input devices
 
 This week I worked on defining my final project idea and started to getting used to the documentation process.
 
diff --git a/docs/Weekly_Group_Assignments/week13.md b/docs/Weekly_Group_Assignments/week13.md
new file mode 100644
index 0000000000000000000000000000000000000000..def45a076612fa6c8dab926a3c1f57655f5e8846
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week13.md
@@ -0,0 +1,61 @@
+# 13. Networking and communications
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Weekly_Group_Assignments/week14.md b/docs/Weekly_Group_Assignments/week14.md
new file mode 100644
index 0000000000000000000000000000000000000000..e4bfd47f3697199cc5e624dc4bcca855416417e6
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week14.md
@@ -0,0 +1,61 @@
+# 14. Interface and application programming
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Weekly_Group_Assignments/week15.md b/docs/Weekly_Group_Assignments/week15.md
new file mode 100644
index 0000000000000000000000000000000000000000..8a5e7c8b786b5f57da45c0ddc3040284a2fa353e
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week15.md
@@ -0,0 +1,61 @@
+# 15. Wildcard week
+
+This week I worked on defining my final project idea and started to getting used to the documentation process.
+
+## Research
+
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+## Useful links
+
+- [Jekyll](http://jekyll.org)
+- [Google](http://google.com)
+- [Markdown](https://en.wikipedia.org/wiki/Markdown)
+
+## Code Example
+
+Use the three backticks to separate code.
+
+```
+// the setup function runs once when you press reset or power the board
+void setup() {
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+
+// the loop function runs over and over again forever
+void loop() {
+  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                       // wait for a second
+  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
+  delay(1000);                       // wait for a second
+}
+```
+
+## Gallery
+
+![](../images/sample-photo.jpg)
+
+## Video
+
+### From Vimeo
+
+<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+
+### From Youtube
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## 3D Models
+
+<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
+
+<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
+    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
+    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
+    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
+</p>
+</div>
diff --git a/docs/Weekly_Group_Assignments/week16.md b/docs/Weekly_Group_Assignments/week16.md
new file mode 100644
index 0000000000000000000000000000000000000000..f1a6029a644c785382a3f60c5fc7b8c86546852c
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week16.md
@@ -0,0 +1,5 @@
+# 16. Applications and implications
+
+No Weekly Group Assignment
+
+![](../images/home/tear_deer.gif){width=300}
diff --git a/docs/Weekly_Group_Assignments/week17.md b/docs/Weekly_Group_Assignments/week17.md
new file mode 100644
index 0000000000000000000000000000000000000000..43a3a81c34966e2ec2acbb2da342030f3025ee86
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week17.md
@@ -0,0 +1,5 @@
+# 17. Invention, intellectual property and income
+
+No Weekly Group Assignment
+
+![](../images/home/tear_deer.gif){width=300}
diff --git a/docs/Weekly_Group_Assignments/week18.md b/docs/Weekly_Group_Assignments/week18.md
new file mode 100644
index 0000000000000000000000000000000000000000..4a73ea4ec9e536254826c51c78e0bdfb9ddc5684
--- /dev/null
+++ b/docs/Weekly_Group_Assignments/week18.md
@@ -0,0 +1,5 @@
+# 18. Project development
+
+No Weekly Group Assignment
+
+![](../images/home/tear_deer.gif){width=300}
diff --git a/docs/about/index.md b/docs/about/index.md
deleted file mode 100644
index 3a9ec3f8b75c0ab2d0a42a85f81e713dcd467df5..0000000000000000000000000000000000000000
--- a/docs/about/index.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# About me
-
-![](../images/avatar-photo.jpg)
-
-Hi! I am Emma Brewer. I am an art director & graphic designer based in New York City working on branding, visual identities, editorial design and web design.
-
-Visit this website to see my work!
-
-## My background
-
-I was born in a nice city called..
-
-## Previous work
-
-I'm a paragraph. Edit the page on Gitlab to add your own text and edit me. I’m a great place for you to tell a story and let your users know a little more about you.​
-
-### Project A
-
-This is an image from an external site:
-
-![This is the image caption](https://images.unsplash.com/photo-1512436991641-6745cdb1723f?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=ad25f4eb5444edddb0c5fb252a7f1dce&auto=format&fit=crop&w=900&q=80)
-
-While this is an image from the assets/images folder. Never use absolute paths (starting with /) when linking local images, always relative.
-
-![This is another caption](../images/sample-photo.jpg)
diff --git a/docs/about/agreement.md b/docs/about_my_lab/agreement.md
similarity index 100%
rename from docs/about/agreement.md
rename to docs/about_my_lab/agreement.md
diff --git a/docs/about_my_lab/index.md b/docs/about_my_lab/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..60e1387395b4f888100a6cdd0961d68cdaff267f
--- /dev/null
+++ b/docs/about_my_lab/index.md
@@ -0,0 +1,3 @@
+# About Fab Lab Kannai
+
+![](../images/home/painting.jpg)
diff --git a/docs/assignments/week01.md b/docs/assignments/week01.md
deleted file mode 100644
index 1551e34ad818f5ea02ed4b62212fdc8c714789ea..0000000000000000000000000000000000000000
--- a/docs/assignments/week01.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# 1. Principles and practices
-
-This week I worked on defining my final project idea and started to getting used to the documentation process.
-
-## Research
-
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-## Useful links
-
-- [Jekyll](http://jekyll.org)
-- [Google](http://google.com)
-- [Markdown](https://en.wikipedia.org/wiki/Markdown)
-
-## Code Example
-
-Use the three backticks to separate code.
-
-```
-// the setup function runs once when you press reset or power the board
-void setup() {
-  // initialize digital pin LED_BUILTIN as an output.
-  pinMode(LED_BUILTIN, OUTPUT);
-}
-
-// the loop function runs over and over again forever
-void loop() {
-  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
-  delay(1000);                       // wait for a second
-  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
-  delay(1000);                       // wait for a second
-}
-```
-
-## Gallery
-
-![](../images/sample-photo.jpg)
-
-## Video
-
-### From Vimeo
-
-<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
-
-### From Youtube
-
-<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
-
-## 3D Models
-
-<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
-
-<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
-    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
-    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
-    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
-</p>
-</div>
-
-
-## Use HTML
-
-You may also embed HTML in your markdown files
-
-<hr />
-
-
-Try having a seperator line
-
-
-<hr />
-
-<table border="1">
-	<thead>
-		<tr>
-			<th>ID</th>
-			<th>First Name</th>
-			<th>Last Name</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>235312</td>
-			<td>John</td>
-			<td>Doe</td>
-		</tr>
-		<tr>
-			<td>453123</td>
-			<td>Mark</td>
-			<td>Jones</td>
-		</tr>
-		<tr>
-			<td>998332</td>
-			<td>Jonathan</td>
-			<td>Smith</td>
-		</tr>
-		<tr>
-			<td>345612</td>
-			<td>Andrew</td>
-			<td>McArthur</td>
-		</tr>
-		<tr>
-			<td>453123</td>
-			<td>Adam</td>
-			<td>Fuller</td>
-		</tr>
-	</tbody>
-</table>
diff --git a/docs/assignments/week08.md b/docs/assignments/week08.md
deleted file mode 100644
index 613ae35e4dfa4c3c99000b7e864d4fd258088df6..0000000000000000000000000000000000000000
--- a/docs/assignments/week08.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# 8. Computer controlled machining
-
-This week I worked on defining my final project idea and started to getting used to the documentation process.
-
-## Research
-
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-## Useful links
-
-- [Jekyll](http://jekyll.org)
-- [Google](http://google.com)
-- [Markdown](https://en.wikipedia.org/wiki/Markdown)
-
-## Code Example
-
-Use the three backticks to separate code.
-
-```
-// the setup function runs once when you press reset or power the board
-void setup() {
-  // initialize digital pin LED_BUILTIN as an output.
-  pinMode(LED_BUILTIN, OUTPUT);
-}
-
-// the loop function runs over and over again forever
-void loop() {
-  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
-  delay(1000);                       // wait for a second
-  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
-  delay(1000);                       // wait for a second
-}
-```
-
-## Gallery
-
-![](../images/sample-photo.jpg)
-
-## Video
-
-### From Vimeo
-
-<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
-
-### From Youtube
-
-<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
-
-## 3D Models
-
-<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
-
-<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
-    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
-    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
-    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
-</p>
-</div>
diff --git a/docs/assignments/week15.md b/docs/assignments/week15.md
deleted file mode 100644
index 09a7ed57d0e4acdb4965044fa2ab68e7784ce85b..0000000000000000000000000000000000000000
--- a/docs/assignments/week15.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# 15. Mechanical design
-
-This week I worked on defining my final project idea and started to getting used to the documentation process.
-
-## Research
-
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-## Useful links
-
-- [Jekyll](http://jekyll.org)
-- [Google](http://google.com)
-- [Markdown](https://en.wikipedia.org/wiki/Markdown)
-
-## Code Example
-
-Use the three backticks to separate code.
-
-```
-// the setup function runs once when you press reset or power the board
-void setup() {
-  // initialize digital pin LED_BUILTIN as an output.
-  pinMode(LED_BUILTIN, OUTPUT);
-}
-
-// the loop function runs over and over again forever
-void loop() {
-  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
-  delay(1000);                       // wait for a second
-  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
-  delay(1000);                       // wait for a second
-}
-```
-
-## Gallery
-
-![](../images/sample-photo.jpg)
-
-## Video
-
-### From Vimeo
-
-<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
-
-### From Youtube
-
-<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
-
-## 3D Models
-
-<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
-
-<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
-    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
-    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
-    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
-</p>
-</div>
diff --git a/docs/assignments/week16.md b/docs/assignments/week16.md
deleted file mode 100644
index b217fcb911948d69a8bd87d83680c20a5c111c00..0000000000000000000000000000000000000000
--- a/docs/assignments/week16.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# 16. Interface and application programming
-
-This week I worked on defining my final project idea and started to getting used to the documentation process.
-
-## Research
-
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-## Useful links
-
-- [Jekyll](http://jekyll.org)
-- [Google](http://google.com)
-- [Markdown](https://en.wikipedia.org/wiki/Markdown)
-
-## Code Example
-
-Use the three backticks to separate code.
-
-```
-// the setup function runs once when you press reset or power the board
-void setup() {
-  // initialize digital pin LED_BUILTIN as an output.
-  pinMode(LED_BUILTIN, OUTPUT);
-}
-
-// the loop function runs over and over again forever
-void loop() {
-  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
-  delay(1000);                       // wait for a second
-  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
-  delay(1000);                       // wait for a second
-}
-```
-
-## Gallery
-
-![](../images/sample-photo.jpg)
-
-## Video
-
-### From Vimeo
-
-<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
-
-### From Youtube
-
-<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
-
-## 3D Models
-
-<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
-
-<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
-    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
-    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
-    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
-</p>
-</div>
diff --git a/docs/assignments/week19.md b/docs/assignments/week19.md
deleted file mode 100644
index 4435eba56bd8f57dfb1355a033693745a44a4cdc..0000000000000000000000000000000000000000
--- a/docs/assignments/week19.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# 19. Invention, intellectual property and income
-
-This week I worked on defining my final project idea and started to getting used to the documentation process.
-
-## Research
-
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-## Useful links
-
-- [Jekyll](http://jekyll.org)
-- [Google](http://google.com)
-- [Markdown](https://en.wikipedia.org/wiki/Markdown)
-
-## Code Example
-
-Use the three backticks to separate code.
-
-```
-// the setup function runs once when you press reset or power the board
-void setup() {
-  // initialize digital pin LED_BUILTIN as an output.
-  pinMode(LED_BUILTIN, OUTPUT);
-}
-
-// the loop function runs over and over again forever
-void loop() {
-  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
-  delay(1000);                       // wait for a second
-  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
-  delay(1000);                       // wait for a second
-}
-```
-
-## Gallery
-
-![](../images/sample-photo.jpg)
-
-## Video
-
-### From Vimeo
-
-<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
-
-### From Youtube
-
-<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
-
-## 3D Models
-
-<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
-
-<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
-    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
-    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
-    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
-</p>
-</div>
diff --git a/docs/assignments/week20.md b/docs/assignments/week20.md
deleted file mode 100644
index 5929c33d7666b126962089d50149b93222ebe2bd..0000000000000000000000000000000000000000
--- a/docs/assignments/week20.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# 20. Project development
-
-This week I worked on defining my final project idea and started to getting used to the documentation process.
-
-## Research
-
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-> "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-## Useful links
-
-- [Jekyll](http://jekyll.org)
-- [Google](http://google.com)
-- [Markdown](https://en.wikipedia.org/wiki/Markdown)
-
-## Code Example
-
-Use the three backticks to separate code.
-
-```
-// the setup function runs once when you press reset or power the board
-void setup() {
-  // initialize digital pin LED_BUILTIN as an output.
-  pinMode(LED_BUILTIN, OUTPUT);
-}
-
-// the loop function runs over and over again forever
-void loop() {
-  digitalWrite(LED_BUILTIN, HIGH);   // turn the LED on (HIGH is the voltage level)
-  delay(1000);                       // wait for a second
-  digitalWrite(LED_BUILTIN, LOW);    // turn the LED off by making the voltage LOW
-  delay(1000);                       // wait for a second
-}
-```
-
-## Gallery
-
-![](../images/sample-photo.jpg)
-
-## Video
-
-### From Vimeo
-
-<iframe src="https://player.vimeo.com/video/10048961" width="640" height="480" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-<p><a href="https://vimeo.com/10048961">Sound Waves</a> from <a href="https://vimeo.com/radarboy">George Gally (Radarboy)</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
-
-### From Youtube
-
-<iframe width="560" height="315" src="https://www.youtube.com/embed/jjNgJFemlC4" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
-
-## 3D Models
-
-<div class="sketchfab-embed-wrapper"><iframe width="640" height="480" src="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915/embed" frameborder="0" allow="autoplay; fullscreen; vr" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
-
-<p style="font-size: 13px; font-weight: normal; margin: 5px; color: #4A4A4A;">
-    <a href="https://sketchfab.com/models/658c8f8a2f3042c3ad7bdedd83f1c915?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Dita&#39;s Gown</a>
-    by <a href="https://sketchfab.com/francisbitontistudio?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Francis Bitonti Studio</a>
-    on <a href="https://sketchfab.com?utm_medium=embed&utm_source=website&utm_campaign=share-popup" target="_blank" style="font-weight: bold; color: #1CAAD9;">Sketchfab</a>
-</p>
-</div>
diff --git a/docs/images/home/FabLabLannai_Logo2022-g.png b/docs/images/home/FabLabLannai_Logo2022-g.png
new file mode 100644
index 0000000000000000000000000000000000000000..674867011ecf59b81f7d471a3face81e571c0be2
Binary files /dev/null and b/docs/images/home/FabLabLannai_Logo2022-g.png differ
diff --git a/docs/images/home/FabLabLannai_Logo2022-tate-g.png b/docs/images/home/FabLabLannai_Logo2022-tate-g.png
new file mode 100644
index 0000000000000000000000000000000000000000..67d2ff6bf4639ca351fcecf5a4bf9c3d42f23070
Binary files /dev/null and b/docs/images/home/FabLabLannai_Logo2022-tate-g.png differ
diff --git a/docs/images/home/FabLabLannai_Logo2022-tate-w.png b/docs/images/home/FabLabLannai_Logo2022-tate-w.png
new file mode 100644
index 0000000000000000000000000000000000000000..0daa0e502e42dacab154da010b1f8b8881d649ab
Binary files /dev/null and b/docs/images/home/FabLabLannai_Logo2022-tate-w.png differ
diff --git a/docs/images/home/FabLabLannai_Logo2022-w.png b/docs/images/home/FabLabLannai_Logo2022-w.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c7dce30a0e4b732e22cda613f30708ad40ff55f
Binary files /dev/null and b/docs/images/home/FabLabLannai_Logo2022-w.png differ
diff --git a/docs/images/home/logo_slide.gif b/docs/images/home/logo_slide.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1c26841e380be2b6761a27b9e4aea3e1634624c6
Binary files /dev/null and b/docs/images/home/logo_slide.gif differ
diff --git a/docs/images/home/logo_slide_w.gif b/docs/images/home/logo_slide_w.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2a64ffef96166af7ee52c410ddc89f52cc000e4b
Binary files /dev/null and b/docs/images/home/logo_slide_w.gif differ
diff --git a/docs/images/home/painting.jpg b/docs/images/home/painting.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c01e9bbee10f6a86c8667b615f32a7886f5cf489
Binary files /dev/null and b/docs/images/home/painting.jpg differ
diff --git a/docs/images/home/tear_deer.gif b/docs/images/home/tear_deer.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9df4cd7ae509d0413b397f950c63bc17f5da1363
Binary files /dev/null and b/docs/images/home/tear_deer.gif differ
diff --git a/docs/index.md b/docs/index.md
index 685c6bdf656edabd72c6e20e88f8cd1aeda26d79..9c82097eb43c04f3cf77f41c6c80cb0a9f3880be 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,5 +1,8 @@
 # Home
 
+![](./images/home/logo_slide_w.gif){width=200}
+
+
 ## Hello, new student!
 
 ![](./images/week01/assignment-photo.jpg)
diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css
new file mode 100644
index 0000000000000000000000000000000000000000..aa7b39c425aef62a45a56fc038108a4cefe29a27
--- /dev/null
+++ b/docs/stylesheets/extra.css
@@ -0,0 +1,9 @@
+:root {
+  --md-primary-fg-color:        #5B9BAF;
+  --md-primary-fg-color--light: #5B9BAF;
+  --md-primary-fg-color--dark:  #5B9BAF;
+
+
+  --md-accent-fg-color: #5B9BAF;
+  --md-accent-bg-color: #5B9BAF;
+}
diff --git a/mkdocs.yml b/mkdocs.yml
index 0d0c5d608a0c4565237c878b9ef4dd26670bd260..dadbc769327dc43d7e9936d0619616e0d6a66271 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,10 +1,10 @@
 # Replace the text below to customize your site
-site_name: Your name - Fab Academy
-site_description: Fab Academy documentation site for Your Name
-site_author: Your name
+site_name:  FabLab Kannai - Fab Academy 2022
+site_description: Fab Academy documentation site for FabLab Kannai
+site_author: Yuichi TAMIYA
 copyright: Copyright 2022 Your name - Creative Commons Attribution Non Commercial
 
-site_url: http://fibasile.fabcloud.io/fabacademy-student-template/
+site_url: https://fabacademy.org/2022/labs/kannai/
 
 extra:
   # Set your own social media below (or remove)
@@ -19,12 +19,15 @@ extra:
     - icon: fontawesome/brands/linkedin
       link: "https://linkedin.com/in/academany"
 
+extra_css:
+  - stylesheets/extra.css
+
 theme:
   name: material
-  palette:
+  #palette:
     # try other colors https://squidfunk.github.io/mkdocs-material/getting-started/#primary-colors
-    primary: deep
-    accent: indigo
+    #primary: deep
+    #accent: red
   font:
     # See available fonts at https://fonts.google.com/
     text: Ubuntu
@@ -35,6 +38,7 @@ theme:
   features:
     - navigation.tabs
     - navigation.instant
+  #  - navigation.sections
 
 plugins:
   - search