@@ -37,70 +37,34 @@
 
 ### Structure
  <pre>
-[Chapter 1: Java syntax basics](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%201%20-%20Basics)
+[Chapter 1: Java syntax basics](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%201%20-%20Basics) (`06/07 - 19/07`)
 </pre>
-* Period: `06/07 - 19/07`
-* [Assignments](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%201%20-%20Basics/Assignments)
-	- 1.1 - [Sum of multiples](https://github.com/JavaSummer/JavaMainRepo/blob/master/Content/Chapter%201%20-%20Basics/Assignments/Assignment%201%20-%20Sum%20of%20multiples.pdf)
-	- 1.2 - [Fibonacci even sum](https://github.com/JavaSummer/JavaMainRepo/blob/master/Content/Chapter%201%20-%20Basics/Assignments/Assignment%202%20-%20Fibonacci%20even%20sum.pdf)
-	- 1.3 - [Largest palindrome](https://github.com/JavaSummer/JavaMainRepo/blob/master/Content/Chapter%201%20-%20Basics/Assignments/Assignment%203%20-%20Largest%20palindrome.pdf)
-	- 1.4 - [Prime spiral](https://github.com/JavaSummer/JavaMainRepo/blob/master/Content/Chapter%201%20-%20Basics/Assignments/Assignment%204%20(optional)%20-%20Prime%20spiral.pdf) (optional)
- 
--
  <pre>
-[Chapter 2: Classes and Objects](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%202%20-%20Classes%20and%20Objects)
+[Chapter 2: Classes and Objects](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%202%20-%20Classes%20and%20Objects) (`20/07 - 26/07`)
 </pre>
 
-* Period: `20/07 - 26/07`
-* Assignments:
-    - tbc
-
--
  <pre>
-[Chapter 3: Inheritance and Polymorphism](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%203%20-%20Inheritance%20and%20Polymorphism)
+[Chapter 3: Inheritance and Polymorphism](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%203%20-%20Inheritance%20and%20Polymorphism) (`27/07 - 02/08`)
 </pre>
-* Period: `27/07 - 02/08`
-* Assignments:
-    - tbc
 
--
  <pre>
-[Chapter 4: Inheritance and Interfaces](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%204%20-%20Inheritance%20and%20Interfaces)
+[Chapter 4: Inheritance and Interfaces](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%204%20-%20Inheritance%20and%20Interfaces) (`03/08 - 09/08`)
 </pre>
-* Period: `03/08 - 09/08`
-* Assignments:
-    - tbc
 
--
  <pre>
-[Chapter 5: Exceptions](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%205%20-%20Exceptions)
+[Chapter 5: Exceptions](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%205%20-%20Exceptions) (`10/08 - 16/08`)
 </pre>
-* Period: `10/08 - 16/08`
-* Assignments:
-    - tbc
 
--
  <pre>
-[Chapter 6: GUI (Graphical User Interfaces)](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%206%20-%20GUI)
+[Chapter 6: GUI (Graphical User Interfaces)](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%206%20-%20GUI) (`17/08 - 30/08`)
 </pre>
-* Period: `17/08 - 30/08`
-* Assignments:
-    - tbc
 
--
  <pre>
-[Chapter 7: Collections and Generics](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%207%20-%20Collections%20and%20Generics)
+[Chapter 7: Collections and Generics](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%207%20-%20Collections%20and%20Generics) (`31/08 - 13/09`)
 </pre>
-* Period: `31/08 - 13/09`
-* Assignments:
-    - tbc
 
--
  <pre>
-[Chapter 8: Multithreading](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%208%20-%20Multithreading)
+[Chapter 8: Multithreading](https://github.com/JavaSummer/JavaMainRepo/tree/master/Content/Chapter%208%20-%20Multithreading) (`14/09 - 27/09`)
 </pre>
-* Period: `14/09 - 27/09`
-* Assignments:
-    - tbc
 
 ##