diff --git a/README.md b/README.md
index 9a7d6d8..69bc4e1 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,34 @@
-# gt-beginner-quest-2024
-Grant Thornton Beginner Quest 2024
+
+# Grant Thornton Beginner Quest 2024
+
+**Dates:** 05/07/2024 - 14/07/2024
+
+## Repository Structure
+
+This is the official repository with the challenges published in Grant Thornton Beginner Quest (GTBQ) CTF 2024. Each challenge has a public, solution and setup folder (if applicable) and is accompanied with a short description. The setup folder contains all the files required to build and host the challenge and usually contains the flag and a proof of concept solution as well. The public folder contains the files that are released to the participant during the competition.
+
+## Dependencies
+
+Although some of the challenges may run as is, it is recommended that you have docker and docker-compose installed and use the provided scripts to run the challenges to ensure isolation and therefore proper environment setup.
+
+## Challenges
+
+
+### misc
+
+| Name | Author |
+| ---- | ------ |
+| [Brute Willis](./misc/Brute-Willis) | tratrafe2 |
+| [c4lcu1at0r](./misc/c4lcu1at0r) | cfalas |
+| [secret-key](./misc/secret-key) | tratrafe2 |
+
+
+
+### web
+
+| Name | Author |
+| ---- | ------ |
+| [Baby Flask](./web/baby-flask) | Evangelospro |
+| [Flask Master](./web/flask-master) | Evangelospro |
+
+
diff --git a/misc/Brute-Willis/README.md b/misc/Brute-Willis/README.md
new file mode 100644
index 0000000..b48a0c0
--- /dev/null
+++ b/misc/Brute-Willis/README.md
@@ -0,0 +1,15 @@
+# Brute Willis
+
+
+**Category**: misc
+
+**Author**: tratrafe2
+
+## Description
+
+Brute willis and henry Force are up to something. We found this script they used to generate a flag. However, the program they used only allows them to have a 6-digit pin.
+
+You may need to install the python module pycryptodomex
+python -m pip install pycryptodomex
+
+
diff --git a/misc/Brute-Willis/readme.md b/misc/Brute-Willis/readme.md
index 60f15c6..b48a0c0 100644
--- a/misc/Brute-Willis/readme.md
+++ b/misc/Brute-Willis/readme.md
@@ -1,22 +1,15 @@
-# Brute Willis
-**Category**: Misc
-
-**Author**: tratrafe2
-
-**Difficulty**: Medium
-
-## Description
-Brute willis and henry Force are up to something. We found this script they used to generate a flag. However, the program they used only allows them to have a 6-digit pin.
-
-You may need to install the python module pycryptodomex
-python -m pip install pycryptodomex
-
-## Solution
-
- Reveal Spoiler
-
- Brute force the 6-digit pins to get the solution
-
- Flag: "GTBQ{Brut3_F0rc3_s0m3t1m35_w0rk5}"
-
-
\ No newline at end of file
+# Brute Willis
+
+
+**Category**: misc
+
+**Author**: tratrafe2
+
+## Description
+
+Brute willis and henry Force are up to something. We found this script they used to generate a flag. However, the program they used only allows them to have a 6-digit pin.
+
+You may need to install the python module pycryptodomex
+python -m pip install pycryptodomex
+
+
diff --git a/misc/c4lcu1at0r/README.md b/misc/c4lcu1at0r/README.md
new file mode 100644
index 0000000..95736d0
--- /dev/null
+++ b/misc/c4lcu1at0r/README.md
@@ -0,0 +1,26 @@
+# c4lcu1at0r
+
+[](https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/cybermouflons/gt-beginner-quest-2024/master/misc/c4lcu1at0r/docker-compose.yml)
+
+
+**Category**: misc
+
+**Author**: cfalas
+
+## Description
+
+Back in the old days, people used to calculate things using a calculator. Nowadays, we have computers to do that for us. Can it still do the job?
+
+
+
+## Run locally
+
+Launch challenge:
+```
+curl -sSL https://raw.githubusercontent.com/cybermouflons/gt-beginner-quest-2024/master/misc/c4lcu1at0r/docker-compose.yml | docker compose -f - up -d
+```
+
+Shutdown challenge:
+```
+curl -sSL https://raw.githubusercontent.com/cybermouflons/gt-beginner-quest-2024/master/misc/c4lcu1at0r/docker-compose.yml | docker compose -f - down
+```
diff --git a/misc/secret-key/README.md b/misc/secret-key/README.md
new file mode 100644
index 0000000..5cf0af3
--- /dev/null
+++ b/misc/secret-key/README.md
@@ -0,0 +1,12 @@
+# secret-key
+
+
+**Category**: misc
+
+**Author**: tratrafe2
+
+## Description
+
+while trying to investigate tHe files of a criminal, we found this wEird key_X.txt file. however, it doesn't seem to have any meaning. mayBe it's An encoded mesSagE that we should try to re6ognize and cr4ck it. let's tRy Our besT!
+
+
diff --git a/misc/secret-key/readme.md b/misc/secret-key/readme.md
index 5e2e7f1..5cf0af3 100644
--- a/misc/secret-key/readme.md
+++ b/misc/secret-key/readme.md
@@ -1,20 +1,12 @@
-# Secret key
-**Category**: Misc
-
-**Author**: tratrafe2
-
-**Difficulty**: Easy
-
-## Description
-while trying to investigate tHe files of a criminal, we found this wEird key_X.txt file. however, it doesn't seem to have any meaning. mayBe it's An encoded mesSagE that we should try to re6ognize and cr4ck it. let's tRy Our besT!
-
-## Solution
-
- Reveal Spoiler
-
- The goal of this challenge is to recognize the format of Base64 and Hex, and finally face a simple substitucion cipher (rot13).
- Decode from hex, from b64, from b64, from hex, rot13.
-
- Flag: "GTBQ{3nc0d1ng_15_r3ally_c00l_but_n0t_s0_saf3!}"
-
-
\ No newline at end of file
+# secret-key
+
+
+**Category**: misc
+
+**Author**: tratrafe2
+
+## Description
+
+while trying to investigate tHe files of a criminal, we found this wEird key_X.txt file. however, it doesn't seem to have any meaning. mayBe it's An encoded mesSagE that we should try to re6ognize and cr4ck it. let's tRy Our besT!
+
+
diff --git a/web/baby-flask/README.md b/web/baby-flask/README.md
new file mode 100644
index 0000000..0653473
--- /dev/null
+++ b/web/baby-flask/README.md
@@ -0,0 +1,26 @@
+# Baby Flask
+
+[](https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/cybermouflons/gt-beginner-quest-2024/master/web/baby-flask/docker-compose.yml)
+
+
+**Category**: web
+
+**Author**: Evangelospro
+
+## Description
+
+I always loved being organized, so I decided to create a file manager that will help me keep my files in order. Please, don't mess with my files, I have a lot of important stuff in there! I mean you can't get the flag or something, right?
+
+
+
+## Run locally
+
+Launch challenge:
+```
+curl -sSL https://raw.githubusercontent.com/cybermouflons/gt-beginner-quest-2024/master/web/baby-flask/docker-compose.yml | docker compose -f - up -d
+```
+
+Shutdown challenge:
+```
+curl -sSL https://raw.githubusercontent.com/cybermouflons/gt-beginner-quest-2024/master/web/baby-flask/docker-compose.yml | docker compose -f - down
+```
diff --git a/web/baby-flask/setup/app/logs/.gitkeep b/web/baby-flask/setup/app/logs/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/web/flask-master/README.md b/web/flask-master/README.md
new file mode 100644
index 0000000..6f0ac7e
--- /dev/null
+++ b/web/flask-master/README.md
@@ -0,0 +1,28 @@
+# Flask Master
+
+[](https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/cybermouflons/gt-beginner-quest-2024/master/web/flask-master/docker-compose.yml)
+
+
+**Category**: web
+
+**Author**: Evangelospro
+
+## Description
+
+Flask Master is the sequel to Baby Flask.
+
+I always loved being organized, so I decided to create a file manager that will help me keep my files in order. Please, don't mess with my files, I have a lot of important stuff in there! I mean you can't get the flag or something, right? Can you get it now that the logs are gone?
+
+
+
+## Run locally
+
+Launch challenge:
+```
+curl -sSL https://raw.githubusercontent.com/cybermouflons/gt-beginner-quest-2024/master/web/flask-master/docker-compose.yml | docker compose -f - up -d
+```
+
+Shutdown challenge:
+```
+curl -sSL https://raw.githubusercontent.com/cybermouflons/gt-beginner-quest-2024/master/web/flask-master/docker-compose.yml | docker compose -f - down
+```