diff --git a/part-1/5-css-selectors/message-backgrounds.css b/part-1/5-css-selectors/message-backgrounds.css
deleted file mode 100644
index ffe4833..0000000
--- a/part-1/5-css-selectors/message-backgrounds.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add your CSS code below */
diff --git a/part-1/6-css-properties/styles.css b/part-1/6-css-properties/styles.css
deleted file mode 100644
index ffe4833..0000000
--- a/part-1/6-css-properties/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add your CSS code below */
diff --git a/part-1/8-advanced-selectors/styles.css b/part-1/8-advanced-selectors/styles.css
deleted file mode 100644
index d35c3c3..0000000
--- a/part-1/8-advanced-selectors/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Try different box model properties below */
diff --git a/part-2/10-media-queries/columns.css b/part-2/10-media-queries/columns.css
deleted file mode 100644
index 43e80d2..0000000
--- a/part-2/10-media-queries/columns.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add your own CSS code below */
diff --git a/part-2/11-flexbox/flexbox.css b/part-2/11-flexbox/flexbox.css
deleted file mode 100644
index 43e80d2..0000000
--- a/part-2/11-flexbox/flexbox.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add your own CSS code below */
diff --git a/part-2/12-justify-content/flexbox.css b/part-2/12-justify-content/flexbox.css
deleted file mode 100644
index 3c4c7ff..0000000
--- a/part-2/12-justify-content/flexbox.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.countries {
-  display: flex;
-}
-
-.countries--second .country {
-  padding: 0.5em;
-}
-
-/* Add your own CSS code below */
diff --git a/part-2/13-align-items/flexbox.css b/part-2/13-align-items/flexbox.css
deleted file mode 100644
index 3675a0d..0000000
--- a/part-2/13-align-items/flexbox.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.countries {
-  display: flex;
-}
-/* Add your own CSS code below */
diff --git a/part-2/14-order/flexbox.css b/part-2/14-order/flexbox.css
deleted file mode 100644
index ed621b7..0000000
--- a/part-2/14-order/flexbox.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.countries {
-  display: flex;
-}
-
-/* Add your own CSS code below */
diff --git a/part-2/15-align-self/flexbox.css b/part-2/15-align-self/flexbox.css
deleted file mode 100644
index ed621b7..0000000
--- a/part-2/15-align-self/flexbox.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.countries {
-  display: flex;
-}
-
-/* Add your own CSS code below */
diff --git a/part-2/16-more-flexbox/flexbox.css b/part-2/16-more-flexbox/flexbox.css
deleted file mode 100644
index ed621b7..0000000
--- a/part-2/16-more-flexbox/flexbox.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.countries {
-  display: flex;
-}
-
-/* Add your own CSS code below */
diff --git a/part-2/17-nav-menu/styles.css b/part-2/17-nav-menu/styles.css
deleted file mode 100644
index f04f4c7..0000000
--- a/part-2/17-nav-menu/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Write your media queries and flexbox CSS below */
diff --git a/part-3/24-dietary/index.html b/part-3/24-dietary/index.html
deleted file mode 100644
index 5593174..0000000
--- a/part-3/24-dietary/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>24 - Dietary Requirements - HTML, CSS and Git Exercises</title>
-    <link rel="stylesheet" href="/css/normalize.css" />
-    <link rel="stylesheet" href="/css/week3-forms.css" />
-  </head>
-
-  <body>
-    <div class="site-wrapper">
-      <main>
-        <h1>Codi Summit</h1>
-
-        <p>
-          Let us know if you have any dietary requirements so that we can provide you with the best,
-          yummy food.
-        </p>
-
-        <form>
-          <!-- Your multiple choice goes here -->
-          <button type="submit">Submit</button>
-        </form>
-      </main>
-    </div>
-  </body>
-</html>
diff --git a/part-3/25-shirt-size/styles.css b/part-3/25-shirt-size/styles.css
deleted file mode 100644
index f283157..0000000
--- a/part-3/25-shirt-size/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add your CSS below */
diff --git a/part-3/29-combined-skills/styles.css b/part-3/29-combined-skills/styles.css
deleted file mode 100644
index 43e80d2..0000000
--- a/part-3/29-combined-skills/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add your own CSS code below */
diff --git a/part-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
similarity index 95%
rename from part-1/1-parent-child/index.html
rename to week-1/1-parent-child/index.html
index 458a4cb..f58b7b2 100644
--- a/part-1/1-parent-child/index.html
+++ b/week-1/1-parent-child/index.html
@@ -27,6 +27,7 @@
           <p class="message__content">
             I can meet on Tuesday and Wednesday after 4.
           </p>
+          <span class="message__time">7:15pm</span> 
         </div>
       </div>
     </div>
diff --git a/part-1/1-parent-child/readme.md b/week-1/1-parent-child/readme.md
similarity index 100%
rename from part-1/1-parent-child/readme.md
rename to week-1/1-parent-child/readme.md
diff --git a/part-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html
similarity index 84%
rename from part-1/2-html-attributes/index.html
rename to week-1/2-html-attributes/index.html
index dc861fa..c45deca 100644
--- a/part-1/2-html-attributes/index.html
+++ b/week-1/2-html-attributes/index.html
@@ -23,18 +23,18 @@
         <div class="message">
           <div class="message__author">Luke</div>
           <p class="message__content">
-            Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
+            Let's meet at the <a href="https://goo.gl/maps/aza4h9nUBhn">iCafe</a> in Merchant City.
           </p>
           <span class="message__time">7:35pm</span>
         </div>
         <div class="message">
           <div class="message__author">Won</div>
           <p class="message__content">
-            Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
+            Ok! <img src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" alt="GIF" width="100%">
           </p>
           <span class="message__time">7:38pm</span>
         </div>
       </div>
     </div>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/part-1/2-html-attributes/readme.md b/week-1/2-html-attributes/readme.md
similarity index 100%
rename from part-1/2-html-attributes/readme.md
rename to week-1/2-html-attributes/readme.md
diff --git a/part-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
similarity index 53%
rename from part-1/3-semantic-html/index.html
rename to week-1/3-semantic-html/index.html
index 3640dea..47765e1 100644
--- a/part-1/3-semantic-html/index.html
+++ b/week-1/3-semantic-html/index.html
@@ -12,30 +12,30 @@
 
   <body>
     <div class="site-wrapper">
-      <div class="site-header">
-        <div class="site-header__title">Messages</div>
-      </div>
-      <div class="messages">
-        <div class="message">
+      <header role="banner" class="site-header">
+        <h1 class="site-header__title">Messages</h1>
+      </header>
+      <main role="main" class="messages">
+        <article class="message">
           <div class="message__author">Won</div>
           <p class="message__content">Where should we meet later?</p>
-          <span class="message__time">Mar 25, 2018 7:25pm</span>
-        </div>
-        <div class="message">
+          <time class="message__time" datetime="2018-03-25T19:25">Mar 25, 2018 7:25pm</time>
+        </article>
+        <article class="message">
           <div class="message__author">Luke</div>
           <p class="message__content">
-            Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
+            Let's meet at the <a href="https://goo.gl/maps/aza4h9nUBhn">iCafe</a> in Merchant City.
           </p>
-          <span class="message__time">Mar 25, 2018 7:35pm</span>
-        </div>
-        <div class="message">
+          <time class="message__time" datetime="2018-03-25T19:35">Mar 25, 2018 7:35pm</time>
+        </article>
+        <article class="message">
           <div class="message__author">Won</div>
           <p class="message__content">
-            Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
+            Ok! <img src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" width="100%">
           </p>
-          <span class="message__time">Mar 25, 2018 7:38pm</span>
-        </div>
-      </div>
+          <time class="message__time" datetime="2018-03-25T19:38">Mar 25, 2018 7:38pm</time>
+        </article>
+      </main>
       <div id="result" class="result"></div>
     </div>
     <script defer src="/js/3-result.js"></script>
diff --git a/part-1/3-semantic-html/readme.md b/week-1/3-semantic-html/readme.md
similarity index 100%
rename from part-1/3-semantic-html/readme.md
rename to week-1/3-semantic-html/readme.md
diff --git a/part-1/4-links-scripts/css/missing-styles.css b/week-1/4-links-scripts/css/missing-styles.css
similarity index 100%
rename from part-1/4-links-scripts/css/missing-styles.css
rename to week-1/4-links-scripts/css/missing-styles.css
diff --git a/part-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html
similarity index 92%
rename from part-1/4-links-scripts/index.html
rename to week-1/4-links-scripts/index.html
index 303c7fb..3150684 100644
--- a/part-1/4-links-scripts/index.html
+++ b/week-1/4-links-scripts/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8" />
     <title>4. Adding Links and Scripts - HTML, CSS and Git Exercises</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="stylesheet" href="css/missing-styles.css" />
   </head>
 
   <body>
@@ -33,5 +34,6 @@
         </div>
       </div>
     </div>
+    <script src="js/convertUrls.js"></script>
   </body>
 </html>
diff --git a/part-1/4-links-scripts/js/convertUrls.js b/week-1/4-links-scripts/js/convertUrls.js
similarity index 100%
rename from part-1/4-links-scripts/js/convertUrls.js
rename to week-1/4-links-scripts/js/convertUrls.js
diff --git a/part-1/4-links-scripts/readme.md b/week-1/4-links-scripts/readme.md
similarity index 100%
rename from part-1/4-links-scripts/readme.md
rename to week-1/4-links-scripts/readme.md
diff --git a/part-1/5-css-selectors/index.html b/week-1/5-css-selectors/index.html
similarity index 100%
rename from part-1/5-css-selectors/index.html
rename to week-1/5-css-selectors/index.html
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
new file mode 100644
index 0000000..b5ed7bf
--- /dev/null
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -0,0 +1,12 @@
+/* Add your CSS code below */
+#first-message {
+    background-color: red; 
+}
+
+.messages article {
+    background-color: cadetblue; 
+}
+
+.message--latest {
+    background-color: yellow; 
+}
\ No newline at end of file
diff --git a/part-1/5-css-selectors/readme.md b/week-1/5-css-selectors/readme.md
similarity index 100%
rename from part-1/5-css-selectors/readme.md
rename to week-1/5-css-selectors/readme.md
diff --git a/part-1/6-css-properties/index.html b/week-1/6-css-properties/index.html
similarity index 100%
rename from part-1/6-css-properties/index.html
rename to week-1/6-css-properties/index.html
diff --git a/part-1/6-css-properties/readme.md b/week-1/6-css-properties/readme.md
similarity index 100%
rename from part-1/6-css-properties/readme.md
rename to week-1/6-css-properties/readme.md
diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
new file mode 100644
index 0000000..065b2f1
--- /dev/null
+++ b/week-1/6-css-properties/styles.css
@@ -0,0 +1,21 @@
+/* Add your CSS code below */
+.message__content a {
+    color: red;
+    font-weight: bold;
+    text-decoration: none;
+  }
+  
+  .message__time {
+    font-size: 0.9rem;
+  }
+  
+  .message:last-child {
+    border-left: 4.5px solid blue;
+  }
+  
+  .message:first-child {
+    opacity: 0.4;
+  }
+  .message__content {
+    line-height: 3;
+  }
\ No newline at end of file
diff --git a/part-1/7-css-box/index.html b/week-1/7-css-box/index.html
similarity index 100%
rename from part-1/7-css-box/index.html
rename to week-1/7-css-box/index.html
diff --git a/part-1/7-css-box/readme.md b/week-1/7-css-box/readme.md
similarity index 100%
rename from part-1/7-css-box/readme.md
rename to week-1/7-css-box/readme.md
diff --git a/part-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
similarity index 74%
rename from part-1/7-css-box/styles.css
rename to week-1/7-css-box/styles.css
index 013b94f..c960812 100644
--- a/part-1/7-css-box/styles.css
+++ b/week-1/7-css-box/styles.css
@@ -4,3 +4,8 @@
   border-radius: 4px;
   background: #fff;
 }
+
+.country {
+  padding: 20px ;
+  margin: 5px;
+}
\ No newline at end of file
diff --git a/part-1/8-advanced-selectors/index.html b/week-1/8-advanced-selectors/index.html
similarity index 100%
rename from part-1/8-advanced-selectors/index.html
rename to week-1/8-advanced-selectors/index.html
diff --git a/part-1/8-advanced-selectors/readme.md b/week-1/8-advanced-selectors/readme.md
similarity index 100%
rename from part-1/8-advanced-selectors/readme.md
rename to week-1/8-advanced-selectors/readme.md
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
new file mode 100644
index 0000000..5d1d88b
--- /dev/null
+++ b/week-1/8-advanced-selectors/styles.css
@@ -0,0 +1,13 @@
+/* Try different box model properties below */
+.site-header > p {
+    color: white;
+    margin-bottom: 0;
+}
+.site-footer > p {
+    font-size: 12px;
+    text-align: center;
+}
+
+.message:last-child{
+    box-shadow: 4px 4px 0 #dba944;
+}
\ No newline at end of file
diff --git a/part-1/9-git-branch/index.html b/week-1/9-git-branch/index.html
similarity index 100%
rename from part-1/9-git-branch/index.html
rename to week-1/9-git-branch/index.html
diff --git a/part-1/9-git-branch/readme.md b/week-1/9-git-branch/readme.md
similarity index 100%
rename from part-1/9-git-branch/readme.md
rename to week-1/9-git-branch/readme.md
diff --git a/part-1/9-git-branch/styles.css b/week-1/9-git-branch/styles.css
similarity index 100%
rename from part-1/9-git-branch/styles.css
rename to week-1/9-git-branch/styles.css
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
new file mode 100644
index 0000000..ab45821
--- /dev/null
+++ b/week-2/10-media-queries/columns.css
@@ -0,0 +1,12 @@
+/* Add your own CSS code below */
+@media screen and (min-width: 768px) {
+  .countries {
+    columns: 2;
+  }
+}
+
+@media screen and (min-width: 1200px) {
+  .countries {
+    columns: 3;
+  }
+}
diff --git a/part-2/10-media-queries/index.html b/week-2/10-media-queries/index.html
similarity index 100%
rename from part-2/10-media-queries/index.html
rename to week-2/10-media-queries/index.html
diff --git a/part-2/10-media-queries/readme.md b/week-2/10-media-queries/readme.md
similarity index 100%
rename from part-2/10-media-queries/readme.md
rename to week-2/10-media-queries/readme.md
diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css
new file mode 100644
index 0000000..add3b78
--- /dev/null
+++ b/week-2/11-flexbox/flexbox.css
@@ -0,0 +1,15 @@
+/* Add your own CSS code below */
+.countries {
+  display: flex;
+}
+.countries--first {
+  flex-direction: row-reverse;
+}
+
+.countries--second {
+  flex-direction: column;
+}
+
+.countries--third {
+  flex-direction: column-reverse;
+}
diff --git a/part-2/11-flexbox/index.html b/week-2/11-flexbox/index.html
similarity index 100%
rename from part-2/11-flexbox/index.html
rename to week-2/11-flexbox/index.html
diff --git a/part-2/11-flexbox/readme.md b/week-2/11-flexbox/readme.md
similarity index 100%
rename from part-2/11-flexbox/readme.md
rename to week-2/11-flexbox/readme.md
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
new file mode 100644
index 0000000..dd1c93f
--- /dev/null
+++ b/week-2/12-justify-content/flexbox.css
@@ -0,0 +1,23 @@
+.countries {
+  display: flex;
+}
+
+.countries--second .country {
+  padding: 0.5em;
+}
+
+/* Add your own CSS code below */
+.countries--first {
+  justify-content: right;
+}
+.countries--second {
+  justify-content: space-around;
+}
+.countries--third {
+  flex-direction: column;
+  justify-content: flex-end;
+}
+.countries--fourth {
+  flex-direction: column-reverse;
+  justify-content: space-evenly;
+}
diff --git a/part-2/12-justify-content/index.html b/week-2/12-justify-content/index.html
similarity index 100%
rename from part-2/12-justify-content/index.html
rename to week-2/12-justify-content/index.html
diff --git a/part-2/12-justify-content/readme.md b/week-2/12-justify-content/readme.md
similarity index 100%
rename from part-2/12-justify-content/readme.md
rename to week-2/12-justify-content/readme.md
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
new file mode 100644
index 0000000..93fa459
--- /dev/null
+++ b/week-2/13-align-items/flexbox.css
@@ -0,0 +1,23 @@
+.countries {
+  display: flex;
+}
+/* Add your own CSS code below */
+.countries--first {
+  flex-direction: row;
+  align-items: center;
+}
+
+.countries--second {
+  flex-direction: row-reverse;
+  align-items: last baseline;
+}
+
+.countries--third {
+  flex-direction: column;
+  align-items: flex-end;
+}
+
+.countries--fourth {
+  flex-direction: column-reverse;
+  align-items: center;
+}
diff --git a/part-2/13-align-items/index.html b/week-2/13-align-items/index.html
similarity index 100%
rename from part-2/13-align-items/index.html
rename to week-2/13-align-items/index.html
diff --git a/part-2/13-align-items/readme.md b/week-2/13-align-items/readme.md
similarity index 100%
rename from part-2/13-align-items/readme.md
rename to week-2/13-align-items/readme.md
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
new file mode 100644
index 0000000..e11f6d0
--- /dev/null
+++ b/week-2/14-order/flexbox.css
@@ -0,0 +1,63 @@
+.countries {
+  display: flex;
+}
+
+/* Add your own CSS code below */
+.countries--first .country--brazil {
+  order: 5;
+}
+
+.countries--first .country--croatia {
+  order: 1;
+}
+
+.countries--first .country--ethiopia {
+  order: 2;
+}
+
+.countries--first .country--laos {
+  order: 3;
+}
+
+.countries--first .country--uganda {
+  order: 4;
+}
+
+.countries--second .country--brazil {
+  order: 4;
+}
+
+.countries--second .country--croatia {
+  order: 1;
+}
+
+.countries--second .country--ethiopia {
+  order: 2;
+}
+
+.countries--second .country--laos {
+  order: 3;
+}
+
+.countries--second .country--uganda {
+  order: 5;
+}
+
+.countries--third .country--brazil {
+  order: 5;
+}
+
+.countries--third .country--croatia {
+  order: 4;
+}
+
+.countries--third .country--ethiopia {
+  order: 3;
+}
+
+.countries--third .country--laos {
+  order: 2;
+}
+.countries--third .country--uganda {
+  order: 1;
+}
diff --git a/part-2/14-order/index.html b/week-2/14-order/index.html
similarity index 100%
rename from part-2/14-order/index.html
rename to week-2/14-order/index.html
diff --git a/part-2/14-order/readme.md b/week-2/14-order/readme.md
similarity index 100%
rename from part-2/14-order/readme.md
rename to week-2/14-order/readme.md
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
new file mode 100644
index 0000000..97d925e
--- /dev/null
+++ b/week-2/15-align-self/flexbox.css
@@ -0,0 +1,51 @@
+.countries {
+  display: flex;
+}
+
+/* Add your own CSS code below */
+.countries--first .country--ethiopia {
+  align-self: last baseline;
+}
+
+.countries--second {
+  flex-direction: row;
+  align-items: center;
+}
+
+.countries--second .country--ethiopia {
+  align-self: end;
+}
+
+.countries--third {
+  flex-direction: row;
+  align-items: baseline;
+}
+
+.countries--third .country--croatia {
+  align-self: end;
+}
+
+.countries--third .country--ethiopia {
+  align-self: end;
+}
+
+.countries--third .country--laos {
+  align-self: end;
+}
+
+.countries--fourth {
+  flex-direction: column;
+  align-items: first baseline;
+}
+
+.countries--fourth .country--ethiopia {
+  align-self: first baseline;
+}
+
+.countries--fourth .country--laos {
+  align-self: baseline;
+}
+
+.countries--fourth .country--uganda {
+  align-self: center;
+}
diff --git a/part-2/15-align-self/index.html b/week-2/15-align-self/index.html
similarity index 100%
rename from part-2/15-align-self/index.html
rename to week-2/15-align-self/index.html
diff --git a/part-2/15-align-self/readme.md b/week-2/15-align-self/readme.md
similarity index 100%
rename from part-2/15-align-self/readme.md
rename to week-2/15-align-self/readme.md
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
new file mode 100644
index 0000000..5174ba1
--- /dev/null
+++ b/week-2/16-more-flexbox/flexbox.css
@@ -0,0 +1,67 @@
+.countries {
+  display: flex;
+}
+
+/* Add your own CSS code below */
+.countries--first {
+  flex-direction: row;
+  align-items: end;
+  justify-content: end;
+}
+
+.countries--second {
+  flex-direction: row-reverse;
+  align-items: end;
+  justify-content: center;
+}
+
+.countries--third {
+  flex-direction: row;
+  align-items: first baseline;
+  justify-content: end;
+}
+
+.countries--third .country--brazil {
+  align-self: end;
+}
+
+.countries--fourth {
+  flex-direction: column;
+  align-items: end;
+  justify-content: center;
+}
+
+.countries--fourth .country--ethiopia {
+  align-self: center;
+}
+
+.countries--fourth .country--laos {
+  align-self: center;
+}
+
+.countries--fifth {
+  flex-direction: column;
+  align-items: end;
+  justify-content: space-between;
+}
+
+.countries--fifth .country--brazil {
+  order: 5;
+}
+
+.countries--fifth .country--croatia {
+  order: 4;
+}
+
+.countries--fifth .country--ethiopia {
+  order: 3;
+}
+
+.countries--fifth .country--laos {
+  order: 1;
+}
+
+.countries--fifth .country--uganda {
+  order: 2;
+  align-self: center;
+}
diff --git a/part-2/16-more-flexbox/index.html b/week-2/16-more-flexbox/index.html
similarity index 100%
rename from part-2/16-more-flexbox/index.html
rename to week-2/16-more-flexbox/index.html
diff --git a/part-2/16-more-flexbox/readme.md b/week-2/16-more-flexbox/readme.md
similarity index 100%
rename from part-2/16-more-flexbox/readme.md
rename to week-2/16-more-flexbox/readme.md
diff --git a/part-2/17-nav-menu/index.html b/week-2/17-nav-menu/index.html
similarity index 100%
rename from part-2/17-nav-menu/index.html
rename to week-2/17-nav-menu/index.html
diff --git a/part-2/17-nav-menu/readme.md b/week-2/17-nav-menu/readme.md
similarity index 100%
rename from part-2/17-nav-menu/readme.md
rename to week-2/17-nav-menu/readme.md
diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css
new file mode 100644
index 0000000..7718304
--- /dev/null
+++ b/week-2/17-nav-menu/styles.css
@@ -0,0 +1,28 @@
+/* Write your media queries and flexbox CSS below */
+@media screen and (min-width: 480px) {
+  .site-header__nav {
+    display: flex;
+  }
+}
+
+@media screen and (min-width: 700px) {
+  .site-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .site-header__nav {
+    flex: 1;
+  }
+}
+
+@media screen and (min-width: 992px) {
+  .site-header__nav {
+    justify-content: center;
+    align-items: center;
+  }
+  .site-header__checkout {
+    margin-left: auto;
+  }
+}
diff --git a/part-2/18-git-merge/index.html b/week-2/18-git-merge/index.html
similarity index 100%
rename from part-2/18-git-merge/index.html
rename to week-2/18-git-merge/index.html
diff --git a/part-2/18-git-merge/readme.md b/week-2/18-git-merge/readme.md
similarity index 100%
rename from part-2/18-git-merge/readme.md
rename to week-2/18-git-merge/readme.md
diff --git a/part-3/28-git-conflict/styles.css b/week-2/18-git-merge/styles.css
similarity index 100%
rename from part-3/28-git-conflict/styles.css
rename to week-2/18-git-merge/styles.css
diff --git a/part-3/19-search/index.html b/week-3/19-search/index.html
similarity index 77%
rename from part-3/19-search/index.html
rename to week-3/19-search/index.html
index d94ec98..266586e 100644
--- a/part-3/19-search/index.html
+++ b/week-3/19-search/index.html
@@ -11,7 +11,9 @@
   <body>
     <div class="site-wrapper">
       <main>
-        <p>Delete this line and add your form.</p>
+        <form action="https://www.google.com/search" method="get">
+          <input type="text" name="q" />
+        </form>
       </main>
     </div>
   </body>
diff --git a/part-3/19-search/readme.md b/week-3/19-search/readme.md
similarity index 100%
rename from part-3/19-search/readme.md
rename to week-3/19-search/readme.md
diff --git a/part-3/20-labels/index.html b/week-3/20-labels/index.html
similarity index 81%
rename from part-3/20-labels/index.html
rename to week-3/20-labels/index.html
index ccdc817..b89dffc 100644
--- a/part-3/20-labels/index.html
+++ b/week-3/20-labels/index.html
@@ -13,7 +13,8 @@
       <main>
         <form method="GET" action="https://www.google.com/search">
           <!-- Add a label here -->
-          <input type="text" name="q" />
+          <label for="google-search">Search on Google</label>
+          <input type="text" name="q" id="google-search" />
         </form>
       </main>
     </div>
diff --git a/part-3/20-labels/readme.md b/week-3/20-labels/readme.md
similarity index 100%
rename from part-3/20-labels/readme.md
rename to week-3/20-labels/readme.md
diff --git a/part-3/21-buttons/index.html b/week-3/21-buttons/index.html
similarity index 93%
rename from part-3/21-buttons/index.html
rename to week-3/21-buttons/index.html
index ff87846..ca575ee 100644
--- a/part-3/21-buttons/index.html
+++ b/week-3/21-buttons/index.html
@@ -15,6 +15,7 @@
           <label for="search-input">Search on Google</label>
           <input type="text" name="q" id="search-input" />
           <!-- Add a submit button here -->
+          <button type="submit">Search</button>
         </form>
       </main>
     </div>
diff --git a/part-3/21-buttons/readme.md b/week-3/21-buttons/readme.md
similarity index 100%
rename from part-3/21-buttons/readme.md
rename to week-3/21-buttons/readme.md
diff --git a/part-3/22-checkout/index.html b/week-3/22-checkout/index.html
similarity index 79%
rename from part-3/22-checkout/index.html
rename to week-3/22-checkout/index.html
index 4c42ebb..f4be8b2 100644
--- a/part-3/22-checkout/index.html
+++ b/week-3/22-checkout/index.html
@@ -38,7 +38,12 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
           <h2 class="checkout__title">Checkout</h2>
           <form method="GET" id="checkout-form" class="checkout__form">
             <!-- Add the form fields here -->
-
+            <label for="name">Name :</label>
+            <input type="text" name="customer-name" id="name" /> <br />
+            <label for="email">Email :</label>
+            <input type="email" name="customer-email" id="email" /> <br />
+            <label for="name">Phone Number :</label>
+            <input type="tel" name="customer-phone" id="phone" /> <br />
             <button type="submit">Complete Purchase</button>
           </form>
         </div>
diff --git a/part-3/22-checkout/readme.md b/week-3/22-checkout/readme.md
similarity index 100%
rename from part-3/22-checkout/readme.md
rename to week-3/22-checkout/readme.md
diff --git a/part-3/23-comments/index.html b/week-3/23-comments/index.html
similarity index 87%
rename from part-3/23-comments/index.html
rename to week-3/23-comments/index.html
index 110a502..4fb4db6 100644
--- a/part-3/23-comments/index.html
+++ b/week-3/23-comments/index.html
@@ -30,8 +30,12 @@ <h1>Our t-shirts are amazing!</h1>
 
         <div class="comments">
           <p>Add your comments and let us know what you think!</p>
-
           <!-- Your comment form goes here -->
+          <form method="get">
+            <label for="comment">Add Your Comment:</label>
+            <textarea name="comment" id="comment"></textarea>
+            <button type="submit">Send Comment</button>
+          </form>
         </div>
       </main>
     </div>
diff --git a/part-3/23-comments/readme.md b/week-3/23-comments/readme.md
similarity index 100%
rename from part-3/23-comments/readme.md
rename to week-3/23-comments/readme.md
diff --git a/week-3/24-dietary/index.html b/week-3/24-dietary/index.html
new file mode 100644
index 0000000..582cf57
--- /dev/null
+++ b/week-3/24-dietary/index.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>24 - Dietary Requirements - HTML, CSS and Git Exercises</title>
+    <link rel="stylesheet" href="/css/normalize.css" />
+    <link rel="stylesheet" href="/css/week3-forms.css" />
+  </head>
+  <style>
+    label {
+      display: block;
+    }
+  </style>
+  <body>
+    <div class="site-wrapper">
+      <main>
+        <h1>Codi Summit</h1>
+
+        <p>
+          Let us know if you have any dietary requirements so that we can provide you with the best,
+          yummy food.
+        </p>
+
+        <form>
+          <!-- Your multiple choice goes here -->
+          <fieldset>
+            <legend>Please select all of your dietary requirements</legend>
+            <label for="halal">
+              <input type="checkbox" name="halal" id="halal" />
+              Halal
+            </label>
+            <label fot="kosher">
+              <input type="checkbox" name="Kosher" id="kosher" />
+              Kosher
+            </label>
+            <label for="vegetarian">
+              <input type="checkbox" name="vegetarian" id="vegetarian" />
+              Vegetarian
+            </label>
+            <label for="vegan">
+              <input type="checkbox" name="vegan" id="vegan" />
+              Vegan
+            </label>
+            <label for="gluten">
+              <input type="checkbox" name="gluten" id="gluten" />
+              Gluten Free
+            </label>
+          </fieldset>
+          <button type="submit">Submit</button>
+        </form>
+      </main>
+    </div>
+  </body>
+</html>
diff --git a/part-3/24-dietary/readme.md b/week-3/24-dietary/readme.md
similarity index 100%
rename from part-3/24-dietary/readme.md
rename to week-3/24-dietary/readme.md
diff --git a/part-3/25-shirt-size/index.html b/week-3/25-shirt-size/index.html
similarity index 76%
rename from part-3/25-shirt-size/index.html
rename to week-3/25-shirt-size/index.html
index 9e4d606..431a7d4 100644
--- a/part-3/25-shirt-size/index.html
+++ b/week-3/25-shirt-size/index.html
@@ -29,7 +29,14 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
                 </div>
               </td>
               <td>
-                Medium
+                <form action="get">
+                  <label class="screenreader" for="size">Choose a size:</label>
+                  <select name="size" id="size">
+                    <option value="small">Small</option>
+                    <option value="medium" selected>Medium</option>
+                    <option value="large">Large</option>
+                  </select>
+                </form>
               </td>
               <td>
                 1
diff --git a/part-3/25-shirt-size/readme.md b/week-3/25-shirt-size/readme.md
similarity index 100%
rename from part-3/25-shirt-size/readme.md
rename to week-3/25-shirt-size/readme.md
diff --git a/week-3/25-shirt-size/styles.css b/week-3/25-shirt-size/styles.css
new file mode 100644
index 0000000..84204d2
--- /dev/null
+++ b/week-3/25-shirt-size/styles.css
@@ -0,0 +1,6 @@
+/* Add your CSS below */
+.screenreader {
+  clip: rect(1px, 1px, 1px, 1px);
+  position: absolute !important;
+  left: -2000px;
+}
diff --git a/part-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html
similarity index 53%
rename from part-3/26-checkout-groups/index.html
rename to week-3/26-checkout-groups/index.html
index 66513dd..7c9b406 100644
--- a/part-3/26-checkout-groups/index.html
+++ b/week-3/26-checkout-groups/index.html
@@ -38,7 +38,35 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
           <h2 class="checkout__title">Checkout</h2>
           <form method="GET" id="checkout-form" class="checkout__form">
             <!-- Add the form fields here -->
+            <fieldset>
+              <legend>Billing Address</legend>
+              <label for="address1">Address Line 1</label>
+              <input type="text" name="address1" id="address1" />
+              <br />
+              <label for="address2">Addresse Line 2</label>
+              <input type="text" name="address2" id="address2" />
+              <br />
+              <label for="postcode">Postcode</label>
+              <input type="text" name="postcode" id="postcode" />
+              <br />
+              <label for="city">City</label>
+              <input type="text" name="city" id="city" />
+            </fieldset>
 
+            <fieldset>
+              <legend>Delivery Address</legend>
+              <label for="address1">Address Line 1</label>
+              <input type="text" name="address1" id="address1" />
+              <br />
+              <label for="address2">Addresse Line 2</label>
+              <input type="text" name="address2" id="address2" />
+              <br />
+              <label for="postcode">Postcode</label>
+              <input type="text" name="postcode" id="postcode" />
+              <br />
+              <label for="city">City</label>
+              <input type="text" name="city" id="city" />
+            </fieldset>
             <button type="submit">Complete Purchase</button>
           </form>
         </div>
diff --git a/part-3/26-checkout-groups/readme.md b/week-3/26-checkout-groups/readme.md
similarity index 100%
rename from part-3/26-checkout-groups/readme.md
rename to week-3/26-checkout-groups/readme.md
diff --git a/part-3/27-attributes/index.html b/week-3/27-attributes/index.html
similarity index 74%
rename from part-3/27-attributes/index.html
rename to week-3/27-attributes/index.html
index e54fd83..e66d32d 100644
--- a/part-3/27-attributes/index.html
+++ b/week-3/27-attributes/index.html
@@ -42,7 +42,12 @@ <h2 class="checkout__title">Checkout</h2>
               <legend>Billing Address</legend>
               <p>
                 <label for="billing-address-1">Address Line 1</label>
-                <input type="text" name="billing-address-1" id="billing-address-1" />
+                <input
+                  type="text"
+                  name="billing-address-1"
+                  id="billing-address-1"
+                  required="required"
+                />
               </p>
               <p>
                 <label for="billing-address-2">Address Line 2</label>
@@ -50,18 +55,28 @@ <h2 class="checkout__title">Checkout</h2>
               </p>
               <p>
                 <label for="billing-postcode">Postcode</label>
-                <input type="text" name="billing-postcode" id="billing-postcode" />
+                <input
+                  type="text"
+                  name="billing-postcode"
+                  id="billing-postcode"
+                  required="required"
+                />
               </p>
               <p>
                 <label for="billing-city">City</label>
-                <input type="text" name="billing-city" id="billing-city" />
+                <input type="text" name="billing-city" id="billing-city" required="required" />
               </p>
             </fieldset>
             <fieldset>
               <legend>Delivery Address</legend>
               <p>
                 <label for="delivery-address-1">Address Line 1</label>
-                <input type="text" name="delivery-address-1" id="delivery-address-1" />
+                <input
+                  type="text"
+                  name="delivery-address-1"
+                  id="delivery-address-1"
+                  required="required"
+                />
               </p>
               <p>
                 <label for="delivery-address-2">Address Line 2</label>
@@ -73,15 +88,27 @@ <h2 class="checkout__title">Checkout</h2>
                   type="text"
                   name="delivery-address-postcode"
                   id="delivery-address-postcode"
+                  required="required"
                 />
               </p>
               <p>
                 <label for="delivery-address-city">City</label>
-                <input type="text" name="delivery-address-city" id="delivery-address-city" />
+                <input
+                  type="text"
+                  name="delivery-address-city"
+                  id="delivery-address-city"
+                  required="required"
+                />
               </p>
               <p>
                 <label for="delivery-country">Country</label>
-                <input type="text" name="delivery-country" id="delivery-country" />
+                <input
+                  type="text"
+                  name="delivery-country"
+                  id="delivery-country"
+                  value="United Kingdom"
+                  readonly
+                />
               </p>
               <fieldset>
                 <legend>Delivery Options</legend>
@@ -91,6 +118,8 @@ <h2 class="checkout__title">Checkout</h2>
                     name="delivery-option"
                     id="delivery-option"
                     value="standard"
+                    checked
+                    disabled
                   />
                   Royal Mail
                 </label>
diff --git a/part-3/27-attributes/readme.md b/week-3/27-attributes/readme.md
similarity index 100%
rename from part-3/27-attributes/readme.md
rename to week-3/27-attributes/readme.md
diff --git a/part-3/28-git-conflict/index.html b/week-3/28-git-conflict/index.html
similarity index 100%
rename from part-3/28-git-conflict/index.html
rename to week-3/28-git-conflict/index.html
diff --git a/part-3/28-git-conflict/readme.md b/week-3/28-git-conflict/readme.md
similarity index 100%
rename from part-3/28-git-conflict/readme.md
rename to week-3/28-git-conflict/readme.md
diff --git a/part-2/18-git-merge/styles.css b/week-3/28-git-conflict/styles.css
similarity index 83%
rename from part-2/18-git-merge/styles.css
rename to week-3/28-git-conflict/styles.css
index 0051cdb..ec44684 100644
--- a/part-2/18-git-merge/styles.css
+++ b/week-3/28-git-conflict/styles.css
@@ -1,6 +1,6 @@
 /* Add your own CSS code below */
 .link {
-  color: #4491db;
+  color: fuchsia;
   font-weight: 700;
   text-decoration: none;
 }
diff --git a/part-3/29-combined-skills/about.html b/week-3/29-combined-skills/about.html
similarity index 96%
rename from part-3/29-combined-skills/about.html
rename to week-3/29-combined-skills/about.html
index 23e6394..9d025b8 100644
--- a/part-3/29-combined-skills/about.html
+++ b/week-3/29-combined-skills/about.html
@@ -11,9 +11,9 @@
 
   <body>
     <div class="site-wrapper">
-      <div class="site-header">
-        <h1 class="site-header__title">C.Y.F</h1>
-        <div class="main-nav">
+      <header class="site-header">
+        <h1 class="site-header__title">Codi</h1>
+        <nav class="main-nav">
           <ul class="main-nav__list">
             <li class="main-nav__list-item">
               <a href="index.html">Latest</a>
@@ -25,7 +25,7 @@ <h1 class="site-header__title">C.Y.F</h1>
               <a href="contact.html">Contact</a>
             </li>
           </ul>
-        </div>
+        </nav>
         <form class="site-search" action="/search">
           <label for="search-input">
             Search
@@ -47,11 +47,11 @@ <h1 class="site-header__title">C.Y.F</h1>
           </svg>
           <button type="submit">Submit</button>
         </form>
-      </div>
+      </header>
 
       <main class="site-content">
         <article class="main-article">
-          <h1>About C.Y.F</h1>
+          <h1>About Codi</h1>
           <p>
             Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
             incididunt ut labore et dolore magna aliqua. Suspendisse sed nisi lacus sed viverra
@@ -123,7 +123,7 @@ <h1>About C.Y.F</h1>
             href="https://github.com/coditech/Submissions/tree/master/Exercises/html-css-git-exercises"
             >Built</a
           >
-          with ♥ for <a href="https://codi.tech/">Codi</a>.
+          with <span class="heart"> ♥ </span>for <a href="https://codi.tech/">Codi</a>.
         </p>
         <p>
           <svg
diff --git a/part-3/29-combined-skills/contact.html b/week-3/29-combined-skills/contact.html
similarity index 76%
rename from part-3/29-combined-skills/contact.html
rename to week-3/29-combined-skills/contact.html
index d1ac384..d2f7330 100644
--- a/part-3/29-combined-skills/contact.html
+++ b/week-3/29-combined-skills/contact.html
@@ -9,11 +9,10 @@
     <link rel="stylesheet" href="/css/combined-skills.css" />
     <link rel="stylesheet" href="styles.css" />
   </head>
-
   <body>
     <div class="site-wrapper">
       <div class="site-header">
-        <div class="site-header__title">C.Y.F</div>
+        <div class="site-header__title">Codi</div>
         <div class="main-nav">
           <ul class="main-nav__list">
             <li class="main-nav__list-item">
@@ -49,32 +48,51 @@
           <button type="submit">Submit</button>
         </form>
       </div>
-
       <main>
         <h1>Contact Us</h1>
         <p>Send us an email if you would like to contact us.</p>
         <form method="GET" class="contact-form">
           <div class="contact-form__field">
             <label for="name">Name</label>
-            <input type="text" name="name" id="name" />
+            <input type="text" name="name" id="name" required />
           </div>
           <div class="contact-form__field">
+            <label for="email">E-mail</label>
+            <input type="email" name="email" id="email" required />
+          </div>
+          <div>
+            <fieldset class="contact-form__field">
+              <legend>What branch are you interested in?</legend>
+              <label for="london"
+                >London <input type="radio" name="branch" id="london" value="london"
+              /></label>
+              <label for="glasgow"
+                >Glasgow <input type="radio" name="branch" id="glasgow" value="glasgow"
+              /></label>
+              <label for="manchester"
+                >Manchester <input type="radio" name="branch" id="manchester" value="manchester"
+              /></label>
+            </fieldset>
+          </div>
+          <div class="contact-form__field">
+            <label for="message">Message</label>
             <textarea
               name="message"
               placeholder="Your message should not be longer than 200 words."
+              id="message"
+              required="required"
             ></textarea>
           </div>
           <button type="submit">Send</button>
         </form>
       </main>
-
       <footer>
         <p>
           <a
             href="https://github.com/coditech/Submissions/tree/master/Exercises/html-css-git-exercises"
             >Built</a
           >
-          with ♥ for <a href="https://codi.tech/">Codi</a>.
+          with <span class="heart">♥</span> for <a href="https://codi.tech/">Codi</a>.
         </p>
         <p>
           <svg
diff --git a/part-3/29-combined-skills/index.html b/week-3/29-combined-skills/index.html
similarity index 92%
rename from part-3/29-combined-skills/index.html
rename to week-3/29-combined-skills/index.html
index a9ace8d..686f811 100644
--- a/part-3/29-combined-skills/index.html
+++ b/week-3/29-combined-skills/index.html
@@ -11,9 +11,9 @@
 
   <body>
     <div class="site-wrapper">
-      <div class="site-header">
-        <h1 class="site-header__title">C.Y.F</h1>
-        <div class="main-nav">
+      <header class="site-header">
+        <h1 class="site-header__title">Codi</h1>
+        <nav class="main-nav">
           <ul class="main-nav__list">
             <li class="main-nav__list-item">
               <a href="index.html">Latest</a>
@@ -25,7 +25,7 @@ <h1 class="site-header__title">C.Y.F</h1>
               <a href="contact.html">Contact</a>
             </li>
           </ul>
-        </div>
+        </nav>
         <form class="site-search" action="/search">
           <label for="search-input">
             Search
@@ -47,10 +47,10 @@ <h1 class="site-header__title">C.Y.F</h1>
           </svg>
           <button type="submit">Submit</button>
         </form>
-      </div>
+      </header>
 
       <main>
-        <div class="hero">
+        <article class="hero">
           <img class="hero__image" src="/images/29-hero.jpg" />
           <h2 class="hero__title">
             Duis aute irure dolor in reprehenderit in voluptate velit
@@ -59,14 +59,14 @@ <h2 class="hero__title">
           <p class="hero__time">
             <time datetime="2019-02-05">February 5, 2019</time>
           </p>
-        </div>
-        <div class="views">
+        </article>
+        <article class="views">
           <h2 class="views__title">View:</h2>
           <a class="view-list__item" href="#">Most Popular</a>
           <a class="view-list__item" href="#">Most Recent</a>
           <a class="views__all" href="#">View All</a>
-        </div>
-        <div class="items">
+        </article>
+        <article class="items">
           <div class="item">
             <img class="item__image" src="/images/29-item-1.jpg" />
             <h2 class="item__title">
@@ -97,7 +97,7 @@ <h2 class="item__title">
               <time datetime="2019-01-19">January 19, 2019</time>
             </p>
           </div>
-        </div>
+        </article>
       </main>
 
       <footer>
@@ -106,7 +106,7 @@ <h2 class="item__title">
             href="https://github.com/coditech/Submissions/tree/master/Exercises/html-css-git-exercises"
             >Built</a
           >
-          with ♥ for <a href="https://codi.tech/">Codi</a>.
+          with <span class="heart">♥</span> for <a href="https://codi.tech/">Codi</a>.
         </p>
         <p>
           <svg
diff --git a/part-3/29-combined-skills/readme.md b/week-3/29-combined-skills/readme.md
similarity index 100%
rename from part-3/29-combined-skills/readme.md
rename to week-3/29-combined-skills/readme.md
diff --git a/week-3/29-combined-skills/styles.css b/week-3/29-combined-skills/styles.css
new file mode 100644
index 0000000..c29bba4
--- /dev/null
+++ b/week-3/29-combined-skills/styles.css
@@ -0,0 +1,48 @@
+/* Add your own CSS code below */
+.heart {
+  color: #c85308;
+}
+
+@media (min-width: 992px) {
+  .hero__title {
+    font-size: 4rem;
+  }
+}
+
+.main-nav__list {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+
+@media (min-width: 767px) {
+  .site-header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+  .views {
+    display: flex;
+    flex-direction: row;
+  }
+  .views__title,
+  .view-list__item,
+  .views__all {
+    margin: 10px;
+  }
+}
+
+.site-content {
+  display: flex;
+  justify-content: center;
+}
+
+.main-article {
+  max-width: 50em;
+  line-height: 2;
+}
+
+.contact-form__field {
+  display: flex;
+  flex-direction: column;
+}
