diff --git a/1ano/2semestre/poo/src/aula08/README.md b/1ano/2semestre/poo/src/aula08/README.md
index ebab937..1a9cfa3 100755
--- a/1ano/2semestre/poo/src/aula08/README.md
+++ b/1ano/2semestre/poo/src/aula08/README.md
@@ -4,18 +4,18 @@
 
 * [Guião](https://github.com/TiagoRG/uaveiro-leci/tree/master/1ano/2semestre/poo/guides/POO-2022-aula08.pdf)
 
-### Exercise List
+### File List per Exercise
 
 #### Ex1
 * [Main.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Main.java)
 * [VehicleComp.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/VehicleComp.java)
 * [Vehicles](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles)
-    * [Vehicle.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Vehicle.java)
-    * [Motorcycle.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Motorcycle.java)
-    * [Car.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Car.java)
-    * [Taxi.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Taxi.java)
-    * [Bus.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Bus.java)
-    * [Truck.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Truck.java)
+  * [Vehicle.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Vehicle.java)
+  * [Motorcycle.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Motorcycle.java)
+  * [Car.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Car.java)
+  * [Taxi.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Taxi.java)
+  * [Bus.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Bus.java)
+  * [Truck.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Truck.java)
 * [Interfaces](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Interfaces)
   * [IKmTravelled.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Interfaces/IKmTravelled.java)
   * [IFuelVehicle.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Interfaces/IFuelVehicle.java)
@@ -25,7 +25,27 @@
 
 #### Ex2
 
+* [Main.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Main.java)
+* [Menu.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Menu.java)
+* [Aliments](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments)
+    * [Aliment.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Aliment.java)
+    * [Cereal.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Cereal.java)
+    * [Fish.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Fish.java)
+    * [Meat.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Meat.java)
+    * [Vegetable.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Vegetable.java)
+* [Dishes](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Dishes)
+    * [Dish.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Dishes/Dish.java)
+    * [VeganDish.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Dishes/VeganDish.java)
+    * [DietDish.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Dishes/DietDish.java)
+* [Enums](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums)
+  * [AlimentOrigin.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/AlimentOrigin.java)
+  * [AlimentType.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/AlimentType.java)
+  * [DishType.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/DishType.java)
+  * [FishState.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/FishState.java)
+  * [MeatType.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/MeatType.java)
+
 #### Ex3
+
 * [ShoppingCarTester.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/ShoppingCarTester.java)
 * [Purchase.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/Purchase.java)
 * [Product.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/Product.java)
diff --git a/1ano/2semestre/poo/src/aula08/ex1/README.md b/1ano/2semestre/poo/src/aula08/ex1/README.md
new file mode 100644
index 0000000..7ca3334
--- /dev/null
+++ b/1ano/2semestre/poo/src/aula08/ex1/README.md
@@ -0,0 +1,20 @@
+# Programação Orientada a Objetos
+## Aula 08 - Exercise 1
+
+### File list
+
+* [Main.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Main.java)
+* [VehicleComp.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/VehicleComp.java)
+* [Vehicles](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles)
+  * [Vehicle.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Vehicle.java)
+  * [Motorcycle.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Motorcycle.java)
+  * [Car.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Car.java)
+  * [Taxi.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Taxi.java)
+  * [Bus.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Bus.java)
+  * [Truck.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Truck.java)
+* [Interfaces](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Interfaces)
+  * [IKmTravelled.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Interfaces/IKmTravelled.java)
+  * [IFuelVehicle.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Interfaces/IFuelVehicle.java)
+  * [IElectricVehicle.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Interfaces/IElectricVehicle.java)
+* [Enums](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums)
+  * [EngineType.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/EngineType.java)
\ No newline at end of file
diff --git a/1ano/2semestre/poo/src/aula08/ex2/README.md b/1ano/2semestre/poo/src/aula08/ex2/README.md
new file mode 100644
index 0000000..2136a69
--- /dev/null
+++ b/1ano/2semestre/poo/src/aula08/ex2/README.md
@@ -0,0 +1,23 @@
+# Programação Orientada a Objetos
+## Aula 08 - Exercise 2
+
+### File list
+
+* [Main.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Main.java)
+* [Menu.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Menu.java)
+* [Aliments](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments)
+    * [Aliment.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Aliment.java)
+    * [Cereal.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Cereal.java)
+    * [Fish.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Fish.java)
+    * [Meat.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Meat.java)
+    * [Vegetable.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Aliments/Vegetable.java)
+* [Dishes](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Dishes)
+    * [Dish.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Dishes/Dish.java)
+    * [VeganDish.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Dishes/VeganDish.java)
+    * [DietDish.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex2/Dishes/DietDish.java)
+* [Enums](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums)
+  * [AlimentOrigin.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/AlimentOrigin.java)
+  * [AlimentType.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/AlimentType.java)
+  * [DishType.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/DishType.java)
+  * [FishState.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/FishState.java)
+  * [MeatType.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex1/Enums/MeatType.java)
\ No newline at end of file
diff --git a/1ano/2semestre/poo/src/aula08/ex3/README.md b/1ano/2semestre/poo/src/aula08/ex3/README.md
new file mode 100644
index 0000000..cc03ada
--- /dev/null
+++ b/1ano/2semestre/poo/src/aula08/ex3/README.md
@@ -0,0 +1,12 @@
+# Programação Orientada a Objetos
+## Aula 08 - Exercise 3
+
+### File list
+
+* [ShoppingCarTester.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/ShoppingCarTester.java)
+* [Purchase.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/Purchase.java)
+* [Product.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/Product.java)
+* [PurchaseWithDiscount.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/PurchaseWithDiscount.java)
+* [Interfaces](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/Interfaces)
+  * [IPurchase.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/Interfaces/IPurchase.java)
+  * [IProduct.java](https://github.com/TiagoRG/uaveiro-leci/blob/master/1ano/2semestre/poo/src/aula08/ex3/Interfaces/IProduct.java)