diff --git a/unit00_introduction/README.md b/unit00_introduction/README.md
index 586180a..825fe3b 100644
--- a/unit00_introduction/README.md
+++ b/unit00_introduction/README.md
@@ -37,95 +37,90 @@ We will be using a Ubuntu machine for the practical elements of the module. The
     <td width="30%" bgcolor="#990000" class="table1"><strong>Lab</strong></td>
   </tr>
 <tr>
-    <td bgcolor="#990000" class="table1"><strong>1</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>17 Jan 2020 </strong></td>
-    <td>Ciphers and Fundamentals <a href="https://github.com/billbuchanan/esecurity/tree/master/unit01_cipher_fundamentals">Unit</a></td>
-    <td>Lab [<a href="https://github.com/billbuchanan/esecurity/blob/master/unit01_cipher_fundamentals/lab/new_lab01.pdf" target="_blank">Link</a>] Demo [<a href="https://www.youtube.com/watch?v=v6H7lHblKes" target="_blank">Link</a>]</td>
+    <td bgcolor="#990000" class="table1"><strong>2</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>29 Jan 2021 </strong></td>
+    <td>Ciphers and Fundamentals <a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit01_cipher_fundamentals">Unit</a></td>
+    <td>Lab [<a href="https://github.com/billbuchanan/appliedcrypto/blob/master/unit01_cipher_fundamentals/lab/new_lab01.pdf" target="_blank">Link</a>] Demo [<a href="https://www.youtube.com/watch?v=v6H7lHblKes" target="_blank">Link</a>]</td>
 </tr>
 <tr>
-    <td bgcolor="#990000" class="table1"><strong>2</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>24 Jan 2020 </strong></td>
-    <td>Symmetric Key <a href="https://github.com/billbuchanan/esecurity/tree/master/unit02_symmetric">Unit</a></td>
-    <td>Lab [<a href="https://github.com/billbuchanan/esecurity/blob/master/unit02_symmetric/lab/new_lab02.pdf" target="_blank">Link</a>] Demo [<a href="https://www.youtube.com/watch?v=N3UADaXmOik" target="_blank">Link</a>]</td>
+    <td bgcolor="#990000" class="table1"><strong>3</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>5 Feb 2021 </strong></td>
+    <td>Symmetric Key <a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit02_symmetric">Unit</a></td>
+    <td>Lab [<a href="https://github.com/billbuchanan/appliedcrypto/blob/master/unit02_symmetric/lab/new_lab02.pdf" target="_blank">Link</a>] Demo [<a href="https://www.youtube.com/watch?v=N3UADaXmOik" target="_blank">Link</a>]</td>
 </tr>
     <tr>
-    <td bgcolor="#990000" class="table1"><strong>3</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>31 Jan 2020 </strong></td>
-    <td>Hashing and MAC <a href="https://github.com/billbuchanan/esecurity/tree/master/unit03_hashing">Unit</a></td>
-    <td>Lab [<a href="https://github.com/billbuchanan/esecurity/blob/master/unit03_hashing/lab/new_lab03.pdf" target="_blank">Link</a>]</td>
+    <td bgcolor="#990000" class="table1"><strong>4</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>12 Feb 2021 </strong></td>
+    <td>Hashing and MAC <a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit03_hashing">Unit</a></td>
+    <td>Lab [<a href="https://github.com/billbuchanan/appliedcrypto/blob/master/unit03_hashing/lab/new_lab03.pdf" target="_blank">Link</a>]</td>
 </tr>
         <tr>
-    <td bgcolor="#990000" class="table1"><strong>4</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>7 Feb 2020 </strong></td>
-    <td>Asymmetric (Public) Key <a href="https://github.com/billbuchanan/esecurity/tree/master/unit04_public_key">Unit</a></td>
+    <td bgcolor="#990000" class="table1"><strong>5</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>19 Feb 2021 </strong></td>
+    <td>Asymmetric (Public) Key <a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit04_public_key">Unit</a></td>
     <td>Lab [<a href="https://asecuritysite.com/public/new_lab04.pdf" target="_blank">Link</a>]</td>
 </tr>
             <tr>
-    <td bgcolor="#990000" class="table1"><strong>5</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>14 Feb 2020 </strong></td>
-    <td>Key Exchange <a href="https://asecuritysite.com/esecurity/unit05">Unit</a></td>
-    <td>Lab [<a href="https://asecuritysite.com/public/new_lab05.pdf" target="_blank">Link</a>]</td>
+    <td bgcolor="#990000" class="table1"><strong>6</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>26 Feb 2021 </strong></td>
+    <td>Key Exchange <a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit05_key_exchange">Unit</a></td>
+    <td>Lab [<a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit05_key_exchange/lab" target="_blank">Link</a>]</td>
 </tr>
                 <tr>
-    <td bgcolor="#990000" class="table1"><strong>6</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>21 Feb 2020</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>7</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>5 Mar 2021</strong></td>
     <td>Guest lecture</td>
-    <td>Mini-project/Coursework [<a href="https://asecuritysite.com/public/lab_mini_project.pdf" target="_blank">Link</a>]</td>
+    <td>Mini-project/Coursework [<a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit05a_mini_project" target="_blank">Link</a>]</td>
 </tr>
                     <tr>
-    <td bgcolor="#990000" class="table1"><strong>7</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>28 Feb 2020 </strong></td>
-    <td>Trust and Digital Certificates <a href="https://asecuritysite.com/esecurity/unit06">Unit</a></td>
-    <td>Lab [<a href="https://asecuritysite.com/public/new_lab06.pdf" target="_blank">Link</a>]</td>
+    <td bgcolor="#990000" class="table1"><strong>8</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>12 Mar 2021 </strong></td>
+    <td>Trust and Digital Certificates <a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit06_trust_dig_cert">Unit</a></td>
+    <td>Lab [<a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit06_trust_dig_cert/lab" target="_blank">Link</a>]</td>
 </tr>
                         <tr>
-    <td bgcolor="#990000" class="table1"><strong>8</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>6 Mar 2020</strong></td>
-    <td>Tunnelling <a href="https://asecuritysite.com/esecurity/unit07">Unit</a></td>
-    <td>Lab [<a href="https://asecuritysite.com//public/new_lab07.pdf" target="_blank">Link</a>]</td>
+    <td bgcolor="#990000" class="table1"><strong>9</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>19 Mar 2021</strong></td>
+    <td>Tunnelling <a href="hhttps://github.com/billbuchanan/appliedcrypto/tree/master/unit07_tunnelling">Unit</a></td>
+    <td>Lab [<a href="https://github.com/billbuchanan/appliedcrypto/tree/master/unit07_tunnelling/lab" target="_blank">Link</a>]</td>
 </tr>
 <tr>
-    <td bgcolor="#990000" class="table1"><strong>9</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>13 Mar 2020</strong></td>
-    <td>Test 1 (Units 1-5) [<a href="https://asecuritysite.com/esecurity/guide" target="_blank">Study guide</a>]</td>
+    <td bgcolor="#990000" class="table1"><strong>10</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>26 Mar 2021</strong></td>
+    <td>Test 1 (Units 1-5) [<a href="https://github.com/billbuchanan/appliedcrypto/tree/master/z_assessments/test01" target="_blank">Study guide</a>]</td>
 </tr>
                             <tr>
-    <td bgcolor="#990000" class="table1"><strong>10</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>20 Mar 2020 </strong></td>
+    <td bgcolor="#990000" class="table1"><strong>11</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>23 Apr 2021 </strong></td>
     <td>Blockchain <a href="https://asecuritysite.com/esecurity/unit08">Unit</a></td>
     <td>Lab [<a href="https://asecuritysite.com/public/new_lab08_linux.pdf" target="_blank">Link</a>]</td>
 </tr>
                                 <tr>
-    <td bgcolor="#990000" class="table1"><strong>11</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>27 Mar 2020 </strong></td>
+    <td bgcolor="#990000" class="table1"><strong>12</strong></td>
+    <td bgcolor="#990000" class="table1"><strong>30 Apr 2021 </strong></td>
     <td>Future Cryptography <a href="https://asecuritysite.com/esecurity/unit09">Unit</a></td>
     <td>Lab [<a href="https://asecuritysite.com/public/new_lab09.pdf" target="_blank">Link</a>]</td>
 </tr>
                                 <tr>
-                                    <td bgcolor="#990000" class="table1"><strong>12</strong></td>
-                                    <td bgcolor="#990000" class="table1"><strong>3 April 2020 </strong></td>
+                                    <td bgcolor="#990000" class="table1"><strong>13</strong></td>
+                                    <td bgcolor="#990000" class="table1"><strong>7 May 2021 </strong></td>
                                     <td>Tokens, Authorization and Docker <a href="https://asecuritysite.com/esecurity/unit10">Unit</a></td>
                                     <td>Lab [<a href="https://asecuritysite.com/public/unit10_tokens.pdf" target="_blank">Link</a>]</td>
                                 </tr>
                                 <tr>
-                                    <td bgcolor="#990000" class="table1"><strong>13</strong></td>
-                                    <td bgcolor="#990000" class="table1"><strong>10 April 2020 </strong></td>
+                                    <td bgcolor="#990000" class="table1"><strong>14</strong></td>
+                                    <td bgcolor="#990000" class="table1"><strong>14 May 2021 </strong></td>
                                     <td>Trusted Hosts <a href="https://asecuritysite.com//esecurity/unit11">Unit</a></td>
                                     <td></td>
                                 </tr>
+   <tr>
+                                    <td bgcolor="#990000" class="table1"><strong>15</strong></td>
+                                    <td bgcolor="#990000" class="table1"><strong>21 May 2021 </strong></td>
+                                    <td>Coursework Hand-in [<a href="https://asecuritysite.com//esecurity/cw" target="_blank">Draft</a>]</td>
+                                    <td></td>
+                                </tr>
 
-<tr><td colspan="3">Easter Break</td></tr>
-        <tr>
-    <td bgcolor="#990000" class="table1"><strong>14</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>Week beginning 27 April 2020 (TBC)</strong></td>
-    <td colspan="2"></td>
-</tr>
-            <tr>
-    <td bgcolor="#990000" class="table1"><strong>15</strong></td>
-    <td bgcolor="#990000" class="table1"><strong>Week beginning 4 May 2020 (TBC)</strong></td>
-    <td>Coursework Hand-in [<a href="https//asecuritysite.com//esecurity/cw" target="_blank">Draft</a>]</td>
 
-</tr>
 </table>
 
 Any questions, contact us on Teams?