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-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 100%
rename from part-3/20-labels/index.html
rename to week-3/20-labels/index.html
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 100%
rename from part-3/21-buttons/index.html
rename to week-3/21-buttons/index.html
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 100%
rename from part-3/22-checkout/index.html
rename to week-3/22-checkout/index.html
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 100%
rename from part-3/23-comments/index.html
rename to week-3/23-comments/index.html
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/part-3/24-dietary/index.html b/week-3/24-dietary/index.html
similarity index 100%
rename from part-3/24-dietary/index.html
rename to week-3/24-dietary/index.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 100%
rename from part-3/25-shirt-size/index.html
rename to week-3/25-shirt-size/index.html
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/part-3/25-shirt-size/styles.css b/week-3/25-shirt-size/styles.css
similarity index 100%
rename from part-3/25-shirt-size/styles.css
rename to week-3/25-shirt-size/styles.css
diff --git a/part-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html
similarity index 100%
rename from part-3/26-checkout-groups/index.html
rename to week-3/26-checkout-groups/index.html
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 100%
rename from part-3/27-attributes/index.html
rename to week-3/27-attributes/index.html
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 81%
rename from part-2/18-git-merge/styles.css
rename to week-3/28-git-conflict/styles.css
index 0051cdb..af46a4f 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: orangered;
   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 100%
rename from part-3/29-combined-skills/about.html
rename to week-3/29-combined-skills/about.html
diff --git a/part-3/29-combined-skills/contact.html b/week-3/29-combined-skills/contact.html
similarity index 100%
rename from part-3/29-combined-skills/contact.html
rename to week-3/29-combined-skills/contact.html
diff --git a/part-3/29-combined-skills/index.html b/week-3/29-combined-skills/index.html
similarity index 100%
rename from part-3/29-combined-skills/index.html
rename to week-3/29-combined-skills/index.html
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/part-3/29-combined-skills/styles.css b/week-3/29-combined-skills/styles.css
similarity index 100%
rename from part-3/29-combined-skills/styles.css
rename to week-3/29-combined-skills/styles.css