Merge branch 'main' into async-redisache-logs

201 files changed, 86 insertions, 103 deletions

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f41ef83b..cffe15d5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,7 @@
 # Extensions groups
-bot/exts/christmas/**                   @ks129
-bot/exts/halloween/**                   @ks129
+bot/exts/events/advent_of_code/**                   @ks129
+bot/exts/events/hacktoberfest/**                    @ks129
+bot/exts/holidays/halloween/**                      @ks129
 
 # CI & Docker
 .github/workflows/**                    @Akarys42 @SebastiaanZ @Den4200
diff --git a/bot/exts/christmas/__init__.py b/bot/exts/avatar_modification/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/christmas/__init__.py
+++ b/bot/exts/avatar_modification/__init__.py
diff --git a/bot/exts/evergreen/avatar_modification/_effects.py b/bot/exts/avatar_modification/_effects.py
index df741973..f1c2e6d1 100644
--- a/bot/exts/evergreen/avatar_modification/_effects.py
+++ b/bot/exts/avatar_modification/_effects.py
@@ -77,7 +77,7 @@ class PfpEffects:
         """Applies the given pride effect to the given image."""
         image = PfpEffects.crop_avatar_circle(image)
 
-        ring = Image.open(Path(f"bot/resources/pride/flags/{flag}.png")).resize((1024, 1024))
+        ring = Image.open(Path(f"bot/resources/holidays/pride/flags/{flag}.png")).resize((1024, 1024))
         ring = ring.convert("RGBA")
         ring = PfpEffects.crop_ring(ring, pixels)
 
@@ -125,7 +125,7 @@ class PfpEffects:
             ))
             overlay_image = overlay_image.convert("RGBA")
         else:
-            overlay_image = Image.open(Path("bot/resources/easter/chocolate_bunny.png"))
+            overlay_image = Image.open(Path("bot/resources/holidays/easter/chocolate_bunny.png"))
 
         alpha = image.getchannel("A").getdata()
         image = image.convert("RGB")
diff --git a/bot/exts/evergreen/avatar_modification/avatar_modify.py b/bot/exts/avatar_modification/avatar_modify.py
index 18202902..87eb05e6 100644
--- a/bot/exts/evergreen/avatar_modification/avatar_modify.py
+++ b/bot/exts/avatar_modification/avatar_modify.py
@@ -13,7 +13,7 @@ from discord.ext import commands
 
 from bot.bot import Bot
 from bot.constants import Colours, Emojis
-from bot.exts.evergreen.avatar_modification._effects import PfpEffects
+from bot.exts.avatar_modification._effects import PfpEffects
 from bot.utils.extensions import invoke_help_command
 from bot.utils.halloween import spookifications
 
@@ -27,7 +27,7 @@ MAX_SQUARES = 10_000
 
 T = TypeVar("T")
 
-GENDER_OPTIONS = json.loads(Path("bot/resources/pride/gender_options.json").read_text("utf8"))
+GENDER_OPTIONS = json.loads(Path("bot/resources/holidays/pride/gender_options.json").read_text("utf8"))
 
 
 async def in_executor(func: Callable[..., T], *args) -> T:
@@ -239,7 +239,7 @@ class AvatarModify(commands.Cog):
                 description=f"Here is your lovely avatar, surrounded by\n a beautiful {option} flag. Enjoy :D"
             )
             embed.set_image(url=f"attachment://{file_name}")
-            embed.set_footer(text=f"Made by {ctx.author.display_name}.", icon_url=ctx.author.avatar_url)
+            embed.set_footer(text=f"Made by {ctx.author.display_name}.", icon_url=ctx.author.avatar.url)
             await ctx.send(file=file, embed=embed)
 
     @avatar_modify.group(
diff --git a/bot/exts/easter/__init__.py b/bot/exts/core/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/easter/__init__.py
+++ b/bot/exts/core/__init__.py
diff --git a/bot/exts/evergreen/error_handler.py b/bot/exts/core/error_handler.py
index fd2123e7..fd2123e7 100644
--- a/bot/exts/evergreen/error_handler.py
+++ b/bot/exts/core/error_handler.py
diff --git a/bot/exts/utils/extensions.py b/bot/exts/core/extensions.py
index 424bacac..424bacac 100644
--- a/bot/exts/utils/extensions.py
+++ b/bot/exts/core/extensions.py
diff --git a/bot/exts/evergreen/help.py b/bot/exts/core/help.py
index 4b766b50..4b766b50 100644
--- a/bot/exts/evergreen/help.py
+++ b/bot/exts/core/help.py
diff --git a/bot/exts/internal_eval/__init__.py b/bot/exts/core/internal_eval/__init__.py
index 695fa74d..695fa74d 100644
--- a/bot/exts/internal_eval/__init__.py
+++ b/bot/exts/core/internal_eval/__init__.py
diff --git a/bot/exts/internal_eval/_helpers.py b/bot/exts/core/internal_eval/_helpers.py
index 5b2f8f5d..5b2f8f5d 100644
--- a/bot/exts/internal_eval/_helpers.py
+++ b/bot/exts/core/internal_eval/_helpers.py
diff --git a/bot/exts/internal_eval/_internal_eval.py b/bot/exts/core/internal_eval/_internal_eval.py
index 4f6b4321..4f6b4321 100644
--- a/bot/exts/internal_eval/_internal_eval.py
+++ b/bot/exts/core/internal_eval/_internal_eval.py
diff --git a/bot/exts/evergreen/ping.py b/bot/exts/core/ping.py
index 6be78117..6be78117 100644
--- a/bot/exts/evergreen/ping.py
+++ b/bot/exts/core/ping.py
diff --git a/bot/exts/evergreen/source.py b/bot/exts/core/source.py
index 7572ce51..7572ce51 100644
--- a/bot/exts/evergreen/source.py
+++ b/bot/exts/core/source.py
diff --git a/bot/exts/evergreen/__init__.py b/bot/exts/events/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/evergreen/__init__.py
+++ b/bot/exts/events/__init__.py
diff --git a/bot/exts/christmas/advent_of_code/__init__.py b/bot/exts/events/advent_of_code/__init__.py
index 3c521168..3c521168 100644
--- a/bot/exts/christmas/advent_of_code/__init__.py
+++ b/bot/exts/events/advent_of_code/__init__.py
diff --git a/bot/exts/christmas/advent_of_code/_caches.py b/bot/exts/events/advent_of_code/_caches.py
index 32d5394f..32d5394f 100644
--- a/bot/exts/christmas/advent_of_code/_caches.py
+++ b/bot/exts/events/advent_of_code/_caches.py
diff --git a/bot/exts/christmas/advent_of_code/_cog.py b/bot/exts/events/advent_of_code/_cog.py
index bc2ccc04..ca60e517 100644
--- a/bot/exts/christmas/advent_of_code/_cog.py
+++ b/bot/exts/events/advent_of_code/_cog.py
@@ -11,7 +11,7 @@ from bot.bot import Bot
 from bot.constants import (
     AdventOfCode as AocConfig, Channels, Colours, Emojis, Month, Roles, WHITELISTED_CHANNELS,
 )
-from bot.exts.christmas.advent_of_code import _helpers
+from bot.exts.events.advent_of_code import _helpers
 from bot.utils.decorators import InChannelCheckFailure, in_month, whitelist_override, with_role
 from bot.utils.extensions import invoke_help_command
 
@@ -35,7 +35,7 @@ class AdventOfCode(commands.Cog):
         self._base_url = f"https://adventofcode.com/{AocConfig.year}"
         self.global_leaderboard_url = f"https://adventofcode.com/{AocConfig.year}/leaderboard"
 
-        self.about_aoc_filepath = Path("./bot/resources/advent_of_code/about.json")
+        self.about_aoc_filepath = Path("./bot/resources/events/advent_of_code/about.json")
         self.cached_about_aoc = self._build_about_embed()
 
         notification_coro = _helpers.new_puzzle_notification(self.bot)
diff --git a/bot/exts/christmas/advent_of_code/_helpers.py b/bot/exts/events/advent_of_code/_helpers.py
index b64b44a6..5fedb60f 100644
--- a/bot/exts/christmas/advent_of_code/_helpers.py
+++ b/bot/exts/events/advent_of_code/_helpers.py
@@ -13,7 +13,7 @@ import discord
 
 from bot.bot import Bot
 from bot.constants import AdventOfCode, Channels, Colours
-from bot.exts.christmas.advent_of_code import _caches
+from bot.exts.events.advent_of_code import _caches
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/exts/evergreen/avatar_modification/__init__.py b/bot/exts/events/hacktoberfest/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/evergreen/avatar_modification/__init__.py
+++ b/bot/exts/events/hacktoberfest/__init__.py
diff --git a/bot/exts/halloween/hacktober-issue-finder.py b/bot/exts/events/hacktoberfest/hacktober-issue-finder.py
index e3053851..e3053851 100644
--- a/bot/exts/halloween/hacktober-issue-finder.py
+++ b/bot/exts/events/hacktoberfest/hacktober-issue-finder.py
diff --git a/bot/exts/halloween/hacktoberstats.py b/bot/exts/events/hacktoberfest/hacktoberstats.py
index 72067dbe..72067dbe 100644
--- a/bot/exts/halloween/hacktoberstats.py
+++ b/bot/exts/events/hacktoberfest/hacktoberstats.py
diff --git a/bot/exts/halloween/timeleft.py b/bot/exts/events/hacktoberfest/timeleft.py
index 55109599..55109599 100644
--- a/bot/exts/halloween/timeleft.py
+++ b/bot/exts/events/hacktoberfest/timeleft.py
diff --git a/bot/exts/halloween/__init__.py b/bot/exts/fun/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/halloween/__init__.py
+++ b/bot/exts/fun/__init__.py
diff --git a/bot/exts/evergreen/battleship.py b/bot/exts/fun/battleship.py
index f4351954..f4351954 100644
--- a/bot/exts/evergreen/battleship.py
+++ b/bot/exts/fun/battleship.py
diff --git a/bot/exts/evergreen/catify.py b/bot/exts/fun/catify.py
index 32dfae09..32dfae09 100644
--- a/bot/exts/evergreen/catify.py
+++ b/bot/exts/fun/catify.py
diff --git a/bot/exts/evergreen/coinflip.py b/bot/exts/fun/coinflip.py
index 804306bd..804306bd 100644
--- a/bot/exts/evergreen/coinflip.py
+++ b/bot/exts/fun/coinflip.py
diff --git a/bot/exts/evergreen/connect_four.py b/bot/exts/fun/connect_four.py
index 647bb2b7..647bb2b7 100644
--- a/bot/exts/evergreen/connect_four.py
+++ b/bot/exts/fun/connect_four.py
diff --git a/bot/exts/evergreen/duck_game.py b/bot/exts/fun/duck_game.py
index d592f3df..1ef7513f 100644
--- a/bot/exts/evergreen/duck_game.py
+++ b/bot/exts/fun/duck_game.py
@@ -5,7 +5,6 @@ from collections import defaultdict
 from io import BytesIO
 from itertools import product
 from pathlib import Path
-from urllib.parse import urlparse
 
 import discord
 from PIL import Image, ImageDraw, ImageFont
@@ -15,7 +14,6 @@ from bot.bot import Bot
 from bot.constants import Colours, MODERATION_ROLES
 from bot.utils.decorators import with_role
 
-
 DECK = list(product(*[(0, 1, 2)]*4))
 
 GAME_DURATION = 180
@@ -33,9 +31,9 @@ INCORRECT_GOOSE = -1
 
 SOLN_DISTR = 0, 0.05, 0.05, 0.1, 0.15, 0.25, 0.2, 0.15, .05
 
-IMAGE_PATH = Path("bot", "resources", "evergreen", "all_cards.png")
-FONT_PATH = Path("bot", "resources", "evergreen", "LuckiestGuy-Regular.ttf")
-HELP_IMAGE_PATH = Path("bot", "resources", "evergreen", "ducks_help_ex.png")
+IMAGE_PATH = Path("bot", "resources", "fun", "all_cards.png")
+FONT_PATH = Path("bot", "resources", "fun", "LuckiestGuy-Regular.ttf")
+HELP_IMAGE_PATH = Path("bot", "resources", "fun", "ducks_help_ex.png")
 
 ALL_CARDS = Image.open(IMAGE_PATH)
 LABEL_FONT = ImageFont.truetype(str(FONT_PATH), size=16)
@@ -193,6 +191,7 @@ class DuckGamesDirector(commands.Cog):
         game.running = True
         self.current_games[ctx.channel.id] = game
 
+        game.msg_content = ""
         game.embed_msg = await self.send_board_embed(ctx, game)
         await asyncio.sleep(GAME_DURATION)
 
@@ -261,7 +260,6 @@ class DuckGamesDirector(commands.Cog):
         embed = discord.Embed(
             title="Duck Duck Duck Goose!",
             color=Colours.bright_green,
-            footer=""
         )
         embed.set_image(url="attachment://board.png")
         return await ctx.send(embed=embed, file=file)
@@ -269,12 +267,11 @@ class DuckGamesDirector(commands.Cog):
     async def display_claimed_answer(self, game: DuckGame, author: discord.Member, answer: tuple[int]) -> None:
         """Add a claimed answer to the game embed."""
         async with game.editing_embed:
-            game_embed, = game.embed_msg.embeds
-            old_footer = game_embed.footer.text
-            if old_footer == discord.Embed.Empty:
-                old_footer = ""
-            game_embed.set_footer(text=f"{old_footer}\n{str(answer):12s}  -  {author.display_name}")
-            await self.edit_embed_with_image(game.embed_msg, game_embed)
+            # We specifically edit the message contents instead of the embed
+            # Because we load in the image from the file, editing any portion of the embed
+            # Does weird things to the image and this works around that weirdness
+            game.msg_content = f"{game.msg_content}\n{str(answer):12s}  -  {author.display_name}"
+            await game.embed_msg.edit(content=game.msg_content)
 
     async def end_game(self, channel: discord.TextChannel, game: DuckGame, end_message: str) -> None:
         """Edit the game embed to reflect the end of the game and mark the game as not running."""
@@ -300,17 +297,7 @@ class DuckGamesDirector(commands.Cog):
         else:
             missed_text = "All the flights were found!"
 
-        game_embed, = game.embed_msg.embeds
-        old_footer = game_embed.footer.text
-        if old_footer == discord.Embed.Empty:
-            old_footer = ""
-        embed_as_dict = game_embed.to_dict()  # Cannot set embed color after initialization
-        embed_as_dict["color"] = discord.Color.red().value
-        game_embed = discord.Embed.from_dict(embed_as_dict)
-        game_embed.set_footer(
-            text=f"{old_footer.rstrip()}\n\n{missed_text}"
-        )
-        await self.edit_embed_with_image(game.embed_msg, game_embed)
+        await game.embed_msg.edit(content=f"{missed_text}")
 
     @start_game.command(name="help")
     async def show_rules(self, ctx: commands.Context) -> None:
@@ -343,13 +330,6 @@ class DuckGamesDirector(commands.Cog):
         )
         return await ctx.send(file=file, embed=embed)
 
-    @staticmethod
-    async def edit_embed_with_image(msg: discord.Message, embed: discord.Embed) -> None:
-        """Edit an embed without the attached image going wonky."""
-        attach_name = urlparse(embed.image.url).path.split("/")[-1]
-        embed.set_image(url=f"attachment://{attach_name}")
-        await msg.edit(embed=embed)
-
 
 def setup(bot: Bot) -> None:
     """Load the DuckGamesDirector cog."""
diff --git a/bot/exts/evergreen/fun.py b/bot/exts/fun/fun.py
index 4bbfe859..b148f1f3 100644
--- a/bot/exts/evergreen/fun.py
+++ b/bot/exts/fun/fun.py
@@ -57,7 +57,7 @@ class Fun(Cog):
     def __init__(self, bot: Bot):
         self.bot = bot
 
-        self._caesar_cipher_embed = json.loads(Path("bot/resources/evergreen/caesar_info.json").read_text("UTF-8"))
+        self._caesar_cipher_embed = json.loads(Path("bot/resources/fun/caesar_info.json").read_text("UTF-8"))
 
     @staticmethod
     def _get_random_die() -> str:
diff --git a/bot/exts/evergreen/game.py b/bot/exts/fun/game.py
index f9c150e6..f9c150e6 100644
--- a/bot/exts/evergreen/game.py
+++ b/bot/exts/fun/game.py
diff --git a/bot/exts/evergreen/magic_8ball.py b/bot/exts/fun/magic_8ball.py
index 28ddcea0..a7b682ca 100644
--- a/bot/exts/evergreen/magic_8ball.py
+++ b/bot/exts/fun/magic_8ball.py
@@ -9,7 +9,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-ANSWERS = json.loads(Path("bot/resources/evergreen/magic8ball.json").read_text("utf8"))
+ANSWERS = json.loads(Path("bot/resources/fun/magic8ball.json").read_text("utf8"))
 
 
 class Magic8ball(commands.Cog):
diff --git a/bot/exts/evergreen/minesweeper.py b/bot/exts/fun/minesweeper.py
index a48b5051..a48b5051 100644
--- a/bot/exts/evergreen/minesweeper.py
+++ b/bot/exts/fun/minesweeper.py
diff --git a/bot/exts/evergreen/movie.py b/bot/exts/fun/movie.py
index a04eeb41..a04eeb41 100644
--- a/bot/exts/evergreen/movie.py
+++ b/bot/exts/fun/movie.py
diff --git a/bot/exts/evergreen/recommend_game.py b/bot/exts/fun/recommend_game.py
index bdd3acb1..42c9f7c2 100644
--- a/bot/exts/evergreen/recommend_game.py
+++ b/bot/exts/fun/recommend_game.py
@@ -12,7 +12,7 @@ log = logging.getLogger(__name__)
 game_recs = []
 
 # Populate the list `game_recs` with resource files
-for rec_path in Path("bot/resources/evergreen/game_recs").glob("*.json"):
+for rec_path in Path("bot/resources/fun/game_recs").glob("*.json"):
     data = json.loads(rec_path.read_text("utf8"))
     game_recs.append(data)
 shuffle(game_recs)
diff --git a/bot/exts/evergreen/rps.py b/bot/exts/fun/rps.py
index c6bbff46..c6bbff46 100644
--- a/bot/exts/evergreen/rps.py
+++ b/bot/exts/fun/rps.py
diff --git a/bot/exts/evergreen/snakes/__init__.py b/bot/exts/fun/snakes/__init__.py
index 7740429b..ba8333fd 100644
--- a/bot/exts/evergreen/snakes/__init__.py
+++ b/bot/exts/fun/snakes/__init__.py
@@ -1,7 +1,7 @@
 import logging
 
 from bot.bot import Bot
-from bot.exts.evergreen.snakes._snakes_cog import Snakes
+from bot.exts.fun.snakes._snakes_cog import Snakes
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/exts/evergreen/snakes/_converter.py b/bot/exts/fun/snakes/_converter.py
index 765b983d..c24ba8c6 100644
--- a/bot/exts/evergreen/snakes/_converter.py
+++ b/bot/exts/fun/snakes/_converter.py
@@ -7,7 +7,7 @@ import discord
 from discord.ext.commands import Context, Converter
 from rapidfuzz import fuzz
 
-from bot.exts.evergreen.snakes._utils import SNAKE_RESOURCES
+from bot.exts.fun.snakes._utils import SNAKE_RESOURCES
 from bot.utils import disambiguate
 
 log = logging.getLogger(__name__)
diff --git a/bot/exts/evergreen/snakes/_snakes_cog.py b/bot/exts/fun/snakes/_snakes_cog.py
index 04804222..59e57199 100644
--- a/bot/exts/evergreen/snakes/_snakes_cog.py
+++ b/bot/exts/fun/snakes/_snakes_cog.py
@@ -19,8 +19,8 @@ from discord.ext.commands import Cog, CommandError, Context, bot_has_permissions
 
 from bot.bot import Bot
 from bot.constants import ERROR_REPLIES, Tokens
-from bot.exts.evergreen.snakes import _utils as utils
-from bot.exts.evergreen.snakes._converter import Snake
+from bot.exts.fun.snakes import _utils as utils
+from bot.exts.fun.snakes._converter import Snake
 from bot.utils.decorators import locked
 from bot.utils.extensions import invoke_help_command
 
@@ -122,14 +122,14 @@ CORRECT_GUESS = (
 
 # snake card consts
 CARD = {
-    "top": Image.open("bot/resources/snakes/snake_cards/card_top.png"),
-    "frame": Image.open("bot/resources/snakes/snake_cards/card_frame.png"),
-    "bottom": Image.open("bot/resources/snakes/snake_cards/card_bottom.png"),
+    "top": Image.open("bot/resources/fun/snakes/snake_cards/card_top.png"),
+    "frame": Image.open("bot/resources/fun/snakes/snake_cards/card_frame.png"),
+    "bottom": Image.open("bot/resources/fun/snakes/snake_cards/card_bottom.png"),
     "backs": [
-        Image.open(f"bot/resources/snakes/snake_cards/backs/{file}")
-        for file in os.listdir("bot/resources/snakes/snake_cards/backs")
+        Image.open(f"bot/resources/fun/snakes/snake_cards/backs/{file}")
+        for file in os.listdir("bot/resources/fun/snakes/snake_cards/backs")
     ],
-    "font": ImageFont.truetype("bot/resources/snakes/snake_cards/expressway.ttf", 20)
+    "font": ImageFont.truetype("bot/resources/fun/snakes/snake_cards/expressway.ttf", 20)
 }
 # endregion
 
diff --git a/bot/exts/evergreen/snakes/_utils.py b/bot/exts/fun/snakes/_utils.py
index b5f13c53..de51339d 100644
--- a/bot/exts/evergreen/snakes/_utils.py
+++ b/bot/exts/fun/snakes/_utils.py
@@ -14,7 +14,7 @@ from discord.ext.commands import Cog, Context
 
 from bot.constants import Roles
 
-SNAKE_RESOURCES = Path("bot/resources/snakes").absolute()
+SNAKE_RESOURCES = Path("bot/resources/fun/snakes").absolute()
 
 h1 = r"""```
    ----
diff --git a/bot/exts/evergreen/space.py b/bot/exts/fun/space.py
index 48ad0f96..48ad0f96 100644
--- a/bot/exts/evergreen/space.py
+++ b/bot/exts/fun/space.py
diff --git a/bot/exts/evergreen/speedrun.py b/bot/exts/fun/speedrun.py
index 774eff81..c2966ce1 100644
--- a/bot/exts/evergreen/speedrun.py
+++ b/bot/exts/fun/speedrun.py
@@ -9,7 +9,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-LINKS = json.loads(Path("bot/resources/evergreen/speedrun_links.json").read_text("utf8"))
+LINKS = json.loads(Path("bot/resources/fun/speedrun_links.json").read_text("utf8"))
 
 
 class Speedrun(commands.Cog):
diff --git a/bot/exts/evergreen/status_codes.py b/bot/exts/fun/status_codes.py
index 501cbe0a..501cbe0a 100644
--- a/bot/exts/evergreen/status_codes.py
+++ b/bot/exts/fun/status_codes.py
diff --git a/bot/exts/evergreen/tic_tac_toe.py b/bot/exts/fun/tic_tac_toe.py
index 5c4f8051..5c4f8051 100644
--- a/bot/exts/evergreen/tic_tac_toe.py
+++ b/bot/exts/fun/tic_tac_toe.py
diff --git a/bot/exts/evergreen/trivia_quiz.py b/bot/exts/fun/trivia_quiz.py
index aa4020d6..cf9e6cd3 100644
--- a/bot/exts/evergreen/trivia_quiz.py
+++ b/bot/exts/fun/trivia_quiz.py
@@ -217,7 +217,7 @@ class TriviaQuiz(commands.Cog):
     @staticmethod
     def load_questions() -> dict:
         """Load the questions from the JSON file."""
-        p = Path("bot", "resources", "evergreen", "trivia_quiz.json")
+        p = Path("bot", "resources", "fun", "trivia_quiz.json")
 
         return json.loads(p.read_text(encoding="utf-8"))
 
diff --git a/bot/exts/evergreen/wonder_twins.py b/bot/exts/fun/wonder_twins.py
index 40edf785..79d6b6d9 100644
--- a/bot/exts/evergreen/wonder_twins.py
+++ b/bot/exts/fun/wonder_twins.py
@@ -11,7 +11,7 @@ class WonderTwins(Cog):
     """Cog for a Wonder Twins inspired command."""
 
     def __init__(self):
-        with open(Path.cwd() / "bot" / "resources" / "evergreen" / "wonder_twins.yaml", "r", encoding="utf-8") as f:
+        with open(Path.cwd() / "bot" / "resources" / "fun" / "wonder_twins.yaml", "r", encoding="utf-8") as f:
             info = yaml.load(f, Loader=yaml.FullLoader)
             self.water_types = info["water_types"]
             self.objects = info["objects"]
diff --git a/bot/exts/evergreen/xkcd.py b/bot/exts/fun/xkcd.py
index b56c53d9..b56c53d9 100644
--- a/bot/exts/evergreen/xkcd.py
+++ b/bot/exts/fun/xkcd.py
diff --git a/bot/exts/pride/__init__.py b/bot/exts/holidays/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/pride/__init__.py
+++ b/bot/exts/holidays/__init__.py
diff --git a/bot/exts/utils/__init__.py b/bot/exts/holidays/earth_day/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/utils/__init__.py
+++ b/bot/exts/holidays/earth_day/__init__.py
diff --git a/bot/exts/easter/save_the_planet.py b/bot/exts/holidays/earth_day/save_the_planet.py
index 1bd515f2..13c84886 100644
--- a/bot/exts/easter/save_the_planet.py
+++ b/bot/exts/holidays/earth_day/save_the_planet.py
@@ -7,7 +7,7 @@ from discord.ext import commands
 from bot.bot import Bot
 from bot.utils.randomization import RandomCycle
 
-EMBED_DATA = RandomCycle(json.loads(Path("bot/resources/easter/save_the_planet.json").read_text("utf8")))
+EMBED_DATA = RandomCycle(json.loads(Path("bot/resources/holidays/earth_day/save_the_planet.json").read_text("utf8")))
 
 
 class SaveThePlanet(commands.Cog):
diff --git a/bot/exts/valentines/__init__.py b/bot/exts/holidays/easter/__init__.py
index e69de29b..e69de29b 100644
--- a/bot/exts/valentines/__init__.py
+++ b/bot/exts/holidays/easter/__init__.py
diff --git a/bot/exts/easter/april_fools_vids.py b/bot/exts/holidays/easter/april_fools_vids.py
index 5ef40704..ae22f751 100644
--- a/bot/exts/easter/april_fools_vids.py
+++ b/bot/exts/holidays/easter/april_fools_vids.py
@@ -9,7 +9,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-ALL_VIDS = loads(Path("bot/resources/easter/april_fools_vids.json").read_text("utf-8"))
+ALL_VIDS = loads(Path("bot/resources/holidays/easter/april_fools_vids.json").read_text("utf-8"))
 
 
 class AprilFoolVideos(commands.Cog):
diff --git a/bot/exts/easter/bunny_name_generator.py b/bot/exts/holidays/easter/bunny_name_generator.py
index 4c3137de..f767f7c5 100644
--- a/bot/exts/easter/bunny_name_generator.py
+++ b/bot/exts/holidays/easter/bunny_name_generator.py
@@ -11,7 +11,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-BUNNY_NAMES = json.loads(Path("bot/resources/easter/bunny_names.json").read_text("utf8"))
+BUNNY_NAMES = json.loads(Path("bot/resources/holidays/easter/bunny_names.json").read_text("utf8"))
 
 
 class BunnyNameGenerator(commands.Cog):
diff --git a/bot/exts/easter/earth_photos.py b/bot/exts/holidays/easter/earth_photos.py
index f65790af..f65790af 100644
--- a/bot/exts/easter/earth_photos.py
+++ b/bot/exts/holidays/easter/earth_photos.py
diff --git a/bot/exts/easter/easter_riddle.py b/bot/exts/holidays/easter/easter_riddle.py
index 88b3be2f..c9b7fc53 100644
--- a/bot/exts/easter/easter_riddle.py
+++ b/bot/exts/holidays/easter/easter_riddle.py
@@ -12,7 +12,7 @@ from bot.constants import Colours, NEGATIVE_REPLIES
 
 log = logging.getLogger(__name__)
 
-RIDDLE_QUESTIONS = loads(Path("bot/resources/easter/easter_riddle.json").read_text("utf8"))
+RIDDLE_QUESTIONS = loads(Path("bot/resources/holidays/easter/easter_riddle.json").read_text("utf8"))
 
 TIMELIMIT = 10
 
diff --git a/bot/exts/easter/egg_decorating.py b/bot/exts/holidays/easter/egg_decorating.py
index fb5701c4..1db9b347 100644
--- a/bot/exts/easter/egg_decorating.py
+++ b/bot/exts/holidays/easter/egg_decorating.py
@@ -15,9 +15,9 @@ from bot.utils import helpers
 
 log = logging.getLogger(__name__)
 
-HTML_COLOURS = json.loads(Path("bot/resources/evergreen/html_colours.json").read_text("utf8"))
+HTML_COLOURS = json.loads(Path("bot/resources/fun/html_colours.json").read_text("utf8"))
 
-XKCD_COLOURS = json.loads(Path("bot/resources/evergreen/xkcd_colours.json").read_text("utf8"))
+XKCD_COLOURS = json.loads(Path("bot/resources/fun/xkcd_colours.json").read_text("utf8"))
 
 COLOURS = [
     (255, 0, 0, 255), (255, 128, 0, 255), (255, 255, 0, 255), (0, 255, 0, 255),
@@ -80,7 +80,7 @@ class EggDecorating(commands.Cog):
                 q, r = divmod(8, colours_n)
                 colours = colours * q + colours[:r]
             num = random.randint(1, 6)
-            im = Image.open(Path(f"bot/resources/easter/easter_eggs/design{num}.png"))
+            im = Image.open(Path(f"bot/resources/holidays/easter/easter_eggs/design{num}.png"))
             data = list(im.getdata())
 
             replaceable = {x for x in data if x not in IRREPLACEABLE}
diff --git a/bot/exts/easter/egg_facts.py b/bot/exts/holidays/easter/egg_facts.py
index 486e735f..5f216e0d 100644
--- a/bot/exts/easter/egg_facts.py
+++ b/bot/exts/holidays/easter/egg_facts.py
@@ -12,7 +12,7 @@ from bot.utils.decorators import seasonal_task
 
 log = logging.getLogger(__name__)
 
-EGG_FACTS = loads(Path("bot/resources/easter/easter_egg_facts.json").read_text("utf8"))
+EGG_FACTS = loads(Path("bot/resources/holidays/easter/easter_egg_facts.json").read_text("utf8"))
 
 
 class EasterFacts(commands.Cog):
diff --git a/bot/exts/easter/egghead_quiz.py b/bot/exts/holidays/easter/egghead_quiz.py
index ad550567..06229537 100644
--- a/bot/exts/easter/egghead_quiz.py
+++ b/bot/exts/holidays/easter/egghead_quiz.py
@@ -13,7 +13,7 @@ from bot.constants import Colours
 
 log = logging.getLogger(__name__)
 
-EGGHEAD_QUESTIONS = loads(Path("bot/resources/easter/egghead_questions.json").read_text("utf8"))
+EGGHEAD_QUESTIONS = loads(Path("bot/resources/holidays/easter/egghead_questions.json").read_text("utf8"))
 
 
 EMOJIS = [
diff --git a/bot/exts/easter/traditions.py b/bot/exts/holidays/easter/traditions.py
index 93404f3e..f54ab5c4 100644
--- a/bot/exts/easter/traditions.py
+++ b/bot/exts/holidays/easter/traditions.py
@@ -9,7 +9,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-traditions = json.loads(Path("bot/resources/easter/traditions.json").read_text("utf8"))
+traditions = json.loads(Path("bot/resources/holidays/easter/traditions.json").read_text("utf8"))
 
 
 class Traditions(commands.Cog):
diff --git a/bot/exts/halloween/8ball.py b/bot/exts/holidays/halloween/8ball.py
index a2431190..4fec8463 100644
--- a/bot/exts/halloween/8ball.py
+++ b/bot/exts/holidays/halloween/8ball.py
@@ -10,7 +10,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-RESPONSES = json.loads(Path("bot/resources/halloween/responses.json").read_text("utf8"))
+RESPONSES = json.loads(Path("bot/resources/holidays/halloween/responses.json").read_text("utf8"))
 
 
 class SpookyEightBall(commands.Cog):
diff --git a/bot/exts/holidays/halloween/__init__.py b/bot/exts/holidays/halloween/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/bot/exts/holidays/halloween/__init__.py
diff --git a/bot/exts/halloween/candy_collection.py b/bot/exts/holidays/halloween/candy_collection.py
index 4afd5913..4afd5913 100644
--- a/bot/exts/halloween/candy_collection.py
+++ b/bot/exts/holidays/halloween/candy_collection.py
diff --git a/bot/exts/halloween/halloween_facts.py b/bot/exts/holidays/halloween/halloween_facts.py
index ba3b5d17..adde2310 100644
--- a/bot/exts/halloween/halloween_facts.py
+++ b/bot/exts/holidays/halloween/halloween_facts.py
@@ -24,7 +24,7 @@ SPOOKY_EMOJIS = [
 PUMPKIN_ORANGE = 0xFF7518
 INTERVAL = timedelta(hours=6).total_seconds()
 
-FACTS = json.loads(Path("bot/resources/halloween/halloween_facts.json").read_text("utf8"))
+FACTS = json.loads(Path("bot/resources/holidays/halloween/halloween_facts.json").read_text("utf8"))
 FACTS = list(enumerate(FACTS))
 
 
diff --git a/bot/exts/halloween/halloweenify.py b/bot/exts/holidays/halloween/halloweenify.py
index 83cfbaa7..03b52589 100644
--- a/bot/exts/halloween/halloweenify.py
+++ b/bot/exts/holidays/halloween/halloweenify.py
@@ -12,7 +12,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-HALLOWEENIFY_DATA = loads(Path("bot/resources/halloween/halloweenify.json").read_text("utf8"))
+HALLOWEENIFY_DATA = loads(Path("bot/resources/holidays/halloween/halloweenify.json").read_text("utf8"))
 
 
 class Halloweenify(commands.Cog):
diff --git a/bot/exts/halloween/monsterbio.py b/bot/exts/holidays/halloween/monsterbio.py
index 69e898cb..0556a193 100644
--- a/bot/exts/halloween/monsterbio.py
+++ b/bot/exts/holidays/halloween/monsterbio.py
@@ -12,7 +12,7 @@ from bot.constants import Colours
 log = logging.getLogger(__name__)
 
 TEXT_OPTIONS = json.loads(
-    Path("bot/resources/halloween/monster.json").read_text("utf8")
+    Path("bot/resources/holidays/halloween/monster.json").read_text("utf8")
 )  # Data for a mad-lib style generation of text
 
 
diff --git a/bot/exts/halloween/monstersurvey.py b/bot/exts/holidays/halloween/monstersurvey.py
index 96cda11e..f3433886 100644
--- a/bot/exts/halloween/monstersurvey.py
+++ b/bot/exts/holidays/halloween/monstersurvey.py
@@ -25,7 +25,7 @@ class MonsterSurvey(Cog):
 
     def __init__(self):
         """Initializes values for the bot to use within the voting commands."""
-        self.registry_path = pathlib.Path("bot", "resources", "halloween", "monstersurvey.json")
+        self.registry_path = pathlib.Path("bot", "resources", "holidays", "halloween", "monstersurvey.json")
         self.voter_registry = json.loads(self.registry_path.read_text("utf8"))
 
     def json_write(self) -> None:
diff --git a/bot/exts/halloween/scarymovie.py b/bot/exts/holidays/halloween/scarymovie.py
index 33659fd8..33659fd8 100644
--- a/bot/exts/halloween/scarymovie.py
+++ b/bot/exts/holidays/halloween/scarymovie.py
diff --git a/bot/exts/halloween/spookygif.py b/bot/exts/holidays/halloween/spookygif.py
index 9511d407..9511d407 100644
--- a/bot/exts/halloween/spookygif.py
+++ b/bot/exts/holidays/halloween/spookygif.py
diff --git a/bot/exts/halloween/spookynamerate.py b/bot/exts/holidays/halloween/spookynamerate.py
index 5c21ead7..2e59d4a8 100644
--- a/bot/exts/halloween/spookynamerate.py
+++ b/bot/exts/holidays/halloween/spookynamerate.py
@@ -66,7 +66,7 @@ HELP_MESSAGE_DICT = {
 }
 
 # The names are from https://www.mockaroo.com/
-NAMES = json.loads(Path("bot/resources/halloween/spookynamerate_names.json").read_text("utf8"))
+NAMES = json.loads(Path("bot/resources/holidays/halloween/spookynamerate_names.json").read_text("utf8"))
 FIRST_NAMES = NAMES["first_names"]
 LAST_NAMES = NAMES["last_names"]
 
diff --git a/bot/exts/halloween/spookyrating.py b/bot/exts/holidays/halloween/spookyrating.py
index f566fac2..ec6e8821 100644
--- a/bot/exts/halloween/spookyrating.py
+++ b/bot/exts/holidays/halloween/spookyrating.py
@@ -12,7 +12,9 @@ from bot.constants import Colours
 
 log = logging.getLogger(__name__)
 
-data: dict[str, dict[str, str]] = json.loads(Path("bot/resources/halloween/spooky_rating.json").read_text("utf8"))
+data: dict[str, dict[str, str]] = json.loads(
+    Path("bot/resources/holidays/halloween/spooky_rating.json").read_text("utf8")
+)
 SPOOKY_DATA = sorted((int(key), value) for key, value in data.items())
 
 
diff --git a/bot/exts/halloween/spookyreact.py b/bot/exts/holidays/halloween/spookyreact.py
index 25e783f4..25e783f4 100644
--- a/bot/exts/halloween/spookyreact.py
+++ b/bot/exts/holidays/halloween/spookyreact.py
diff --git a/bot/exts/holidays/hanukkah/__init__.py b/bot/exts/holidays/hanukkah/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/bot/exts/holidays/hanukkah/__init__.py
diff --git a/bot/exts/christmas/hanukkah_embed.py b/bot/exts/holidays/hanukkah/hanukkah_embed.py
index 00125be3..00125be3 100644
--- a/bot/exts/christmas/hanukkah_embed.py
+++ b/bot/exts/holidays/hanukkah/hanukkah_embed.py
diff --git a/bot/exts/holidays/pride/__init__.py b/bot/exts/holidays/pride/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/bot/exts/holidays/pride/__init__.py
diff --git a/bot/exts/pride/drag_queen_name.py b/bot/exts/holidays/pride/drag_queen_name.py
index 15ca6576..bd01a603 100644
--- a/bot/exts/pride/drag_queen_name.py
+++ b/bot/exts/holidays/pride/drag_queen_name.py
@@ -9,7 +9,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-NAMES = json.loads(Path("bot/resources/pride/drag_queen_names.json").read_text("utf8"))
+NAMES = json.loads(Path("bot/resources/holidays/pride/drag_queen_names.json").read_text("utf8"))
 
 
 class DragNames(commands.Cog):
diff --git a/bot/exts/pride/pride_anthem.py b/bot/exts/holidays/pride/pride_anthem.py
index 05286b3d..e8a4563b 100644
--- a/bot/exts/pride/pride_anthem.py
+++ b/bot/exts/holidays/pride/pride_anthem.py
@@ -10,7 +10,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-VIDEOS = json.loads(Path("bot/resources/pride/anthems.json").read_text("utf8"))
+VIDEOS = json.loads(Path("bot/resources/holidays/pride/anthems.json").read_text("utf8"))
 
 
 class PrideAnthem(commands.Cog):
diff --git a/bot/exts/pride/pride_facts.py b/bot/exts/holidays/pride/pride_facts.py
index 63e33dda..e6ef7108 100644
--- a/bot/exts/pride/pride_facts.py
+++ b/bot/exts/holidays/pride/pride_facts.py
@@ -15,7 +15,7 @@ from bot.utils.decorators import seasonal_task
 
 log = logging.getLogger(__name__)
 
-FACTS = json.loads(Path("bot/resources/pride/facts.json").read_text("utf8"))
+FACTS = json.loads(Path("bot/resources/holidays/pride/facts.json").read_text("utf8"))
 
 
 class PrideFacts(commands.Cog):
diff --git a/bot/exts/pride/pride_leader.py b/bot/exts/holidays/pride/pride_leader.py
index 5684ff37..298c9328 100644
--- a/bot/exts/pride/pride_leader.py
+++ b/bot/exts/holidays/pride/pride_leader.py
@@ -13,7 +13,7 @@ from bot.bot import Bot
 
 log = logging.getLogger(__name__)
 
-PRIDE_RESOURCE = json.loads(Path("bot/resources/pride/prideleader.json").read_text("utf8"))
+PRIDE_RESOURCE = json.loads(Path("bot/resources/holidays/pride/prideleader.json").read_text("utf8"))
 MINIMUM_FUZZ_RATIO = 40
 
 
diff --git a/bot/exts/holidays/valentines/__init__.py b/bot/exts/holidays/valentines/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/bot/exts/holidays/valentines/__init__.py
diff --git a/bot/exts/valentines/be_my_valentine.py b/bot/exts/holidays/valentines/be_my_valentine.py
index c238027a..4d454c3a 100644
--- a/bot/exts/valentines/be_my_valentine.py
+++ b/bot/exts/holidays/valentines/be_my_valentine.py
@@ -26,7 +26,7 @@ class BeMyValentine(commands.Cog):
     @staticmethod
     def load_json() -> dict:
         """Load Valentines messages from the static resources."""
-        p = Path("bot/resources/valentines/bemyvalentine_valentines.json")
+        p = Path("bot/resources/holidays/valentines/bemyvalentine_valentines.json")
         return loads(p.read_text("utf8"))
 
     @in_month(Month.FEBRUARY)
diff --git a/bot/exts/valentines/lovecalculator.py b/bot/exts/holidays/valentines/lovecalculator.py
index 1cb10e64..3999db2b 100644
--- a/bot/exts/valentines/lovecalculator.py
+++ b/bot/exts/holidays/valentines/lovecalculator.py
@@ -17,7 +17,7 @@ from bot.utils.decorators import in_month
 
 log = logging.getLogger(__name__)
 
-LOVE_DATA = json.loads(Path("bot/resources/valentines/love_matches.json").read_text("utf8"))
+LOVE_DATA = json.loads(Path("bot/resources/holidays/valentines/love_matches.json").read_text("utf8"))
 LOVE_DATA = sorted((int(key), value) for key, value in LOVE_DATA.items())
 
 
diff --git a/bot/exts/valentines/movie_generator.py b/bot/exts/holidays/valentines/movie_generator.py
index d2dc8213..d2dc8213 100644
--- a/bot/exts/valentines/movie_generator.py
+++ b/bot/exts/holidays/valentines/movie_generator.py
diff --git a/bot/exts/valentines/myvalenstate.py b/bot/exts/holidays/valentines/myvalenstate.py
index 52a61011..4b547d9b 100644
--- a/bot/exts/valentines/myvalenstate.py
+++ b/bot/exts/holidays/valentines/myvalenstate.py
@@ -12,7 +12,7 @@ from bot.constants import Colours
 
 log = logging.getLogger(__name__)
 
-STATES = json.loads(Path("bot/resources/valentines/valenstates.json").read_text("utf8"))
+STATES = json.loads(Path("bot/resources/holidays/valentines/valenstates.json").read_text("utf8"))
 
 
 class MyValenstate(commands.Cog):
diff --git a/bot/exts/valentines/pickuplines.py b/bot/exts/holidays/valentines/pickuplines.py
index 00741a72..bc4b88c6 100644
--- a/bot/exts/valentines/pickuplines.py
+++ b/bot/exts/holidays/valentines/pickuplines.py
@@ -11,7 +11,7 @@ from bot.constants import Colours
 
 log = logging.getLogger(__name__)
 
-PICKUP_LINES = loads(Path("bot/resources/valentines/pickup_lines.json").read_text("utf8"))
+PICKUP_LINES = loads(Path("bot/resources/holidays/valentines/pickup_lines.json").read_text("utf8"))
 
 
 class PickupLine(commands.Cog):
diff --git a/bot/exts/valentines/savethedate.py b/bot/exts/holidays/valentines/savethedate.py
index ffe559d6..3638c1ef 100644
--- a/bot/exts/valentines/savethedate.py
+++ b/bot/exts/holidays/valentines/savethedate.py
@@ -13,7 +13,7 @@ log = logging.getLogger(__name__)
 
 HEART_EMOJIS = [":heart:", ":gift_heart:", ":revolving_hearts:", ":sparkling_heart:", ":two_hearts:"]
 
-VALENTINES_DATES = loads(Path("bot/resources/valentines/date_ideas.json").read_text("utf8"))
+VALENTINES_DATES = loads(Path("bot/resources/holidays/valentines/date_ideas.json").read_text("utf8"))
 
 
 class SaveTheDate(commands.Cog):
diff --git a/bot/exts/valentines/valentine_zodiac.py b/bot/exts/holidays/valentines/valentine_zodiac.py
index 243f156e..d1b3a630 100644
--- a/bot/exts/valentines/valentine_zodiac.py
+++ b/bot/exts/holidays/valentines/valentine_zodiac.py
@@ -27,8 +27,8 @@ class ValentineZodiac(commands.Cog):
     @staticmethod
     def load_comp_json() -> tuple[dict, dict]:
         """Load zodiac compatibility from static JSON resource."""
-        explanation_file = Path("bot/resources/valentines/zodiac_explanation.json")
-        compatibility_file = Path("bot/resources/valentines/zodiac_compatibility.json")
+        explanation_file = Path("bot/resources/holidays/valentines/zodiac_explanation.json")
+        compatibility_file = Path("bot/resources/holidays/valentines/zodiac_compatibility.json")
 
         zodiac_fact = json.loads(explanation_file.read_text("utf8"))
 
diff --git a/bot/exts/valentines/whoisvalentine.py b/bot/exts/holidays/valentines/whoisvalentine.py
index 211b1f27..67e46aa4 100644
--- a/bot/exts/valentines/whoisvalentine.py
+++ b/bot/exts/holidays/valentines/whoisvalentine.py
@@ -11,7 +11,7 @@ from bot.constants import Colours
 
 log = logging.getLogger(__name__)
 
-FACTS = json.loads(Path("bot/resources/valentines/valentine_facts.json").read_text("utf8"))
+FACTS = json.loads(Path("bot/resources/holidays/valentines/valentine_facts.json").read_text("utf8"))
 
 
 class ValentineFacts(commands.Cog):
diff --git a/bot/exts/utilities/__init__.py b/bot/exts/utilities/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/bot/exts/utilities/__init__.py
diff --git a/bot/exts/evergreen/bookmark.py b/bot/exts/utilities/bookmark.py
index a91ef1c0..a91ef1c0 100644
--- a/bot/exts/evergreen/bookmark.py
+++ b/bot/exts/utilities/bookmark.py
diff --git a/bot/exts/evergreen/cheatsheet.py b/bot/exts/utilities/cheatsheet.py
index 33d29f67..33d29f67 100644
--- a/bot/exts/evergreen/cheatsheet.py
+++ b/bot/exts/utilities/cheatsheet.py
diff --git a/bot/exts/evergreen/conversationstarters.py b/bot/exts/utilities/conversationstarters.py
index fdc4467a..dd537022 100644
--- a/bot/exts/evergreen/conversationstarters.py
+++ b/bot/exts/utilities/conversationstarters.py
@@ -11,10 +11,10 @@ from bot.utils.randomization import RandomCycle
 
 SUGGESTION_FORM = "https://forms.gle/zw6kkJqv8U43Nfjg9"
 
-with Path("bot/resources/evergreen/starter.yaml").open("r", encoding="utf8") as f:
+with Path("bot/resources/utilities/starter.yaml").open("r", encoding="utf8") as f:
     STARTERS = yaml.load(f, Loader=yaml.FullLoader)
 
-with Path("bot/resources/evergreen/py_topics.yaml").open("r", encoding="utf8") as f:
+with Path("bot/resources/utilities/py_topics.yaml").open("r", encoding="utf8") as f:
     # First ID is #python-general and the rest are top to bottom categories of Topical Chat/Help.
     PY_TOPICS = yaml.load(f, Loader=yaml.FullLoader)
 
@@ -33,7 +33,7 @@ TOPICS = {
 
 
 class ConvoStarters(commands.Cog):
-    """Evergreen conversation topics."""
+    """General conversation topics."""
 
     @commands.command()
     @whitelist_override(channels=ALL_ALLOWED_CHANNELS)
diff --git a/bot/exts/evergreen/emoji.py b/bot/exts/utilities/emoji.py
index 55d6b8e9..55d6b8e9 100644
--- a/bot/exts/evergreen/emoji.py
+++ b/bot/exts/utilities/emoji.py
diff --git a/bot/exts/evergreen/githubinfo.py b/bot/exts/utilities/githubinfo.py
index bbc9061a..d00b408d 100644
--- a/bot/exts/evergreen/githubinfo.py
+++ b/bot/exts/utilities/githubinfo.py
@@ -8,7 +8,7 @@ from discord.ext import commands
 
 from bot.bot import Bot
 from bot.constants import Colours, NEGATIVE_REPLIES
-from bot.exts.utils.extensions import invoke_help_command
+from bot.exts.core.extensions import invoke_help_command
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/exts/evergreen/issues.py b/bot/exts/utilities/issues.py
index 8a7ebed0..8a7ebed0 100644
--- a/bot/exts/evergreen/issues.py
+++ b/bot/exts/utilities/issues.py
diff --git a/bot/exts/evergreen/latex.py b/bot/exts/utilities/latex.py
index 36c7e0ab..36c7e0ab 100644
--- a/bot/exts/evergreen/latex.py
+++ b/bot/exts/utilities/latex.py
diff --git a/bot/exts/evergreen/pythonfacts.py b/bot/exts/utilities/pythonfacts.py
index 80a8da5d..ef190185 100644
--- a/bot/exts/evergreen/pythonfacts.py
+++ b/bot/exts/utilities/pythonfacts.py
@@ -6,7 +6,7 @@ from discord.ext import commands
 from bot.bot import Bot
 from bot.constants import Colours
 
-with open("bot/resources/evergreen/python_facts.txt") as file:
+with open("bot/resources/utilities/python_facts.txt") as file:
     FACTS = itertools.cycle(list(file))
 
 COLORS = itertools.cycle([Colours.python_blue, Colours.python_yellow])
diff --git a/bot/exts/evergreen/realpython.py b/bot/exts/utilities/realpython.py
index ef8b2638..ef8b2638 100644
--- a/bot/exts/evergreen/realpython.py
+++ b/bot/exts/utilities/realpython.py
diff --git a/bot/exts/evergreen/reddit.py b/bot/exts/utilities/reddit.py
index e6cb5337..e6cb5337 100644
--- a/bot/exts/evergreen/reddit.py
+++ b/bot/exts/utilities/reddit.py
diff --git a/bot/exts/evergreen/stackoverflow.py b/bot/exts/utilities/stackoverflow.py
index 64455e33..64455e33 100644
--- a/bot/exts/evergreen/stackoverflow.py
+++ b/bot/exts/utilities/stackoverflow.py
diff --git a/bot/exts/evergreen/timed.py b/bot/exts/utilities/timed.py
index 2ea6b419..2ea6b419 100644
--- a/bot/exts/evergreen/timed.py
+++ b/bot/exts/utilities/timed.py
diff --git a/bot/exts/evergreen/wikipedia.py b/bot/exts/utilities/wikipedia.py
index eccc1f8c..eccc1f8c 100644
--- a/bot/exts/evergreen/wikipedia.py
+++ b/bot/exts/utilities/wikipedia.py
diff --git a/bot/exts/evergreen/wolfram.py b/bot/exts/utilities/wolfram.py
index 9a26e545..9a26e545 100644
--- a/bot/exts/evergreen/wolfram.py
+++ b/bot/exts/utilities/wolfram.py
diff --git a/bot/resources/advent_of_code/about.json b/bot/resources/events/advent_of_code/about.json
index dd0fe59a..dd0fe59a 100644
--- a/bot/resources/advent_of_code/about.json
+++ b/bot/resources/events/advent_of_code/about.json
diff --git a/bot/resources/evergreen/LuckiestGuy-Regular.ttf b/bot/resources/fun/LuckiestGuy-Regular.ttf
index 8c79c875..8c79c875 100644
--- a/bot/resources/evergreen/LuckiestGuy-Regular.ttf
+++ b/bot/resources/fun/LuckiestGuy-Regular.ttf
diff --git a/bot/resources/evergreen/all_cards.png b/bot/resources/fun/all_cards.png
index 10ed2eb8..10ed2eb8 100644
--- a/bot/resources/evergreen/all_cards.png
+++ b/bot/resources/fun/all_cards.png
diff --git a/bot/resources/evergreen/caesar_info.json b/bot/resources/fun/caesar_info.json
index 8229c4f3..8229c4f3 100644
--- a/bot/resources/evergreen/caesar_info.json
+++ b/bot/resources/fun/caesar_info.json
diff --git a/bot/resources/evergreen/ducks_help_ex.png b/bot/resources/fun/ducks_help_ex.png
index 01d9c243..01d9c243 100644
--- a/bot/resources/evergreen/ducks_help_ex.png
+++ b/bot/resources/fun/ducks_help_ex.png
diff --git a/bot/resources/evergreen/game_recs/chrono_trigger.json b/bot/resources/fun/game_recs/chrono_trigger.json
index 9720b977..9720b977 100644
--- a/bot/resources/evergreen/game_recs/chrono_trigger.json
+++ b/bot/resources/fun/game_recs/chrono_trigger.json
diff --git a/bot/resources/evergreen/game_recs/digimon_world.json b/bot/resources/fun/game_recs/digimon_world.json
index c1cb4f37..c1cb4f37 100644
--- a/bot/resources/evergreen/game_recs/digimon_world.json
+++ b/bot/resources/fun/game_recs/digimon_world.json
diff --git a/bot/resources/evergreen/game_recs/doom_2.json b/bot/resources/fun/game_recs/doom_2.json
index b60cc05f..b60cc05f 100644
--- a/bot/resources/evergreen/game_recs/doom_2.json
+++ b/bot/resources/fun/game_recs/doom_2.json
diff --git a/bot/resources/evergreen/game_recs/skyrim.json b/bot/resources/fun/game_recs/skyrim.json
index ad86db31..ad86db31 100644
--- a/bot/resources/evergreen/game_recs/skyrim.json
+++ b/bot/resources/fun/game_recs/skyrim.json
diff --git a/bot/resources/evergreen/html_colours.json b/bot/resources/fun/html_colours.json
index 086083d6..086083d6 100644
--- a/bot/resources/evergreen/html_colours.json
+++ b/bot/resources/fun/html_colours.json
diff --git a/bot/resources/evergreen/magic8ball.json b/bot/resources/fun/magic8ball.json
index f5f1df62..f5f1df62 100644
--- a/bot/resources/evergreen/magic8ball.json
+++ b/bot/resources/fun/magic8ball.json
diff --git a/bot/resources/snakes/snake_cards/backs/card_back1.jpg b/bot/resources/fun/snakes/snake_cards/backs/card_back1.jpg
index 22959fa7..22959fa7 100644
--- a/bot/resources/snakes/snake_cards/backs/card_back1.jpg
+++ b/bot/resources/fun/snakes/snake_cards/backs/card_back1.jpg
diff --git a/bot/resources/snakes/snake_cards/backs/card_back2.jpg b/bot/resources/fun/snakes/snake_cards/backs/card_back2.jpg
index d56edc32..d56edc32 100644
--- a/bot/resources/snakes/snake_cards/backs/card_back2.jpg
+++ b/bot/resources/fun/snakes/snake_cards/backs/card_back2.jpg
diff --git a/bot/resources/snakes/snake_cards/card_bottom.png b/bot/resources/fun/snakes/snake_cards/card_bottom.png
index 8b2b91c5..8b2b91c5 100644
--- a/bot/resources/snakes/snake_cards/card_bottom.png
+++ b/bot/resources/fun/snakes/snake_cards/card_bottom.png
diff --git a/bot/resources/snakes/snake_cards/card_frame.png b/bot/resources/fun/snakes/snake_cards/card_frame.png
index 149a0a5f..149a0a5f 100644
--- a/bot/resources/snakes/snake_cards/card_frame.png
+++ b/bot/resources/fun/snakes/snake_cards/card_frame.png
diff --git a/bot/resources/snakes/snake_cards/card_top.png b/bot/resources/fun/snakes/snake_cards/card_top.png
index e329c873..e329c873 100644
--- a/bot/resources/snakes/snake_cards/card_top.png
+++ b/bot/resources/fun/snakes/snake_cards/card_top.png
diff --git a/bot/resources/snakes/snake_cards/expressway.ttf b/bot/resources/fun/snakes/snake_cards/expressway.ttf
index 39e15794..39e15794 100644
--- a/bot/resources/snakes/snake_cards/expressway.ttf
+++ b/bot/resources/fun/snakes/snake_cards/expressway.ttf
diff --git a/bot/resources/snakes/snake_facts.json b/bot/resources/fun/snakes/snake_facts.json
index ca9ba769..ca9ba769 100644
--- a/bot/resources/snakes/snake_facts.json
+++ b/bot/resources/fun/snakes/snake_facts.json
diff --git a/bot/resources/snakes/snake_idioms.json b/bot/resources/fun/snakes/snake_idioms.json
index ecbeb6ff..ecbeb6ff 100644
--- a/bot/resources/snakes/snake_idioms.json
+++ b/bot/resources/fun/snakes/snake_idioms.json
diff --git a/bot/resources/snakes/snake_names.json b/bot/resources/fun/snakes/snake_names.json
index 25832550..25832550 100644
--- a/bot/resources/snakes/snake_names.json
+++ b/bot/resources/fun/snakes/snake_names.json
diff --git a/bot/resources/snakes/snake_quiz.json b/bot/resources/fun/snakes/snake_quiz.json
index 8c426b22..8c426b22 100644
--- a/bot/resources/snakes/snake_quiz.json
+++ b/bot/resources/fun/snakes/snake_quiz.json
diff --git a/bot/resources/snakes/snakes_and_ladders/banner.jpg b/bot/resources/fun/snakes/snakes_and_ladders/banner.jpg
index 69eaaf12..69eaaf12 100644
--- a/bot/resources/snakes/snakes_and_ladders/banner.jpg
+++ b/bot/resources/fun/snakes/snakes_and_ladders/banner.jpg
diff --git a/bot/resources/snakes/snakes_and_ladders/board.jpg b/bot/resources/fun/snakes/snakes_and_ladders/board.jpg
index 20032e39..20032e39 100644
--- a/bot/resources/snakes/snakes_and_ladders/board.jpg
+++ b/bot/resources/fun/snakes/snakes_and_ladders/board.jpg
diff --git a/bot/resources/snakes/special_snakes.json b/bot/resources/fun/snakes/special_snakes.json
index 46214f66..46214f66 100644
--- a/bot/resources/snakes/special_snakes.json
+++ b/bot/resources/fun/snakes/special_snakes.json
diff --git a/bot/resources/evergreen/speedrun_links.json b/bot/resources/fun/speedrun_links.json
index acb5746a..acb5746a 100644
--- a/bot/resources/evergreen/speedrun_links.json
+++ b/bot/resources/fun/speedrun_links.json
diff --git a/bot/resources/evergreen/trivia_quiz.json b/bot/resources/fun/trivia_quiz.json
index 8008838c..8008838c 100644
--- a/bot/resources/evergreen/trivia_quiz.json
+++ b/bot/resources/fun/trivia_quiz.json
diff --git a/bot/resources/evergreen/wonder_twins.yaml b/bot/resources/fun/wonder_twins.yaml
index 05e8d749..05e8d749 100644
--- a/bot/resources/evergreen/wonder_twins.yaml
+++ b/bot/resources/fun/wonder_twins.yaml
diff --git a/bot/resources/evergreen/xkcd_colours.json b/bot/resources/fun/xkcd_colours.json
index 3feeb639..3feeb639 100644
--- a/bot/resources/evergreen/xkcd_colours.json
+++ b/bot/resources/fun/xkcd_colours.json
diff --git a/bot/resources/easter/save_the_planet.json b/bot/resources/holidays/earth_day/save_the_planet.json
index f22261b7..f22261b7 100644
--- a/bot/resources/easter/save_the_planet.json
+++ b/bot/resources/holidays/earth_day/save_the_planet.json
diff --git a/bot/resources/easter/april_fools_vids.json b/bot/resources/holidays/easter/april_fools_vids.json
index e1e8c70a..e1e8c70a 100644
--- a/bot/resources/easter/april_fools_vids.json
+++ b/bot/resources/holidays/easter/april_fools_vids.json
diff --git a/bot/resources/easter/bunny_names.json b/bot/resources/holidays/easter/bunny_names.json
index 8c97169c..8c97169c 100644
--- a/bot/resources/easter/bunny_names.json
+++ b/bot/resources/holidays/easter/bunny_names.json
diff --git a/bot/resources/easter/chocolate_bunny.png b/bot/resources/holidays/easter/chocolate_bunny.png
index 6b25aa5a..6b25aa5a 100644
--- a/bot/resources/easter/chocolate_bunny.png
+++ b/bot/resources/holidays/easter/chocolate_bunny.png
diff --git a/bot/resources/easter/easter_egg_facts.json b/bot/resources/holidays/easter/easter_egg_facts.json
index b0650b84..b0650b84 100644
--- a/bot/resources/easter/easter_egg_facts.json
+++ b/bot/resources/holidays/easter/easter_egg_facts.json
diff --git a/bot/resources/easter/easter_eggs/design1.png b/bot/resources/holidays/easter/easter_eggs/design1.png
index d887c590..d887c590 100644
--- a/bot/resources/easter/easter_eggs/design1.png
+++ b/bot/resources/holidays/easter/easter_eggs/design1.png
diff --git a/bot/resources/easter/easter_eggs/design2.png b/bot/resources/holidays/easter/easter_eggs/design2.png
index c4fff644..c4fff644 100644
--- a/bot/resources/easter/easter_eggs/design2.png
+++ b/bot/resources/holidays/easter/easter_eggs/design2.png
diff --git a/bot/resources/easter/easter_eggs/design3.png b/bot/resources/holidays/easter/easter_eggs/design3.png
index 803bc1e3..803bc1e3 100644
--- a/bot/resources/easter/easter_eggs/design3.png
+++ b/bot/resources/holidays/easter/easter_eggs/design3.png
diff --git a/bot/resources/easter/easter_eggs/design4.png b/bot/resources/holidays/easter/easter_eggs/design4.png
index 38e6a83f..38e6a83f 100644
--- a/bot/resources/easter/easter_eggs/design4.png
+++ b/bot/resources/holidays/easter/easter_eggs/design4.png
diff --git a/bot/resources/easter/easter_eggs/design5.png b/bot/resources/holidays/easter/easter_eggs/design5.png
index 56662c26..56662c26 100644
--- a/bot/resources/easter/easter_eggs/design5.png
+++ b/bot/resources/holidays/easter/easter_eggs/design5.png
diff --git a/bot/resources/easter/easter_eggs/design6.png b/bot/resources/holidays/easter/easter_eggs/design6.png
index 5372439a..5372439a 100644
--- a/bot/resources/easter/easter_eggs/design6.png
+++ b/bot/resources/holidays/easter/easter_eggs/design6.png
diff --git a/bot/resources/easter/easter_riddle.json b/bot/resources/holidays/easter/easter_riddle.json
index f7eb63d8..f7eb63d8 100644
--- a/bot/resources/easter/easter_riddle.json
+++ b/bot/resources/holidays/easter/easter_riddle.json
diff --git a/bot/resources/easter/egghead_questions.json b/bot/resources/holidays/easter/egghead_questions.json
index 5535f8e0..5535f8e0 100644
--- a/bot/resources/easter/egghead_questions.json
+++ b/bot/resources/holidays/easter/egghead_questions.json
diff --git a/bot/resources/easter/traditions.json b/bot/resources/holidays/easter/traditions.json
index f9dd6d81..f9dd6d81 100644
--- a/bot/resources/easter/traditions.json
+++ b/bot/resources/holidays/easter/traditions.json
diff --git a/bot/resources/halloween/bat-clipart.png b/bot/resources/holidays/halloween/bat-clipart.png
index 7df26ba9..7df26ba9 100644
--- a/bot/resources/halloween/bat-clipart.png
+++ b/bot/resources/holidays/halloween/bat-clipart.png
diff --git a/bot/resources/halloween/bloody-pentagram.png b/bot/resources/holidays/halloween/bloody-pentagram.png
index 4e6da07a..4e6da07a 100644
--- a/bot/resources/halloween/bloody-pentagram.png
+++ b/bot/resources/holidays/halloween/bloody-pentagram.png
diff --git a/bot/resources/halloween/halloween_facts.json b/bot/resources/holidays/halloween/halloween_facts.json
index fc6fa85f..fc6fa85f 100644
--- a/bot/resources/halloween/halloween_facts.json
+++ b/bot/resources/holidays/halloween/halloween_facts.json
diff --git a/bot/resources/halloween/halloweenify.json b/bot/resources/holidays/halloween/halloweenify.json
index af9204b2..af9204b2 100644
--- a/bot/resources/halloween/halloweenify.json
+++ b/bot/resources/holidays/halloween/halloweenify.json
diff --git a/bot/resources/halloween/monster.json b/bot/resources/holidays/halloween/monster.json
index 5958dc9c..5958dc9c 100644
--- a/bot/resources/halloween/monster.json
+++ b/bot/resources/holidays/halloween/monster.json
diff --git a/bot/resources/halloween/monstersurvey.json b/bot/resources/holidays/halloween/monstersurvey.json
index d8cc72e7..d8cc72e7 100644
--- a/bot/resources/halloween/monstersurvey.json
+++ b/bot/resources/holidays/halloween/monstersurvey.json
diff --git a/bot/resources/halloween/responses.json b/bot/resources/holidays/halloween/responses.json
index c0f24c1a..c0f24c1a 100644
--- a/bot/resources/halloween/responses.json
+++ b/bot/resources/holidays/halloween/responses.json
diff --git a/bot/resources/halloween/spooky_rating.json b/bot/resources/holidays/halloween/spooky_rating.json
index 8e3e66bb..738a8717 100644
--- a/bot/resources/halloween/spooky_rating.json
+++ b/bot/resources/holidays/halloween/spooky_rating.json
@@ -2,46 +2,46 @@
     "-1": {
         "title": "\uD83D\uDD6F You're not scarin' anyone \uD83D\uDD6F",
         "text": "No matter what you say or do, nobody even flinches when you try to scare them. Was your costume this year only a white sheet with holes for eyes? Or did you even bother with a costume at all? Either way, don't expect too many treats when going from door-to-door.",
-        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/halloween/spookyrating/candle.jpeg"
+        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/holidays/halloween/spookyrating/candle.jpeg"
     },
     "5": {
         "title": "\uD83D\uDC76 Like taking candy from a baby \uD83D\uDC76",
         "text": "Your scaring will probably make a baby cry... but that's the limit on your frightening powers. Be careful not to get to the point where everyone's running away from you because they don't like you, not because they're scared of you.",
-        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/halloween/spookyrating/baby.jpeg"
+        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/holidays/halloween/spookyrating/baby.jpeg"
     },
     "20": {
         "title": "\uD83C\uDFDA You're skills are forming... \uD83C\uDFDA",
         "text": "As you become the Devil's apprentice, you begin to make people jump every time you sneak up on them. A good start, but you have to learn not to wear the same costume every year until it doesn't fit you. People will notice you and your prowess will decrease.",
-        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/halloween/spookyrating/tiger.jpeg"
+        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/holidays/halloween/spookyrating/tiger.jpeg"
     },
     "30": {
         "title": "\uD83D\uDC80 Picture Perfect... \uD83D\uDC80",
         "text": "You've nailed the costume this year! You look suuuper scary! Now make sure to play the part and act out your costume and you'll be sure to give a few people a massive fright!",
-        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/halloween/spookyrating/costume.jpeg"
+        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/holidays/halloween/spookyrating/costume.jpeg"
     },
     "50": {
         "title": "\uD83D\uDC7B Uhm... are you human \uD83D\uDC7B",
         "text": "Uhm... you're too good to be human and now you're beginning to sound like a ghost. You're almost invisible when haunting and nobody truly knows where you are at any given time. But they will always scream at the sound of a ghost...",
-        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/halloween/spookyrating/ghost.jpeg"
+        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/holidays/halloween/spookyrating/ghost.jpeg"
     },
     "65": {
         "title": "\uD83C\uDF83 That potion can't be real \uD83C\uDF83",
         "text": "You're carrying... some... unknown liquids and no one knows who they are but yourself. Be careful on who you use these powerful spells on, because no Mage has the power to do any irreversible enchantments because even you won't know what will happen to these mortals.",
-        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/halloween/spookyrating/necromancer.jepg"
+        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/holidays/halloween/spookyrating/necromancer.jepg"
     },
     "80": {
         "title": "\uD83E\uDD21 The most sinister face \uD83E\uDD21",
         "text": "Who knew something intended to be playful could be so menacing... Especially other people seeing you in their nightmares, continuing to haunt them day by day, stuck in their head throughout the entire year. Make sure to pull a face they will never forget.",
-        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/halloween/spookyrating/clown.jpeg"
+        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/holidays/halloween/spookyrating/clown.jpeg"
     },
     "95": {
         "title": "\uD83D\uDE08 The Devil's Accomplice \uD83D\uDE08",
         "text": "Imagine being allies with the most evil character with an aim to scare people to death. Force people to suffer as they proceed straight to hell to meet your boss and best friend. Not even you know the power He has...",
-        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/halloween/spookyrating/jackolantern.jpg"
+        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/holidays/halloween/spookyrating/jackolantern.jpg"
     },
     "100": {
         "title":"\uD83D\uDC7F The Devil Himself \uD83D\uDC7F",
         "text": "You are the evillest creature in existence to scare anyone and everyone humanly possible. The reason your underlings are called mortals is that they die. With your help, they die a lot quicker. With all the evil power in the universe, you know what to do.",
-        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/halloween/spookyrating/devil.jpeg"
+        "image": "https://raw.githubusercontent.com/python-discord/sir-lancebot/main/bot/resources/holidays/halloween/spookyrating/devil.jpeg"
     }
 }
diff --git a/bot/resources/halloween/spookynamerate_names.json b/bot/resources/holidays/halloween/spookynamerate_names.json
index 7657880b..7657880b 100644
--- a/bot/resources/halloween/spookynamerate_names.json
+++ b/bot/resources/holidays/halloween/spookynamerate_names.json
diff --git a/bot/resources/halloween/spookyrating/baby.jpeg b/bot/resources/holidays/halloween/spookyrating/baby.jpeg
index 199f8bca..199f8bca 100644
--- a/bot/resources/halloween/spookyrating/baby.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/baby.jpeg
diff --git a/bot/resources/halloween/spookyrating/candle.jpeg b/bot/resources/holidays/halloween/spookyrating/candle.jpeg
index 9913752b..9913752b 100644
--- a/bot/resources/halloween/spookyrating/candle.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/candle.jpeg
diff --git a/bot/resources/halloween/spookyrating/clown.jpeg b/bot/resources/holidays/halloween/spookyrating/clown.jpeg
index f23c4f70..f23c4f70 100644
--- a/bot/resources/halloween/spookyrating/clown.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/clown.jpeg
diff --git a/bot/resources/halloween/spookyrating/costume.jpeg b/bot/resources/holidays/halloween/spookyrating/costume.jpeg
index b3c21af0..b3c21af0 100644
--- a/bot/resources/halloween/spookyrating/costume.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/costume.jpeg
diff --git a/bot/resources/halloween/spookyrating/devil.jpeg b/bot/resources/holidays/halloween/spookyrating/devil.jpeg
index 4f45aaa7..4f45aaa7 100644
--- a/bot/resources/halloween/spookyrating/devil.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/devil.jpeg
diff --git a/bot/resources/halloween/spookyrating/ghost.jpeg b/bot/resources/holidays/halloween/spookyrating/ghost.jpeg
index 0cb13346..0cb13346 100644
--- a/bot/resources/halloween/spookyrating/ghost.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/ghost.jpeg
diff --git a/bot/resources/halloween/spookyrating/jackolantern.jpeg b/bot/resources/holidays/halloween/spookyrating/jackolantern.jpeg
index d7cf3d08..d7cf3d08 100644
--- a/bot/resources/halloween/spookyrating/jackolantern.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/jackolantern.jpeg
diff --git a/bot/resources/halloween/spookyrating/necromancer.jpeg b/bot/resources/holidays/halloween/spookyrating/necromancer.jpeg
index 60b1e689..60b1e689 100644
--- a/bot/resources/halloween/spookyrating/necromancer.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/necromancer.jpeg
diff --git a/bot/resources/halloween/spookyrating/tiger.jpeg b/bot/resources/holidays/halloween/spookyrating/tiger.jpeg
index 0419f5df..0419f5df 100644
--- a/bot/resources/halloween/spookyrating/tiger.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/tiger.jpeg
diff --git a/bot/resources/pride/anthems.json b/bot/resources/holidays/pride/anthems.json
index fd8e8b92..fd8e8b92 100644
--- a/bot/resources/pride/anthems.json
+++ b/bot/resources/holidays/pride/anthems.json
diff --git a/bot/resources/pride/drag_queen_names.json b/bot/resources/holidays/pride/drag_queen_names.json
index 023dff36..023dff36 100644
--- a/bot/resources/pride/drag_queen_names.json
+++ b/bot/resources/holidays/pride/drag_queen_names.json
diff --git a/bot/resources/pride/facts.json b/bot/resources/holidays/pride/facts.json
index 2151f5ca..2151f5ca 100644
--- a/bot/resources/pride/facts.json
+++ b/bot/resources/holidays/pride/facts.json
diff --git a/bot/resources/pride/flags/agender.png b/bot/resources/holidays/pride/flags/agender.png
index 8a09e5fa..8a09e5fa 100644
--- a/bot/resources/pride/flags/agender.png
+++ b/bot/resources/holidays/pride/flags/agender.png
diff --git a/bot/resources/pride/flags/androgyne.png b/bot/resources/holidays/pride/flags/androgyne.png
index da40ec01..da40ec01 100644
--- a/bot/resources/pride/flags/androgyne.png
+++ b/bot/resources/holidays/pride/flags/androgyne.png
diff --git a/bot/resources/pride/flags/aromantic.png b/bot/resources/holidays/pride/flags/aromantic.png
index 7c42a200..7c42a200 100644
--- a/bot/resources/pride/flags/aromantic.png
+++ b/bot/resources/holidays/pride/flags/aromantic.png
diff --git a/bot/resources/pride/flags/asexual.png b/bot/resources/holidays/pride/flags/asexual.png
index c339b239..c339b239 100644
--- a/bot/resources/pride/flags/asexual.png
+++ b/bot/resources/holidays/pride/flags/asexual.png
diff --git a/bot/resources/pride/flags/bigender.png b/bot/resources/holidays/pride/flags/bigender.png
index 9864f9bb..9864f9bb 100644
--- a/bot/resources/pride/flags/bigender.png
+++ b/bot/resources/holidays/pride/flags/bigender.png
diff --git a/bot/resources/pride/flags/bisexual.png b/bot/resources/holidays/pride/flags/bisexual.png
index 2479bc8e..2479bc8e 100644
--- a/bot/resources/pride/flags/bisexual.png
+++ b/bot/resources/holidays/pride/flags/bisexual.png
diff --git a/bot/resources/pride/flags/demiboy.png b/bot/resources/holidays/pride/flags/demiboy.png
index 95f68717..95f68717 100644
--- a/bot/resources/pride/flags/demiboy.png
+++ b/bot/resources/holidays/pride/flags/demiboy.png
diff --git a/bot/resources/pride/flags/demigirl.png b/bot/resources/holidays/pride/flags/demigirl.png
index 6df49bce..6df49bce 100644
--- a/bot/resources/pride/flags/demigirl.png
+++ b/bot/resources/holidays/pride/flags/demigirl.png
diff --git a/bot/resources/pride/flags/demisexual.png b/bot/resources/holidays/pride/flags/demisexual.png
index 5339330e..5339330e 100644
--- a/bot/resources/pride/flags/demisexual.png
+++ b/bot/resources/holidays/pride/flags/demisexual.png
diff --git a/bot/resources/pride/flags/gay.png b/bot/resources/holidays/pride/flags/gay.png
index 5a454ca3..5a454ca3 100644
--- a/bot/resources/pride/flags/gay.png
+++ b/bot/resources/holidays/pride/flags/gay.png
diff --git a/bot/resources/pride/flags/genderfluid.png b/bot/resources/holidays/pride/flags/genderfluid.png
index ac22f093..ac22f093 100644
--- a/bot/resources/pride/flags/genderfluid.png
+++ b/bot/resources/holidays/pride/flags/genderfluid.png
diff --git a/bot/resources/pride/flags/genderqueer.png b/bot/resources/holidays/pride/flags/genderqueer.png
index 4652c7e6..4652c7e6 100644
--- a/bot/resources/pride/flags/genderqueer.png
+++ b/bot/resources/holidays/pride/flags/genderqueer.png
diff --git a/bot/resources/pride/flags/intersex.png b/bot/resources/holidays/pride/flags/intersex.png
index c58a3bfe..c58a3bfe 100644
--- a/bot/resources/pride/flags/intersex.png
+++ b/bot/resources/holidays/pride/flags/intersex.png
diff --git a/bot/resources/pride/flags/lesbian.png b/bot/resources/holidays/pride/flags/lesbian.png
index 824b9a89..824b9a89 100644
--- a/bot/resources/pride/flags/lesbian.png
+++ b/bot/resources/holidays/pride/flags/lesbian.png
diff --git a/bot/resources/pride/flags/nonbinary.png b/bot/resources/holidays/pride/flags/nonbinary.png
index ee3c50e2..ee3c50e2 100644
--- a/bot/resources/pride/flags/nonbinary.png
+++ b/bot/resources/holidays/pride/flags/nonbinary.png
diff --git a/bot/resources/pride/flags/omnisexual.png b/bot/resources/holidays/pride/flags/omnisexual.png
index 2527051d..2527051d 100644
--- a/bot/resources/pride/flags/omnisexual.png
+++ b/bot/resources/holidays/pride/flags/omnisexual.png
diff --git a/bot/resources/pride/flags/pangender.png b/bot/resources/holidays/pride/flags/pangender.png
index 38004654..38004654 100644
--- a/bot/resources/pride/flags/pangender.png
+++ b/bot/resources/holidays/pride/flags/pangender.png
diff --git a/bot/resources/pride/flags/pansexual.png b/bot/resources/holidays/pride/flags/pansexual.png
index 0e56b534..0e56b534 100644
--- a/bot/resources/pride/flags/pansexual.png
+++ b/bot/resources/holidays/pride/flags/pansexual.png
diff --git a/bot/resources/pride/flags/polyamory.png b/bot/resources/holidays/pride/flags/polyamory.png
index b41f061f..b41f061f 100644
--- a/bot/resources/pride/flags/polyamory.png
+++ b/bot/resources/holidays/pride/flags/polyamory.png
diff --git a/bot/resources/pride/flags/polysexual.png b/bot/resources/holidays/pride/flags/polysexual.png
index b2aba22c..b2aba22c 100644
--- a/bot/resources/pride/flags/polysexual.png
+++ b/bot/resources/holidays/pride/flags/polysexual.png
diff --git a/bot/resources/pride/flags/transgender.png b/bot/resources/holidays/pride/flags/transgender.png
index 73f01043..73f01043 100644
--- a/bot/resources/pride/flags/transgender.png
+++ b/bot/resources/holidays/pride/flags/transgender.png
diff --git a/bot/resources/pride/flags/trigender.png b/bot/resources/holidays/pride/flags/trigender.png
index 06ff0f7c..06ff0f7c 100644
--- a/bot/resources/pride/flags/trigender.png
+++ b/bot/resources/holidays/pride/flags/trigender.png
diff --git a/bot/resources/pride/gender_options.json b/bot/resources/holidays/pride/gender_options.json
index 062742fb..062742fb 100644
--- a/bot/resources/pride/gender_options.json
+++ b/bot/resources/holidays/pride/gender_options.json
diff --git a/bot/resources/pride/prideleader.json b/bot/resources/holidays/pride/prideleader.json
index 30e84bdc..30e84bdc 100644
--- a/bot/resources/pride/prideleader.json
+++ b/bot/resources/holidays/pride/prideleader.json
diff --git a/bot/resources/valentines/bemyvalentine_valentines.json b/bot/resources/holidays/valentines/bemyvalentine_valentines.json
index 7d5d3705..7d5d3705 100644
--- a/bot/resources/valentines/bemyvalentine_valentines.json
+++ b/bot/resources/holidays/valentines/bemyvalentine_valentines.json
diff --git a/bot/resources/valentines/date_ideas.json b/bot/resources/holidays/valentines/date_ideas.json
index 995f14bb..995f14bb 100644
--- a/bot/resources/valentines/date_ideas.json
+++ b/bot/resources/holidays/valentines/date_ideas.json
diff --git a/bot/resources/valentines/love_matches.json b/bot/resources/holidays/valentines/love_matches.json
index 7df2dbda..7df2dbda 100644
--- a/bot/resources/valentines/love_matches.json
+++ b/bot/resources/holidays/valentines/love_matches.json
diff --git a/bot/resources/valentines/pickup_lines.json b/bot/resources/holidays/valentines/pickup_lines.json
index eb01290f..eb01290f 100644
--- a/bot/resources/valentines/pickup_lines.json
+++ b/bot/resources/holidays/valentines/pickup_lines.json
diff --git a/bot/resources/valentines/valenstates.json b/bot/resources/holidays/valentines/valenstates.json
index c58a5b7c..c58a5b7c 100644
--- a/bot/resources/valentines/valenstates.json
+++ b/bot/resources/holidays/valentines/valenstates.json
diff --git a/bot/resources/valentines/valentine_facts.json b/bot/resources/holidays/valentines/valentine_facts.json
index e6f826c3..e6f826c3 100644
--- a/bot/resources/valentines/valentine_facts.json
+++ b/bot/resources/holidays/valentines/valentine_facts.json
diff --git a/bot/resources/valentines/zodiac_compatibility.json b/bot/resources/holidays/valentines/zodiac_compatibility.json
index ea9a7b37..ea9a7b37 100644
--- a/bot/resources/valentines/zodiac_compatibility.json
+++ b/bot/resources/holidays/valentines/zodiac_compatibility.json
diff --git a/bot/resources/valentines/zodiac_explanation.json b/bot/resources/holidays/valentines/zodiac_explanation.json
index 33864ea5..33864ea5 100644
--- a/bot/resources/valentines/zodiac_explanation.json
+++ b/bot/resources/holidays/valentines/zodiac_explanation.json
diff --git a/bot/resources/evergreen/py_topics.yaml b/bot/resources/utilities/py_topics.yaml
index a3fb2ccc..a3fb2ccc 100644
--- a/bot/resources/evergreen/py_topics.yaml
+++ b/bot/resources/utilities/py_topics.yaml
diff --git a/bot/resources/evergreen/python_facts.txt b/bot/resources/utilities/python_facts.txt
index 0abd971b..0abd971b 100644
--- a/bot/resources/evergreen/python_facts.txt
+++ b/bot/resources/utilities/python_facts.txt
diff --git a/bot/resources/evergreen/starter.yaml b/bot/resources/utilities/starter.yaml
index 6b0de0ef..6b0de0ef 100644
--- a/bot/resources/evergreen/starter.yaml
+++ b/bot/resources/utilities/starter.yaml
diff --git a/bot/utils/extensions.py b/bot/utils/extensions.py
index cbb8f15e..09192ae2 100644
--- a/bot/utils/extensions.py
+++ b/bot/utils/extensions.py
@@ -36,7 +36,7 @@ def walk_extensions() -> Iterator[str]:
 
 async def invoke_help_command(ctx: Context) -> None:
     """Invoke the help command or default help command if help extensions is not loaded."""
-    if "bot.exts.evergreen.help" in ctx.bot.extensions:
+    if "bot.exts.core.help" in ctx.bot.extensions:
         help_command = ctx.bot.get_command("help")
         await ctx.invoke(help_command, ctx.command.qualified_name)
         return
diff --git a/bot/utils/halloween/spookifications.py b/bot/utils/halloween/spookifications.py
index f69dd6fd..93c5ddb9 100644
--- a/bot/utils/halloween/spookifications.py
+++ b/bot/utils/halloween/spookifications.py
@@ -22,7 +22,7 @@ def pentagram(im: Image) -> Image:
     """Adds pentagram to the image."""
     im = im.convert("RGB")
     wt, ht = im.size
-    penta = Image.open("bot/resources/halloween/bloody-pentagram.png")
+    penta = Image.open("bot/resources/holidays/halloween/bloody-pentagram.png")
     penta = penta.resize((wt, ht))
     im.paste(penta, (0, 0), penta)
     return im
@@ -37,7 +37,7 @@ def bat(im: Image) -> Image:
     """
     im = im.convert("RGB")
     wt, ht = im.size
-    bat = Image.open("bot/resources/halloween/bat-clipart.png")
+    bat = Image.open("bot/resources/holidays/halloween/bat-clipart.png")
     bat_size = randint(wt//10, wt//7)
     rot = randint(0, 90)
     bat = bat.resize((bat_size, bat_size))