diff --git a/monthly-challenges/PastChallenges.md b/monthly-challenges/PastChallenges.md
deleted file mode 100644
index 9ea09402..00000000
--- a/monthly-challenges/PastChallenges.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Past Monthly Challenges
-
-2022: - January: Month of Learning - February: Month of Pairing - March: Create AV Content
-
-2021: - October: VC Hacktoberfest - September: Prep-tember - August: Healthy Habits - July: Demo Days - June: Build In Public - February: Create AV Content
diff --git a/monthly-challenges/build-in-public/README.md b/monthly-challenges/build-in-public/README.md
index 6b8aae82..72983eb0 100644
--- a/monthly-challenges/build-in-public/README.md
+++ b/monthly-challenges/build-in-public/README.md
@@ -4,6 +4,8 @@ In this challenge, we're working on creating a habit of talking about the things
 
 We aim to learn to communicate around a project, show the development process, give confidence, and be proud of any progress made.
 
+> **Note:** In 2021, we dedicated June to the Build in Public challenge and July to Demo Day. Since July 2022, we have combined them into one challenge. If you'd like to know the history, you can find it in the [archive](../build-in-public/archive/) folder.
+
 > [!TIP]
 > Read our [`facilitator-docs.md`](../facilitators-docs.md) to learn how to handle tasks before and after challenges, as well as the technical guidelines.
 
diff --git a/monthly-challenges/Demo_Days/DemoChallenge.md b/monthly-challenges/build-in-public/archive/Demo_Days/DemoChallenge.md
similarity index 100%
rename from monthly-challenges/Demo_Days/DemoChallenge.md
rename to monthly-challenges/build-in-public/archive/Demo_Days/DemoChallenge.md
diff --git a/monthly-challenges/Demo_Days/Demo_Day.md b/monthly-challenges/build-in-public/archive/Demo_Days/Demo_Day.md
similarity index 100%
rename from monthly-challenges/Demo_Days/Demo_Day.md
rename to monthly-challenges/build-in-public/archive/Demo_Days/Demo_Day.md
diff --git a/monthly-challenges/Demo_Days/demo-days-script.md b/monthly-challenges/build-in-public/archive/Demo_Days/demo-days-script.md
similarity index 100%
rename from monthly-challenges/Demo_Days/demo-days-script.md
rename to monthly-challenges/build-in-public/archive/Demo_Days/demo-days-script.md
diff --git a/monthly-challenges/Demo_Days/facilitator-docs.md b/monthly-challenges/build-in-public/archive/Demo_Days/facilitator-docs.md
similarity index 100%
rename from monthly-challenges/Demo_Days/facilitator-docs.md
rename to monthly-challenges/build-in-public/archive/Demo_Days/facilitator-docs.md
diff --git a/monthly-challenges/Create_AV_Content/check-in_scripts.md b/monthly-challenges/create-av-content/check-in_scripts.md
similarity index 100%
rename from monthly-challenges/Create_AV_Content/check-in_scripts.md
rename to monthly-challenges/create-av-content/check-in_scripts.md
diff --git a/monthly-challenges/Create_AV_Content/description.md b/monthly-challenges/create-av-content/description.md
similarity index 100%
rename from monthly-challenges/Create_AV_Content/description.md
rename to monthly-challenges/create-av-content/description.md
diff --git a/monthly-challenges/Create_AV_Content/feedback.md b/monthly-challenges/create-av-content/feedback.md
similarity index 100%
rename from monthly-challenges/Create_AV_Content/feedback.md
rename to monthly-challenges/create-av-content/feedback.md
diff --git a/monthly-challenges/Create_AV_Content/resources.md b/monthly-challenges/create-av-content/resources.md
similarity index 100%
rename from monthly-challenges/Create_AV_Content/resources.md
rename to monthly-challenges/create-av-content/resources.md
diff --git a/monthly-challenges/Create_AV_Content/schedule.md b/monthly-challenges/create-av-content/schedule.md
similarity index 100%
rename from monthly-challenges/Create_AV_Content/schedule.md
rename to monthly-challenges/create-av-content/schedule.md
diff --git a/monthly-challenges/August2021/EndofChallenge.md b/monthly-challenges/healthy-habits/archive/August2021/EndofChallenge.md
similarity index 100%
rename from monthly-challenges/August2021/EndofChallenge.md
rename to monthly-challenges/healthy-habits/archive/August2021/EndofChallenge.md
diff --git a/monthly-challenges/August2021/Feedback.md b/monthly-challenges/healthy-habits/archive/August2021/Feedback.md
similarity index 100%
rename from monthly-challenges/August2021/Feedback.md
rename to monthly-challenges/healthy-habits/archive/August2021/Feedback.md