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-1/9-git-branch/styles.css b/part-1/9-git-branch/styles.css
deleted file mode 100644
index 0051cdb..0000000
--- a/part-1/9-git-branch/styles.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Add your own CSS code below */
-.link {
-  color: #4491db;
-  font-weight: 700;
-  text-decoration: none;
-}
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/20-labels/index.html b/part-3/20-labels/index.html
deleted file mode 100644
index ccdc817..0000000
--- a/part-3/20-labels/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>20 - Form Labels - 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>
-        <form method="GET" action="https://www.google.com/search">
-          <!-- Add a label here -->
-          <input type="text" name="q" />
-        </form>
-      </main>
-    </div>
-  </body>
-</html>
diff --git a/part-3/21-buttons/index.html b/part-3/21-buttons/index.html
deleted file mode 100644
index ff87846..0000000
--- a/part-3/21-buttons/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>21 - Form Buttons - 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>
-        <form method="GET" action="https://www.google.com/search">
-          <label for="search-input">Search on Google</label>
-          <input type="text" name="q" id="search-input" />
-          <!-- Add a submit button here -->
-        </form>
-      </main>
-    </div>
-  </body>
-</html>
diff --git a/part-3/22-checkout/index.html b/part-3/22-checkout/index.html
deleted file mode 100644
index 4c42ebb..0000000
--- a/part-3/22-checkout/index.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>22 - Checkout Form - 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>
-        <div class="shopping-basket">
-          <h1 class="shopping-basket__title">Your Shopping Basket</h1>
-          <table class="shopping-basket__items">
-            <tr>
-              <th>Product</th>
-              <th>Size</th>
-              <th>Units</th>
-              <th>Price</th>
-            </tr>
-            <tr>
-              <td>
-                <div class="shopping-basket__product">
-                  <img src="/images/22/shirts.jpg" alt="Codi t-shirts in black" />
-                  <p>Codi t-shirt, black</p>
-                </div>
-              </td>
-              <td>Medium</td>
-              <td>1</td>
-              <td>£10.00</td>
-            </tr>
-          </table>
-        </div>
-
-        <div class="checkout">
-          <h2 class="checkout__title">Checkout</h2>
-          <form method="GET" id="checkout-form" class="checkout__form">
-            <!-- Add the form fields here -->
-
-            <button type="submit">Complete Purchase</button>
-          </form>
-        </div>
-      </main>
-    </div>
-  </body>
-</html>
diff --git a/part-3/23-comments/index.html b/part-3/23-comments/index.html
deleted file mode 100644
index 110a502..0000000
--- a/part-3/23-comments/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>23 - Blog Comments - 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>
-        <article>
-          <h1>Our t-shirts are amazing!</h1>
-          <p>
-            Lorem ipsum dolor sit amet, aliquam laoreet quaestio in eum, ea tation dignissim vix. Ei
-            nec audire vocibus corrumpit. Ut quo facilisis adipiscing, malis sensibus abhorreant vel
-            ei. Hinc appareat dissentias pri at, impedit propriae ea eos. Modus feugait te duo, sit
-            noluisse salutatus maiestatis ea. Iisque volumus duo ex, deleniti aliquando quo ne.
-          </p>
-          <p>
-            Eos nibh maiorum voluptatibus ea, an labitur phaedrum sed, vis justo option intellegat
-            ad. Vel ut ferri dolores. Ad hinc moderatius scriptorem vim, utamur electram ad est, sed
-            no dicit homero dissentias. Usu qualisque concludaturque id, prodesset concludaturque eu
-            usu, ea est regione platonem. Et rebum theophrastus per, dicta aliquam adipisci pri cu,
-            ne quem justo mea.
-          </p>
-        </article>
-
-        <div class="comments">
-          <p>Add your comments and let us know what you think!</p>
-
-          <!-- Your comment form goes here -->
-        </div>
-      </main>
-    </div>
-  </body>
-</html>
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/index.html b/part-3/25-shirt-size/index.html
deleted file mode 100644
index 9e4d606..0000000
--- a/part-3/25-shirt-size/index.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>25 - T-Shirt Size - HTML, CSS and Git Exercises</title>
-    <link rel="stylesheet" href="/css/normalize.css" />
-    <link rel="stylesheet" href="/css/week3-forms.css" />
-    <link rel="stylesheet" href="styles.css" />
-  </head>
-
-  <body>
-    <div class="site-wrapper">
-      <main>
-        <div class="shopping-basket">
-          <h1 class="shopping-basket__title">Your Shopping Basket</h1>
-          <table class="shopping-basket__items">
-            <tr>
-              <th>Product</th>
-              <th>Size</th>
-              <th>Units</th>
-              <th>Price</th>
-            </tr>
-            <tr>
-              <td>
-                <div class="shopping-basket__product">
-                  <img src="/images/22/shirts.jpg" alt="Codi t-shirts in black" />
-                  <p>Codi t-shirt, black</p>
-                </div>
-              </td>
-              <td>
-                Medium
-              </td>
-              <td>
-                1
-              </td>
-              <td>
-                £10.00
-              </td>
-            </tr>
-          </table>
-        </div>
-      </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/26-checkout-groups/index.html b/part-3/26-checkout-groups/index.html
deleted file mode 100644
index 66513dd..0000000
--- a/part-3/26-checkout-groups/index.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>26 - Checkout Groups - 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>
-        <div class="shopping-basket">
-          <h1 class="shopping-basket__title">Your Shopping Basket</h1>
-          <table class="shopping-basket__items">
-            <tr>
-              <th>Product</th>
-              <th>Size</th>
-              <th>Units</th>
-              <th>Price</th>
-            </tr>
-            <tr>
-              <td>
-                <div class="shopping-basket__product">
-                  <img src="/images/20-shirts.jpg" alt="Codi t-shirts in black" />
-                  <p>Codi t-shirt, black</p>
-                </div>
-              </td>
-              <td>Medium</td>
-              <td>1</td>
-              <td>£10.00</td>
-            </tr>
-          </table>
-        </div>
-
-        <div class="checkout">
-          <h2 class="checkout__title">Checkout</h2>
-          <form method="GET" id="checkout-form" class="checkout__form">
-            <!-- Add the form fields here -->
-
-            <button type="submit">Complete Purchase</button>
-          </form>
-        </div>
-      </main>
-    </div>
-  </body>
-</html>
diff --git a/part-3/29-combined-skills/about.html b/part-3/29-combined-skills/about.html
deleted file mode 100644
index 23e6394..0000000
--- a/part-3/29-combined-skills/about.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>29 - Combined Skills - HTML, CSS and Git Exercises</title>
-    <link rel="stylesheet" href="/css/normalize.css" />
-    <link rel="stylesheet" href="/css/combined-skills.css" />
-    <link rel="stylesheet" href="styles.css" />
-  </head>
-
-  <body>
-    <div class="site-wrapper">
-      <div class="site-header">
-        <h1 class="site-header__title">C.Y.F</h1>
-        <div class="main-nav">
-          <ul class="main-nav__list">
-            <li class="main-nav__list-item">
-              <a href="index.html">Latest</a>
-            </li>
-            <li class="main-nav__list-item">
-              <a href="about.html">About</a>
-            </li>
-            <li class="main-nav__list-item">
-              <a href="contact.html">Contact</a>
-            </li>
-          </ul>
-        </div>
-        <form class="site-search" action="/search">
-          <label for="search-input">
-            Search
-          </label>
-          <input id="search-input" class="site-search__input" type="text" name="search" />
-          <svg
-            aria-hidden="true"
-            data-prefix="fas"
-            data-icon="search"
-            class="svg-inline--fa fa-search fa-w-16"
-            role="img"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 512 512"
-          >
-            <path
-              fill="currentColor"
-              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
-            ></path>
-          </svg>
-          <button type="submit">Submit</button>
-        </form>
-      </div>
-
-      <main class="site-content">
-        <article class="main-article">
-          <h1>About C.Y.F</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
-            tellus in hac habitasse. Amet cursus sit amet dictum sit amet justo. Feugiat nibh sed
-            pulvinar proin gravida hendrerit lectus a. Consectetur libero id faucibus nisl. Lectus
-            quam id leo in vitae turpis massa. Ultricies tristique nulla aliquet enim tortor at
-            auctor urna. Bibendum neque egestas congue quisque egestas diam. Egestas fringilla
-            phasellus faucibus scelerisque eleifend donec pretium. Non tellus orci ac auctor augue
-            mauris. In aliquam sem fringilla ut. Cras tincidunt lobortis feugiat vivamus at augue.
-            Posuere sollicitudin aliquam ultrices sagittis orci a. Commodo sed egestas egestas
-            fringilla phasellus faucibus scelerisque. Vulputate ut pharetra sit amet aliquam.
-          </p>
-
-          <p>
-            Mi quis hendrerit dolor magna eget est lorem. Porttitor massa id neque aliquam
-            vestibulum morbi. Tortor at risus viverra adipiscing at in tellus integer feugiat. Enim
-            ut tellus elementum sagittis vitae et leo duis. Vitae ultricies leo integer malesuada
-            nunc vel risus commodo viverra. Maecenas ultricies mi eget mauris pharetra et ultrices
-            neque. Facilisis sed odio morbi quis. Egestas erat imperdiet sed euismod. Consequat
-            interdum varius sit amet mattis vulputate enim. Porttitor eget dolor morbi non arcu
-            risus. Luctus accumsan tortor posuere ac ut consequat semper. Eget felis eget nunc
-            lobortis mattis aliquam faucibus purus in. Sollicitudin tempor id eu nisl nunc.
-          </p>
-
-          <p>
-            Ut morbi tincidunt augue interdum velit euismod. Aliquet sagittis id consectetur purus
-            ut faucibus pulvinar elementum integer. Nulla facilisi nullam vehicula ipsum. Metus
-            vulputate eu scelerisque felis imperdiet. At imperdiet dui accumsan sit amet nulla
-            facilisi morbi. Gravida arcu ac tortor dignissim convallis. Leo duis ut diam quam nulla
-            porttitor massa. Posuere lorem ipsum dolor sit amet. Neque ornare aenean euismod
-            elementum nisi quis. In fermentum posuere urna nec tincidunt praesent semper feugiat
-            nibh. Orci ac auctor augue mauris. Arcu ac tortor dignissim convallis aenean et tortor
-            at risus. Sed turpis tincidunt id aliquet risus feugiat in. Pharetra diam sit amet nisl
-            suscipit adipiscing. Aliquet eget sit amet tellus cras adipiscing enim. Nulla pharetra
-            diam sit amet. Eget mauris pharetra et ultrices neque ornare. Volutpat maecenas volutpat
-            blandit aliquam etiam erat. Id volutpat lacus laoreet non curabitur gravida arcu ac
-            tortor.
-          </p>
-
-          <p>
-            Mi tempus imperdiet nulla malesuada pellentesque elit eget gravida cum. Mattis rhoncus
-            urna neque viverra justo. Nunc consequat interdum varius sit. In hendrerit gravida
-            rutrum quisque non tellus. Porta nibh venenatis cras sed felis. Malesuada pellentesque
-            elit eget gravida cum sociis natoque. A erat nam at lectus. Congue nisi vitae suscipit
-            tellus. Sed arcu non odio euismod lacinia at quis. Molestie a iaculis at erat
-            pellentesque adipiscing commodo. Curabitur gravida arcu ac tortor dignissim convallis.
-            Ut diam quam nulla porttitor massa id neque. Ipsum faucibus vitae aliquet nec. Gravida
-            dictum fusce ut placerat orci nulla pellentesque dignissim enim. Faucibus pulvinar
-            elementum integer enim neque volutpat ac tincidunt vitae. Id consectetur purus ut
-            faucibus pulvinar elementum integer enim neque. Facilisis magna etiam tempor orci eu
-            lobortis elementum nibh tellus. Ullamcorper a lacus vestibulum sed arcu non. Venenatis a
-            condimentum vitae sapien.
-          </p>
-
-          <p>
-            Curabitur gravida arcu ac tortor dignissim convallis aenean. Sit amet purus gravida quis
-            blandit turpis. Mattis nunc sed blandit libero volutpat. Mattis ullamcorper velit sed
-            ullamcorper morbi. Urna et pharetra pharetra massa massa ultricies mi quis. Est lorem
-            ipsum dolor sit amet. Viverra aliquet eget sit amet. Nunc non blandit massa enim.
-            Volutpat consequat mauris nunc congue. Justo donec enim diam vulputate. In nibh mauris
-            cursus mattis molestie a iaculis at erat. Tortor consequat id porta nibh.
-          </p>
-        </article>
-      </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>.
-        </p>
-        <p>
-          <svg
-            aria-hidden="true"
-            data-prefix="fas"
-            data-icon="search"
-            class="svg-inline--fa fa-search fa-w-16"
-            role="img"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 512 512"
-          >
-            <path
-              fill="currentColor"
-              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
-            ></path>
-          </svg>
-          icon by <a href="https://fontawesome.com/license">FontAwesome</a>. Photos from
-          <a href="https://unsplash.com/">Unsplash</a>.
-        </p>
-      </footer>
-    </div>
-  </body>
-</html>
diff --git a/part-3/29-combined-skills/contact.html b/part-3/29-combined-skills/contact.html
deleted file mode 100644
index d1ac384..0000000
--- a/part-3/29-combined-skills/contact.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>29 - Combined Skills - HTML, CSS and Git Exercises</title>
-    <link rel="stylesheet" href="/css/normalize.css" />
-    <link rel="stylesheet" href="/css/week3-forms.css" />
-    <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="main-nav">
-          <ul class="main-nav__list">
-            <li class="main-nav__list-item">
-              <a href="index.html">Latest</a>
-            </li>
-            <li class="main-nav__list-item">
-              <a href="about.html">About</a>
-            </li>
-            <li class="main-nav__list-item">
-              <a href="contact.html">Contact</a>
-            </li>
-          </ul>
-        </div>
-        <form class="site-search" action="/search">
-          <label for="search-input">
-            Search
-          </label>
-          <input id="search-input" class="site-search__input" type="text" name="search" />
-          <svg
-            aria-hidden="true"
-            data-prefix="fas"
-            data-icon="search"
-            class="svg-inline--fa fa-search fa-w-16"
-            role="img"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 512 512"
-          >
-            <path
-              fill="currentColor"
-              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
-            ></path>
-          </svg>
-          <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" />
-          </div>
-          <div class="contact-form__field">
-            <textarea
-              name="message"
-              placeholder="Your message should not be longer than 200 words."
-            ></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>.
-        </p>
-        <p>
-          <svg
-            aria-hidden="true"
-            data-prefix="fas"
-            data-icon="search"
-            class="svg-inline--fa fa-search fa-w-16"
-            role="img"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 512 512"
-          >
-            <path
-              fill="currentColor"
-              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
-            ></path>
-          </svg>
-          icon by <a href="https://fontawesome.com/license">FontAwesome</a>. Photos from
-          <a href="https://unsplash.com/">Unsplash</a>.
-        </p>
-      </footer>
-    </div>
-  </body>
-</html>
diff --git a/part-3/29-combined-skills/index.html b/part-3/29-combined-skills/index.html
deleted file mode 100644
index a9ace8d..0000000
--- a/part-3/29-combined-skills/index.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>29 - Combined Skills - HTML, CSS and Git Exercises</title>
-    <link rel="stylesheet" href="/css/normalize.css" />
-    <link rel="stylesheet" href="/css/combined-skills.css" />
-    <link rel="stylesheet" href="styles.css" />
-  </head>
-
-  <body>
-    <div class="site-wrapper">
-      <div class="site-header">
-        <h1 class="site-header__title">C.Y.F</h1>
-        <div class="main-nav">
-          <ul class="main-nav__list">
-            <li class="main-nav__list-item">
-              <a href="index.html">Latest</a>
-            </li>
-            <li class="main-nav__list-item">
-              <a href="about.html">About</a>
-            </li>
-            <li class="main-nav__list-item">
-              <a href="contact.html">Contact</a>
-            </li>
-          </ul>
-        </div>
-        <form class="site-search" action="/search">
-          <label for="search-input">
-            Search
-          </label>
-          <input id="search-input" class="site-search__input" type="text" name="search" />
-          <svg
-            aria-hidden="true"
-            data-prefix="fas"
-            data-icon="search"
-            class="svg-inline--fa fa-search fa-w-16"
-            role="img"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 512 512"
-          >
-            <path
-              fill="currentColor"
-              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
-            ></path>
-          </svg>
-          <button type="submit">Submit</button>
-        </form>
-      </div>
-
-      <main>
-        <div class="hero">
-          <img class="hero__image" src="/images/29-hero.jpg" />
-          <h2 class="hero__title">
-            Duis aute irure dolor in reprehenderit in voluptate velit
-          </h2>
-          <p class="hero__author">By <span>Nostrud Fugiat</span></p>
-          <p class="hero__time">
-            <time datetime="2019-02-05">February 5, 2019</time>
-          </p>
-        </div>
-        <div 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">
-          <div class="item">
-            <img class="item__image" src="/images/29-item-1.jpg" />
-            <h2 class="item__title">
-              Consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore
-            </h2>
-            <p class="item__author">By <span>Aliquip Occaecat</span></p>
-            <p class="item__time">
-              <time datetime="2019-02-03">February 2, 2019</time>
-            </p>
-          </div>
-          <div class="item">
-            <img class="item__image" src="/images/29-item-2.jpg" />
-            <h2 class="item__title">
-              Sunt in culpa qui officia deserunt mollit anim
-            </h2>
-            <p class="item__author">By <span>Laboris Nisit</span></p>
-            <p class="item__time">
-              <time datetime="2019-01-27">January 27, 2019</time>
-            </p>
-          </div>
-          <div class="item">
-            <img class="item__image" src="/images/29-item-3.jpg" />
-            <h2 class="item__title">
-              Voluptate velit esse cillum dolore eu fugiat nulla pariaturt
-            </h2>
-            <p class="item__author">By <span>Minim Veniam</span></p>
-            <p class="item__time">
-              <time datetime="2019-01-19">January 19, 2019</time>
-            </p>
-          </div>
-        </div>
-      </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>.
-        </p>
-        <p>
-          <svg
-            aria-hidden="true"
-            data-prefix="fas"
-            data-icon="search"
-            class="svg-inline--fa fa-search fa-w-16"
-            role="img"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 512 512"
-          >
-            <path
-              fill="currentColor"
-              d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
-            ></path>
-          </svg>
-          icon by <a href="https://fontawesome.com/license">FontAwesome</a>. Photos from
-          <a href="https://unsplash.com/">Unsplash</a>.
-        </p>
-      </footer>
-    </div>
-  </body>
-</html>
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 93%
rename from part-1/1-parent-child/index.html
rename to week-1/1-parent-child/index.html
index 458a4cb..92c0ef8 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> <!-- Added time stamp -->
         </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 85%
rename from part-1/2-html-attributes/index.html
rename to week-1/2-html-attributes/index.html
index dc861fa..669964e 100644
--- a/part-1/2-html-attributes/index.html
+++ b/week-1/2-html-attributes/index.html
@@ -23,14 +23,14 @@
         <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 in Merchant City</a>.
           </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="Funny GIF" >
           </p>
           <span class="message__time">7:38pm</span>
         </div>
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..50f9ffa 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 in Merchant City</a>.
           </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" alt="Funny GIF">
           </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 89%
rename from part-1/4-links-scripts/index.html
rename to week-1/4-links-scripts/index.html
index 303c7fb..9c764fe 100644
--- a/part-1/4-links-scripts/index.html
+++ b/week-1/4-links-scripts/index.html
@@ -4,14 +4,14 @@
     <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>
     <div class="site-wrapper">
       <div class="site-header">
         <div class="site-header__title">Messages</div>
       </div>
-      <div class="messages">
+      <div class="m align-items:;essages">
         <div class="message">
           <div class="message__author">Won</div>
           <p class="message__content">Where should we meet later?</p>
@@ -33,5 +33,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..2d51601
--- /dev/null
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -0,0 +1,11 @@
+#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..588c55d
--- /dev/null
+++ b/week-1/6-css-properties/styles.css
@@ -0,0 +1,22 @@
+/* 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: 4px solid blue;
+  }
+  
+  .message__time--old {
+    opacity: 0.7;
+  }
+  
+  .message__content {
+    line-height: 1.5;
+  }
\ 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 70%
rename from part-1/7-css-box/styles.css
rename to week-1/7-css-box/styles.css
index 013b94f..4c1a37f 100644
--- a/part-1/7-css-box/styles.css
+++ b/week-1/7-css-box/styles.css
@@ -1,6 +1,17 @@
 /* Try different box model properties below */
+
+
+
 .pages__page {
   border: 1px solid #4491db;
   border-radius: 4px;
   background: #fff;
+ 
 }
+
+
+.country {
+  margin: 10px 0;
+  padding: 10px;
+ 
+}
\ 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..71cd429
--- /dev/null
+++ b/week-1/8-advanced-selectors/styles.css
@@ -0,0 +1,18 @@
+/* Try different box model properties below */
+.site-header > .site-header__title {
+    color: white;
+    margin-bottom: 0;
+  }
+  
+  .site-footer > p:last-child {
+    font-size: 12px;
+    text-align: center;
+  }
+  
+  .message.message--unread:last-child {
+    box-shadow: 4px 4px 0 #dba944;
+  }
+  .site-header > p {
+    color: white;
+  }
+  
\ 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/week-1/9-git-branch/styles.css b/week-1/9-git-branch/styles.css
new file mode 100644
index 0000000..bd3804c
--- /dev/null
+++ b/week-1/9-git-branch/styles.css
@@ -0,0 +1,5 @@
+.link {
+  color: rgb(43, 221, 43);
+  font-weight: 700;
+  text-decoration: none;
+}
\ No newline at end of file
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
new file mode 100644
index 0000000..ecb1a2a
--- /dev/null
+++ b/week-2/10-media-queries/columns.css
@@ -0,0 +1,17 @@
+/* Add your own CSS code below */
+.countries {
+    columns: 1;
+  }
+  
+  @media (min-width: 769px) {
+    .countries {
+      columns: 2;
+    }
+  }
+  
+  @media (min-width: 1201px) {
+    .countries {
+      columns: 3;
+    }
+  }
+  
\ No newline at end of file
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..f3351b7
--- /dev/null
+++ b/week-2/11-flexbox/flexbox.css
@@ -0,0 +1,16 @@
+
+  
+  .countries {
+    
+    display: flex; 
+  }
+  
+ .countries--first{
+    flex-direction: row-reverse;
+ }
+ .countries--second {
+    flex-direction: column;
+ }
+ .countries--third {
+    flex-direction: column-reverse;
+ }
\ No newline at end of file
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..d1782be
--- /dev/null
+++ b/week-2/12-justify-content/flexbox.css
@@ -0,0 +1,24 @@
+.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;
+}
\ No newline at end of file
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..273afc9
--- /dev/null
+++ b/week-2/13-align-items/flexbox.css
@@ -0,0 +1,20 @@
+.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;
+}
\ No newline at end of file
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..b03e8a5
--- /dev/null
+++ b/week-2/14-order/flexbox.css
@@ -0,0 +1,49 @@
+.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;
+}
\ No newline at end of file
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..41b4873
--- /dev/null
+++ b/week-2/15-align-self/flexbox.css
@@ -0,0 +1,43 @@
+.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;
+}
\ No newline at end of file
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..75cdb77
--- /dev/null
+++ b/week-2/16-more-flexbox/flexbox.css
@@ -0,0 +1,56 @@
+.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;
+}
\ No newline at end of file
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..8330601
--- /dev/null
+++ b/week-2/17-nav-menu/styles.css
@@ -0,0 +1,27 @@
+@media screen and (min-width: 481px) {
+  .site-header__nav {
+    display: flex;
+  }
+}
+
+@media screen and (min-width: 701px) {
+  .site-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .site-header__nav {
+    flex: 1;
+  }
+}
+
+@media screen and (min-width: 993px) {
+  .site-header {
+    justify-content: 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 75%
rename from part-3/19-search/index.html
rename to week-3/19-search/index.html
index d94ec98..b02f4a1 100644
--- a/part-3/19-search/index.html
+++ b/week-3/19-search/index.html
@@ -11,7 +11,8 @@
   <body>
     <div class="site-wrapper">
       <main>
-        <p>Delete this line and add your form.</p>
+        <form method="GET" action="https://www.google.com/search">
+          <input type="text" name="q" placeholder="Search on Google" />
       </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/week-3/20-labels/index.html b/week-3/20-labels/index.html
new file mode 100644
index 0000000..f2ae85d
--- /dev/null
+++ b/week-3/20-labels/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Form Labels Exercise</title>
+  <link rel="stylesheet" href="/css/normalize.css" />
+  <link rel="stylesheet" href="/css/week3-forms.css" />
+</head>
+<body>
+  <div class="site-wrapper">
+    <main>
+      <form method="GET" action="https://www.google.com/search">
+        <!-- Add a label here -->
+        <label for="search-input">Search on Google</label>
+        <input type="text" id="search-input" name="q" />
+      </form>
+    </main>
+  </div>
+</body>
+</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/week-3/21-buttons/index.html b/week-3/21-buttons/index.html
new file mode 100644
index 0000000..d6c9256
--- /dev/null
+++ b/week-3/21-buttons/index.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>21 - Form Buttons - 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>
+        <form method="GET" action="https://www.google.com/search">
+          <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>
+  </body>
+</html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>21 - Form Buttons - 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>
+        <form method="GET" action="https://www.google.com/search">
+          <label for="search-input">Search on Google</label>
+          <input type="text" name="q" id="search-input" />
+          <!-- Add a submit button here -->
+        </form>
+      </main>
+    </div>
+  </body>
+</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/week-3/22-checkout/index.html b/week-3/22-checkout/index.html
new file mode 100644
index 0000000..e1ac131
--- /dev/null
+++ b/week-3/22-checkout/index.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>22 - Checkout Form - 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>
+      <div class="shopping-basket">
+        <h1 class="shopping-basket__title">Your Shopping Basket</h1>
+        <table class="shopping-basket__items">
+          <tr>
+            <th>Product</th>
+            <th>Size</th>
+            <th>Units</th>
+            <th>Price</th>
+          </tr>
+          <tr>
+            <td>
+              <div class="shopping-basket__product">
+                <img src="/images/22/shirts.jpg" alt="Codi t-shirts in black" />
+                <p>Codi t-shirt, black</p>
+              </div>
+            </td>
+            <td>Medium</td>
+            <td>1</td>
+            <td>£10.00</td>
+          </tr>
+        </table>
+      </div>
+
+      <div class="checkout">
+        <h2 class="checkout__title">Checkout</h2>
+        <form method="GET" id="checkout-form" class="checkout__form">
+          <p>
+            <label for="customer-name">Name:</label>
+            <input type="text" id="customer-name" name="customer-name" required>
+          </p>
+          <p>
+            <label for="customer-email">Email:</label>
+            <input type="email" id="customer-email" name="customer-email" required>
+          </p>
+          <p>
+            <label for="customer-phone">Phone:</label>
+            <input type="tel" id="customer-phone" name="customer-phone" required>
+          </p>
+          <button type="submit">Complete Purchase</button>
+        </form>
+      </div>
+    </main>
+  </div>
+</body>
+</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/week-3/23-comments/index.html b/week-3/23-comments/index.html
new file mode 100644
index 0000000..af6361f
--- /dev/null
+++ b/week-3/23-comments/index.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>23 - Blog Comments - 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>
+      <article>
+        <h1>Our t-shirts are amazing!</h1>
+        <p>
+          Lorem ipsum dolor sit amet, aliquam laoreet quaestio in eum, ea tation dignissim vix. Ei
+          nec audire vocibus corrumpit. Ut quo facilisis adipiscing, malis sensibus abhorreant vel
+          ei. Hinc appareat dissentias pri at, impedit propriae ea eos. Modus feugait te duo, sit
+          noluisse salutatus maiestatis ea. Iisque volumus duo ex, deleniti aliquando quo ne.
+        </p>
+        <p>
+          Eos nibh maiorum voluptatibus ea, an labitur phaedrum sed, vis justo option intellegat
+          ad. Vel ut ferri dolores. Ad hinc moderatius scriptorem vim, utamur electram ad est, sed
+          no dicit homero dissentias. Usu qualisque concludaturque id, prodesset concludaturque eu
+          usu, ea est regione platonem. Et rebum theophrastus per, dicta aliquam adipisci pri cu,
+          ne quem justo mea.
+        </p>
+      </article>
+      <div class="comments">
+        <p>Add your comments and let us know what you think!</p>
+        <form method="get">
+          <label for="comment">Leave a Comment:</label>
+          <textarea id="comment" name="comment" rows="4" cols="50"></textarea>
+          <button type="submit">Send Comment</button>
+        </form>
+      </div>
+    </main>
+  </div>
+</body>
+</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/week-3/24-dietary/index.html b/week-3/24-dietary/index.html
new file mode 100644
index 0000000..c92ad32
--- /dev/null
+++ b/week-3/24-dietary/index.html
@@ -0,0 +1,53 @@
+<!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" />
+  <style>
+    label {
+      display: block;
+      margin-bottom: 8px;
+    }
+  </style>
+</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>
+        <fieldset>
+          <legend>Please select all of your dietary requirements</legend>
+          <label>
+            <input type="checkbox" name="dietary" />
+            Halal
+          </label>
+          <label>
+            <input type="checkbox" name="dietary" />
+            Kosher
+          </label>
+          <label>
+            <input type="checkbox" name="dietary" />
+            Vegetarian
+          </label>
+          <label>
+            <input type="checkbox" name="dietary" />
+            Vegan
+          </label>
+          <label>
+            <input type="checkbox" name="dietary" />
+            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/week-3/25-shirt-size/index.html b/week-3/25-shirt-size/index.html
new file mode 100644
index 0000000..385bbd5
--- /dev/null
+++ b/week-3/25-shirt-size/index.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>25 - T-Shirt Size - HTML, CSS and Git Exercises</title>
+  <link rel="stylesheet" href="/css/normalize.css" />
+  <link rel="stylesheet" href="/css/week3-forms.css" />
+  <link rel="stylesheet" href="styles.css" />
+</head>
+<body>
+  <div class="site-wrapper">
+    <main>
+      <div class="shopping-basket">
+        <h1 class="shopping-basket__title">Your Shopping Basket</h1>
+        <table class="shopping-basket__items">
+          <tr>
+            <th>Product</th>
+            <th>Size</th>
+            <th>Units</th>
+            <th>Price</th>
+          </tr>
+          <tr>
+            <td>
+              <div class="shopping-basket__product">
+                <img src="/images/22/shirts.jpg" alt="Codi t-shirts in black" />
+                <p>Codi t-shirt, black</p>
+              </div>
+            </td>
+            <td>
+              <form>
+                <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
+            </td>
+            <td>
+              £10.00
+            </td>
+          </tr>
+        </table>
+      </div>
+    </main>
+  </div>
+</body>
+</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/week-3/25-shirt-size/styles.css b/week-3/25-shirt-size/styles.css
new file mode 100644
index 0000000..2890a9c
--- /dev/null
+++ b/week-3/25-shirt-size/styles.css
@@ -0,0 +1,8 @@
+/* Add your CSS below */
+/* styles.css */
+.screenreader {
+    clip: rect(1px, 1px, 1px, 1px);
+    position: absolute !important;
+    left: -2000px;
+  }
+  
\ No newline at end of file
diff --git a/week-3/26-checkout-groups/index.html b/week-3/26-checkout-groups/index.html
new file mode 100644
index 0000000..868ec4e
--- /dev/null
+++ b/week-3/26-checkout-groups/index.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>27 - Field Attributes - 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>
+    <div class="shopping-basket">
+      <h1 class="shopping-basket__title">Your Shopping Basket</h1>
+      <table class="shopping-basket__items">
+        <tr>
+          <th>Product</th>
+          <th>Size</th>
+          <th>Units</th>
+          <th>Price</th>
+        </tr>
+        <tr>
+          <td>
+            <div class="shopping-basket__product">
+              <img src="/images/22/shirts.jpg" alt="Codi t-shirts in black" />
+              <p>Codi t-shirt, black</p>
+            </div>
+          </td>
+          <td>Medium</td>
+          <td>1</td>
+          <td>£10.00</td>
+        </tr>
+      </table>
+    </div>
+
+    <div class="checkout">
+      <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>
+          <p>
+            <label for="billing-address-1">Address Line 1</label>
+            <input type="text" name="billing-address-1" id="billing-address-1" />
+          </p>
+          <p>
+            <label for="billing-address-2">Address Line 2</label>
+            <input type="text" name="billing-address-2" id="billing-address-2" />
+          </p>
+          <p>
+            <label for="billing-postcode">Postcode</label>
+            <input type="text" name="billing-postcode" id="billing-postcode" />
+          </p>
+          <p>
+            <label for="billing-city">City</label>
+            <input type="text" name="billing-city" id="billing-city" />
+          </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" />
+          </p>
+          <p>
+            <label for="delivery-address-2">Address Line 2</label>
+            <input type="text" name="delivery-address-2" id="delivery-address-2" />
+          </p>
+          <p>
+            <label for="delivery-address-postcode">Postcode</label>
+            <input
+              type="text"
+              name="delivery-address-postcode"
+              id="delivery-address-postcode"
+            />
+          </p>
+          <p>
+            <label for="delivery-address-city">City</label>
+            <input type="text" name="delivery-address-city" id="delivery-address-city" />
+          </p>
+          <p>
+            <label for="delivery-country">Country</label>
+            <input type="text" name="delivery-country" id="delivery-country" />
+          </p>
+        </fieldset>
+
+        <button type="submit">Complete Purchase</button>
+      </form>
+    </div>
+  </main>
+</div>
+</body>
+</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 78%
rename from part-3/27-attributes/index.html
rename to week-3/27-attributes/index.html
index e54fd83..8e99364 100644
--- a/part-3/27-attributes/index.html
+++ b/week-3/27-attributes/index.html
@@ -37,64 +37,53 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
         <div class="checkout">
           <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>
               <p>
                 <label for="billing-address-1">Address Line 1</label>
-                <input type="text" name="billing-address-1" id="billing-address-1" />
-              </p>
-              <p>
-                <label for="billing-address-2">Address Line 2</label>
-                <input type="text" name="billing-address-2" id="billing-address-2" />
+                <input type="text" name="billing-address-1" id="billing-address-1" required />
               </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 />
               </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 />
               </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" />
-              </p>
-              <p>
-                <label for="delivery-address-2">Address Line 2</label>
-                <input type="text" name="delivery-address-2" id="delivery-address-2" />
+                <input type="text" name="delivery-address-1" id="delivery-address-1" required />
               </p>
               <p>
                 <label for="delivery-address-postcode">Postcode</label>
-                <input
-                  type="text"
-                  name="delivery-address-postcode"
-                  id="delivery-address-postcode"
-                />
+                <input type="text" name="delivery-address-postcode" id="delivery-address-postcode" 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 />
               </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>
+              <p>
+                <label>Delivery Options</label>
                 <label>
                   <input
                     type="radio"
                     name="delivery-option"
                     id="delivery-option"
                     value="standard"
+                    checked
+                    disabled
                   />
                   Royal Mail
                 </label>
-              </fieldset>
+              </p>
             </fieldset>
 
             <button type="submit">Complete Purchase</button>
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..4580227 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: #ff00ea;
   font-weight: 700;
   text-decoration: none;
 }
diff --git a/week-3/29-combined-skills/about.html b/week-3/29-combined-skills/about.html
new file mode 100644
index 0000000..94a059b
--- /dev/null
+++ b/week-3/29-combined-skills/about.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>About Us</title>
+  <link rel="stylesheet" href="/css/normalize.css" />
+  <link rel="stylesheet" href="/css/combined-skills.css" />
+  <link rel="stylesheet" href="styles.css" />
+</head>
+<body>
+  <div class="site-wrapper">
+    <header class="site-header">
+      <h1 class="site-header__title">C.Y.F</h1>
+      <div class="main-nav">
+        <ul class="main-nav__list">
+          <li class="main-nav__list-item">
+            <a href="index.html">Latest</a>
+          </li>
+          <li class="main-nav__list-item">
+            <a href="about.html">About</a>
+          </li>
+          <li class="main-nav__list-item">
+            <a href="contact.html">Contact</a>
+          </li>
+        </ul>
+      </div>
+      <form class="site-search" action="/search">
+        <label for="search-input">Search</label>
+        <input id="search-input" class="site-search__input" type="text" name="search" />
+        <svg
+          aria-hidden="true"
+          data-prefix="fas"
+          data-icon="search"
+          class="svg-inline--fa fa-search fa-w-16"
+          role="img"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 512 512"
+        >
+          <path
+            fill="currentColor"
+            d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+          ></path>
+        </svg>
+        <button type="submit">Submit</button>
+      </form>
+    </header>
+
+    <main>
+      <article>
+        <h1>About CODI</h1>
+        <p>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc non ligula nec turpis
+          aliquet malesuada. Sed euismod justo nec augue accumsan, a interdum eros aliquam. Duis
+          eu magna eget ex bibendum tincidunt sit amet at odio. Nam nec elit eget magna ultrices
+          hendrerit ut nec tortor.
+        </p>
+        <p>
+          Sed id lectus non urna sodales ornare non ac nulla. Sed sit amet efficitur ante, at
+          dignissim velit. Pellentesque a tellus nec urna interdum feugiat.
+        </p>
+      </article>
+    </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>.
+      </p>
+      <p>
+        <svg
+          aria-hidden="true"
+          data-prefix="fas"
+          data-icon="search"
+          class="svg-inline--fa fa-search fa-w-16"
+          role="img"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 512 512"
+        >
+          <path
+            fill="currentColor"
+            d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+          ></path>
+        </svg>
+        icon by <a href="https://fontawesome.com/license">FontAwesome</a>. Photos from
+        <a href="https://unsplash.com/">Unsplash</a>.
+      </p>
+    </footer>
+  </div>
+</body>
+</html>
diff --git a/week-3/29-combined-skills/contact.html b/week-3/29-combined-skills/contact.html
new file mode 100644
index 0000000..49242dc
--- /dev/null
+++ b/week-3/29-combined-skills/contact.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Contact Us</title>
+  <link rel="stylesheet" href="/css/normalize.css" />
+  <link rel="stylesheet" href="/css/combined-skills.css" />
+  <link rel="stylesheet" href="styles.css" />
+</head>
+<body>
+  <div class="site-wrapper">
+    <header class="site-header">
+      <h1 class="site-header__title">C.Y.F</h1>
+      <div class="main-nav">
+        <ul class="main-nav__list">
+          <li class="main-nav__list-item">
+            <a href="index.html">Latest</a>
+          </li>
+          <li class="main-nav__list-item">
+            <a href="about.html">About</a>
+          </li>
+          <li class="main-nav__list-item">
+            <a href="contact.html">Contact</a>
+          </li>
+        </ul>
+      </div>
+      <form class="site-search" action="/search">
+        <label for="search-input">Search</label>
+        <input id="search-input" class="site-search__input" type="text" name="search" />
+        <svg
+          aria-hidden="true"
+          data-prefix="fas"
+          data-icon="search"
+          class="svg-inline--fa fa-search fa-w-16"
+          role="img"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 512 512"
+        >
+          <path
+            fill="currentColor"
+            d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+          ></path>
+        </svg>
+        <button type="submit">Submit</button>
+      </form>
+    </header>
+
+    <main>
+      <h1>Contact Us</h1>
+      <form class="contact-form">
+        <div class="contact-form__field">
+          <label for="name">Name</label>
+          <input type="text" id="name" name="name" required />
+        </div>
+        <div class="contact-form__field">
+          <label for="email">Email</label>
+          <input type="email" id="email" name="email" required />
+        </div>
+        <div class="contact-form__field">
+          <label for="message">Message</label>
+          <textarea id="message" name="message" required></textarea>
+        </div>
+        <fieldset class="contact-form__field">
+          <legend>What branch are you interested in?</legend>
+          <label>
+            <input type="radio" name="branch" value="London" />
+            London
+          </label>
+          <label>
+            <input type="radio" name="branch" value="Glasgow" />
+            Glasgow
+          </label>
+          <label>
+            <input type="radio" name="branch" value="Manchester" />
+            Manchester
+          </label>
+        </fieldset>
+        <button type="submit">Submit</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>.
+      </p>
+      <p>
+        <svg
+          aria-hidden="true"
+          data-prefix="fas"
+          data-icon="search"
+          class="svg-inline--fa fa-search fa-w-16"
+          role="img"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 512 512"
+        >
+          <path
+            fill="currentColor"
+            d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+          ></path>
+        </svg>
+        icon by <a href="https://fontawesome.com/license">FontAwesome</a>. Photos from
+        <a href="https://unsplash.com/">Unsplash</a>.
+      </p>
+    </footer>
+  </div>
+</body>
+</html>
diff --git a/week-3/29-combined-skills/index.html b/week-3/29-combined-skills/index.html
new file mode 100644
index 0000000..9897080
--- /dev/null
+++ b/week-3/29-combined-skills/index.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>29 - Combined Skills - HTML, CSS and Git Exercises</title>
+  <link rel="stylesheet" href="/css/normalize.css" />
+  <link rel="stylesheet" href="/css/combined-skills.css" />
+  <link rel="stylesheet" href="styles.css" />
+</head>
+<body>
+  <div class="site-wrapper">
+    <header class="site-header">
+      <h1 class="site-header__title">CODI</h1>
+      <div class="main-nav">
+        <ul class="main-nav__list">
+          <li class="main-nav__list-item">
+            <a href="index.html">Latest</a>
+          </li>
+          <li class="main-nav__list-item">
+            <a href="about.html">About</a>
+          </li>
+          <li class="main-nav__list-item">
+            <a href="contact.html">Contact</a>
+          </li>
+        </ul>
+      </div>
+      <form class="site-search" action="/search">
+        <label for="search-input">Search</label>
+        <input id="search-input" class="site-search__input" type="text" name="search" />
+        <svg
+          aria-hidden="true"
+          data-prefix="fas"
+          data-icon="search"
+          class="svg-inline--fa fa-search fa-w-16"
+          role="img"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 512 512"
+        >
+          <path
+            fill="currentColor"
+            d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+          ></path>
+        </svg>
+        <button type="submit">Submit</button>
+      </form>
+    </header>
+
+    <main>
+      <div class="hero">
+        <img class="hero__image" src="/images/29-hero.jpg" alt="Hero Image" />
+        <h2 class="hero__title red-heart">
+          Duis aute irure dolor in reprehenderit in voluptate velit
+        </h2>
+        <p class="hero__author">By <span>Nostrud Fugiat</span></p>
+        <p class="hero__time">
+          <time datetime="2019-02-05">February 5, 2019</time>
+        </p>
+      </div>
+      <div 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">
+        <div class="item">
+          <img class="item__image" src="/images/29-item-1.jpg" alt="Item 1 Image" />
+          <h2 class="item__title">
+            Consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore
+          </h2>
+          <p class="item__author">By <span>Aliquip Occaecat</span></p>
+          <p class="item__time">
+            <time datetime="2019-02-03">February 2, 2019</time>
+          </p>
+        </div>
+        <div class="item">
+          <img class="item__image" src="/images/29-item-2.jpg" alt="Item 2 Image" />
+          <h2 class="item__title">
+            Sunt in culpa qui officia deserunt mollit anim
+          </h2>
+          <p class="item__author">By <span>Laboris Nisit</span></p>
+          <p class="item__time">
+            <time datetime="2019-01-27">January 27, 2019</time>
+          </p>
+        </div>
+        <div class="item">
+          <img class="item__image" src="/images/29-item-3.jpg" alt="Item 3 Image" />
+          <h2 class="item__title">
+            Voluptate velit esse cillum dolore eu fugiat nulla pariaturt
+          </h2>
+          <p class="item__author">By <span>Minim Veniam</span></p>
+          <p class="item__time">
+            <time datetime="2019-01-19">January 19, 2019</time>
+          </p>
+        </div>
+      </div>
+    </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>.
+      </p>
+      <p>
+        <svg
+          aria-hidden="true"
+          data-prefix="fas"
+          data-icon="search"
+          class="svg-inline--fa fa-search fa-w-16"
+          role="img"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 512 512"
+        >
+          <path
+            fill="currentColor"
+            d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+          ></path>
+        </svg>
+        icon by <a href="https://fontawesome.com/license">FontAwesome</a>. Photos from
+        <a href="https://unsplash.com/">Unsplash</a>.
+      </p>
+    </footer>
+  </div>
+</body>
+</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/week-3/29-combined-skills/styles.css b/week-3/29-combined-skills/styles.css
new file mode 100644
index 0000000..07c7c2a
--- /dev/null
+++ b/week-3/29-combined-skills/styles.css
@@ -0,0 +1,111 @@
+/* Add your own CSS code below */
+body {
+    font-family: Arial, sans-serif;
+    line-height: 1.6;
+  }
+  
+  .site-header {
+    background-color: #333;
+    color: #fff;
+    padding: 1rem;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  
+  .site-header__title {
+    font-size: 2rem;
+  }
+  
+  .main-nav__list {
+    list-style: none;
+    display: flex;
+  }
+  
+  .main-nav__list-item {
+    margin-right: 1rem;
+  }
+  
+  .main-nav__list-item:last-child {
+    margin-right: 0;
+  }
+  
+  .main-nav__list-item a {
+    color: #fff;
+    text-decoration: none;
+  }
+  
+  .site-search {
+    display: flex;
+    align-items: center;
+  }
+  
+  .site-search__input {
+    padding: 0.5rem;
+    border: none;
+    border-radius: 3px;
+  }
+  
+  .contact-form {
+    margin-top: 2rem;
+  }
+  
+  .contact-form__field {
+    margin-bottom: 1rem;
+  }
+  
+  .contact-form label {
+    display: block;
+    font-weight: bold;
+  }
+  
+  .contact-form input,
+  .contact-form textarea {
+    width: 100%;
+    padding: 0.5rem;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+  }
+  
+  .contact-form textarea {
+    resize: vertical;
+  }
+  
+  .contact-form button {
+    background-color: #333;
+    color: #fff;
+    padding: 0.5rem 1rem;
+    border: none;
+    border-radius: 3px;
+    cursor: pointer;
+  }
+  
+  footer {
+    background-color: #f4f4f4;
+    padding: 1rem;
+    text-align: center;
+  }
+  
+  @media screen and (min-width: 768px) {
+    .site-header {
+      flex-direction: row;
+    }
+  
+    .site-header__title {
+      margin-right: 2rem;
+    }
+  
+    .main-nav__list {
+      margin-left: auto;
+    }
+  
+    .contact-form__field {
+      display: flex;
+      flex-direction: column;
+    }
+  
+    .contact-form button {
+      margin-top: 1rem;
+    }
+  }
+  
\ No newline at end of file
