Move extensions into sub-directories

60 files changed, 23 insertions, 23 deletions

diff --git a/bot/cogs/alias.py b/bot/cogs/alias.py
index 55c7efe65..3c5a35c24 100644
--- a/bot/cogs/alias.py
+++ b/bot/cogs/alias.py
@@ -8,7 +8,7 @@ from discord.ext.commands import (
 )
 
 from bot.bot import Bot
-from bot.cogs.extensions import Extension
+from bot.cogs.utils.extensions import Extension
 from bot.converters import FetchedMember, TagNameConverter
 from bot.pagination import LinePaginator
 
diff --git a/bot/cogs/backend/__init__.py b/bot/cogs/backend/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/bot/cogs/backend/__init__.py
diff --git a/bot/cogs/config_verifier.py b/bot/cogs/backend/config_verifier.py
index d72c6c22e..d72c6c22e 100644
--- a/bot/cogs/config_verifier.py
+++ b/bot/cogs/backend/config_verifier.py
diff --git a/bot/cogs/error_handler.py b/bot/cogs/backend/error_handler.py
index f9d4de638..f9d4de638 100644
--- a/bot/cogs/error_handler.py
+++ b/bot/cogs/backend/error_handler.py
diff --git a/bot/cogs/logging.py b/bot/cogs/backend/logging.py
index 94fa2b139..94fa2b139 100644
--- a/bot/cogs/logging.py
+++ b/bot/cogs/backend/logging.py
diff --git a/bot/cogs/sync/__init__.py b/bot/cogs/backend/sync/__init__.py
index fe7df4e9b..fe7df4e9b 100644
--- a/bot/cogs/sync/__init__.py
+++ b/bot/cogs/backend/sync/__init__.py
diff --git a/bot/cogs/sync/cog.py b/bot/cogs/backend/sync/cog.py
index 5ace957e7..274845a50 100644
--- a/bot/cogs/sync/cog.py
+++ b/bot/cogs/backend/sync/cog.py
@@ -8,7 +8,7 @@ from discord.ext.commands import Cog, Context
 from bot import constants
 from bot.api import ResponseCodeError
 from bot.bot import Bot
-from bot.cogs.sync import syncers
+from . import syncers
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/cogs/sync/syncers.py b/bot/cogs/backend/sync/syncers.py
index f7ba811bc..f7ba811bc 100644
--- a/bot/cogs/sync/syncers.py
+++ b/bot/cogs/backend/sync/syncers.py
diff --git a/bot/cogs/filters/__init__.py b/bot/cogs/filters/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/bot/cogs/filters/__init__.py
diff --git a/bot/cogs/antimalware.py b/bot/cogs/filters/antimalware.py
index c76bd2c60..c76bd2c60 100644
--- a/bot/cogs/antimalware.py
+++ b/bot/cogs/filters/antimalware.py
diff --git a/bot/cogs/antispam.py b/bot/cogs/filters/antispam.py
index 0bcca578d..0bcca578d 100644
--- a/bot/cogs/antispam.py
+++ b/bot/cogs/filters/antispam.py
diff --git a/bot/cogs/filter_lists.py b/bot/cogs/filters/filter_lists.py
index c15adc461..c15adc461 100644
--- a/bot/cogs/filter_lists.py
+++ b/bot/cogs/filters/filter_lists.py
diff --git a/bot/cogs/filtering.py b/bot/cogs/filters/filtering.py
index 93cc1c655..93cc1c655 100644
--- a/bot/cogs/filtering.py
+++ b/bot/cogs/filters/filtering.py
diff --git a/bot/cogs/security.py b/bot/cogs/filters/security.py
index c680c5e27..c680c5e27 100644
--- a/bot/cogs/security.py
+++ b/bot/cogs/filters/security.py
diff --git a/bot/cogs/token_remover.py b/bot/cogs/filters/token_remover.py
index ef979f222..ef979f222 100644
--- a/bot/cogs/token_remover.py
+++ b/bot/cogs/filters/token_remover.py
diff --git a/bot/cogs/webhook_remover.py b/bot/cogs/filters/webhook_remover.py
index 5812da87c..5812da87c 100644
--- a/bot/cogs/webhook_remover.py
+++ b/bot/cogs/filters/webhook_remover.py
diff --git a/bot/cogs/info/__init__.py b/bot/cogs/info/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/bot/cogs/info/__init__.py
diff --git a/bot/cogs/doc.py b/bot/cogs/info/doc.py
index 204cffb37..204cffb37 100644
--- a/bot/cogs/doc.py
+++ b/bot/cogs/info/doc.py
diff --git a/bot/cogs/help.py b/bot/cogs/info/help.py
index 3d1d6fd10..3d1d6fd10 100644
--- a/bot/cogs/help.py
+++ b/bot/cogs/info/help.py
diff --git a/bot/cogs/information.py b/bot/cogs/info/information.py
index 8982196d1..8982196d1 100644
--- a/bot/cogs/information.py
+++ b/bot/cogs/info/information.py
diff --git a/bot/cogs/python_news.py b/bot/cogs/info/python_news.py
index 0ab5738a4..0ab5738a4 100644
--- a/bot/cogs/python_news.py
+++ b/bot/cogs/info/python_news.py
diff --git a/bot/cogs/reddit.py b/bot/cogs/info/reddit.py
index d853ab2ea..d853ab2ea 100644
--- a/bot/cogs/reddit.py
+++ b/bot/cogs/info/reddit.py
diff --git a/bot/cogs/site.py b/bot/cogs/info/site.py
index ac29daa1d..ac29daa1d 100644
--- a/bot/cogs/site.py
+++ b/bot/cogs/info/site.py
diff --git a/bot/cogs/source.py b/bot/cogs/info/source.py
index 205e0ba81..205e0ba81 100644
--- a/bot/cogs/source.py
+++ b/bot/cogs/info/source.py
diff --git a/bot/cogs/stats.py b/bot/cogs/info/stats.py
index d42f55466..d42f55466 100644
--- a/bot/cogs/stats.py
+++ b/bot/cogs/info/stats.py
diff --git a/bot/cogs/tags.py b/bot/cogs/info/tags.py
index 3d76c5c08..3d76c5c08 100644
--- a/bot/cogs/tags.py
+++ b/bot/cogs/info/tags.py
diff --git a/bot/cogs/wolfram.py b/bot/cogs/info/wolfram.py
index e6cae3bb8..e6cae3bb8 100644
--- a/bot/cogs/wolfram.py
+++ b/bot/cogs/info/wolfram.py
diff --git a/bot/cogs/moderation/__init__.py b/bot/cogs/moderation/__init__.py
index 995187ef0..aad1f3c26 100644
--- a/bot/cogs/moderation/__init__.py
+++ b/bot/cogs/moderation/__init__.py
@@ -1,11 +1,11 @@
 from bot.bot import Bot
 from .incidents import Incidents
-from .infractions import Infractions
-from .management import ModManagement
+from .infraction.infractions import Infractions
+from .infraction.management import ModManagement
+from .infraction.superstarify import Superstarify
 from .modlog import ModLog
 from .silence import Silence
 from .slowmode import Slowmode
-from .superstarify import Superstarify
 
 
 def setup(bot: Bot) -> None:
diff --git a/bot/cogs/defcon.py b/bot/cogs/moderation/defcon.py
index 4c0ad5914..4c0ad5914 100644
--- a/bot/cogs/defcon.py
+++ b/bot/cogs/moderation/defcon.py
diff --git a/bot/cogs/moderation/infraction/__init__.py b/bot/cogs/moderation/infraction/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/bot/cogs/moderation/infraction/__init__.py
diff --git a/bot/cogs/moderation/infractions.py b/bot/cogs/moderation/infraction/infractions.py
index 8df642428..8df642428 100644
--- a/bot/cogs/moderation/infractions.py
+++ b/bot/cogs/moderation/infraction/infractions.py
diff --git a/bot/cogs/moderation/management.py b/bot/cogs/moderation/infraction/management.py
index 672bb0e9c..791585b6e 100644
--- a/bot/cogs/moderation/management.py
+++ b/bot/cogs/moderation/infraction/management.py
@@ -9,13 +9,13 @@ from discord.ext.commands import Context
 
 from bot import constants
 from bot.bot import Bot
+from bot.cogs.moderation.modlog import ModLog
 from bot.converters import Expiry, InfractionSearchQuery, allowed_strings, proxy_user
 from bot.pagination import LinePaginator
 from bot.utils import time
 from bot.utils.checks import in_whitelist_check, with_role_check
 from . import utils
 from .infractions import Infractions
-from .modlog import ModLog
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/cogs/moderation/scheduler.py b/bot/cogs/moderation/infraction/scheduler.py
index 75028d851..b3d27fe76 100644
--- a/bot/cogs/moderation/scheduler.py
+++ b/bot/cogs/moderation/infraction/scheduler.py
@@ -12,11 +12,11 @@ from discord.ext.commands import Context
 from bot import constants
 from bot.api import ResponseCodeError
 from bot.bot import Bot
+from bot.cogs.moderation.modlog import ModLog
 from bot.constants import Colours, STAFF_CHANNELS
 from bot.utils import time
 from bot.utils.scheduling import Scheduler
 from . import utils
-from .modlog import ModLog
 from .utils import UserSnowflake
 
 log = logging.getLogger(__name__)
diff --git a/bot/cogs/moderation/superstarify.py b/bot/cogs/moderation/infraction/superstarify.py
index 867de815a..867de815a 100644
--- a/bot/cogs/moderation/superstarify.py
+++ b/bot/cogs/moderation/infraction/superstarify.py
diff --git a/bot/cogs/moderation/utils.py b/bot/cogs/moderation/infraction/utils.py
index fb55287b6..fb55287b6 100644
--- a/bot/cogs/moderation/utils.py
+++ b/bot/cogs/moderation/infraction/utils.py
diff --git a/bot/cogs/verification.py b/bot/cogs/moderation/verification.py
index ae156cf70..ae156cf70 100644
--- a/bot/cogs/verification.py
+++ b/bot/cogs/moderation/verification.py
diff --git a/bot/cogs/watchchannels/__init__.py b/bot/cogs/moderation/watchchannels/__init__.py
index 69d118df6..69d118df6 100644
--- a/bot/cogs/watchchannels/__init__.py
+++ b/bot/cogs/moderation/watchchannels/__init__.py
diff --git a/bot/cogs/watchchannels/bigbrother.py b/bot/cogs/moderation/watchchannels/bigbrother.py
index 4d27a6333..0c72e88f7 100644
--- a/bot/cogs/watchchannels/bigbrother.py
+++ b/bot/cogs/moderation/watchchannels/bigbrother.py
@@ -5,7 +5,7 @@ from collections import ChainMap
 from discord.ext.commands import Cog, Context, group
 
 from bot.bot import Bot
-from bot.cogs.moderation.utils import post_infraction
+from bot.cogs.moderation.infraction.utils import post_infraction
 from bot.constants import Channels, MODERATION_ROLES, Webhooks
 from bot.converters import FetchedMember
 from bot.decorators import with_role
diff --git a/bot/cogs/watchchannels/talentpool.py b/bot/cogs/moderation/watchchannels/talentpool.py
index 89256e92e..89256e92e 100644
--- a/bot/cogs/watchchannels/talentpool.py
+++ b/bot/cogs/moderation/watchchannels/talentpool.py
diff --git a/bot/cogs/watchchannels/watchchannel.py b/bot/cogs/moderation/watchchannels/watchchannel.py
index 044077350..044077350 100644
--- a/bot/cogs/watchchannels/watchchannel.py
+++ b/bot/cogs/moderation/watchchannels/watchchannel.py
diff --git a/bot/cogs/utils/__init__.py b/bot/cogs/utils/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/bot/cogs/utils/__init__.py
diff --git a/bot/cogs/bot.py b/bot/cogs/utils/bot.py
index 79510739c..71ed54f60 100644
--- a/bot/cogs/bot.py
+++ b/bot/cogs/utils/bot.py
@@ -8,7 +8,7 @@ from discord import Embed, Message, RawMessageUpdateEvent, TextChannel
 from discord.ext.commands import Cog, Context, command, group
 
 from bot.bot import Bot
-from bot.cogs.token_remover import TokenRemover
+from bot.cogs.filters.token_remover import TokenRemover
 from bot.constants import Categories, Channels, DEBUG_MODE, Guild, MODERATION_ROLES, Roles, URLs
 from bot.decorators import with_role
 from bot.utils.messages import wait_for_deletion
diff --git a/bot/cogs/clean.py b/bot/cogs/utils/clean.py
index f436e531a..f436e531a 100644
--- a/bot/cogs/clean.py
+++ b/bot/cogs/utils/clean.py
diff --git a/bot/cogs/eval.py b/bot/cogs/utils/eval.py
index eb8bfb1cf..eb8bfb1cf 100644
--- a/bot/cogs/eval.py
+++ b/bot/cogs/utils/eval.py
diff --git a/bot/cogs/extensions.py b/bot/cogs/utils/extensions.py
index 365f198ff..365f198ff 100644
--- a/bot/cogs/extensions.py
+++ b/bot/cogs/utils/extensions.py
diff --git a/bot/cogs/jams.py b/bot/cogs/utils/jams.py
index b3102db2f..b3102db2f 100644
--- a/bot/cogs/jams.py
+++ b/bot/cogs/utils/jams.py
diff --git a/bot/cogs/reminders.py b/bot/cogs/utils/reminders.py
index 670493bcf..670493bcf 100644
--- a/bot/cogs/reminders.py
+++ b/bot/cogs/utils/reminders.py
diff --git a/bot/cogs/snekbox.py b/bot/cogs/utils/snekbox.py
index 52c8b6f88..52c8b6f88 100644
--- a/bot/cogs/snekbox.py
+++ b/bot/cogs/utils/snekbox.py
diff --git a/bot/cogs/utils.py b/bot/cogs/utils/utils.py
index d96abbd5a..d96abbd5a 100644
--- a/bot/cogs/utils.py
+++ b/bot/cogs/utils/utils.py
diff --git a/tests/bot/cogs/moderation/test_infractions.py b/tests/bot/cogs/moderation/test_infractions.py
index da4e92ccc..df38090fb 100644
--- a/tests/bot/cogs/moderation/test_infractions.py
+++ b/tests/bot/cogs/moderation/test_infractions.py
@@ -2,7 +2,7 @@ import textwrap
 import unittest
 from unittest.mock import AsyncMock, Mock, patch
 
-from bot.cogs.moderation.infractions import Infractions
+from bot.cogs.moderation.infraction.infractions import Infractions
 from tests.helpers import MockBot, MockContext, MockGuild, MockMember, MockRole
 
 
diff --git a/tests/bot/cogs/sync/test_base.py b/tests/bot/cogs/sync/test_base.py
index 70aea2bab..84d036405 100644
--- a/tests/bot/cogs/sync/test_base.py
+++ b/tests/bot/cogs/sync/test_base.py
@@ -6,7 +6,7 @@ import discord
 
 from bot import constants
 from bot.api import ResponseCodeError
-from bot.cogs.sync.syncers import Syncer, _Diff
+from bot.cogs.backend.sync import Syncer, _Diff
 from tests import helpers
 
 
diff --git a/tests/bot/cogs/sync/test_cog.py b/tests/bot/cogs/sync/test_cog.py
index 120bc991d..ea7d090ba 100644
--- a/tests/bot/cogs/sync/test_cog.py
+++ b/tests/bot/cogs/sync/test_cog.py
@@ -5,8 +5,8 @@ import discord
 
 from bot import constants
 from bot.api import ResponseCodeError
-from bot.cogs import sync
-from bot.cogs.sync.syncers import Syncer
+from bot.cogs.backend import sync
+from bot.cogs.backend.sync import Syncer
 from tests import helpers
 from tests.base import CommandTestCase
 
diff --git a/tests/bot/cogs/sync/test_roles.py b/tests/bot/cogs/sync/test_roles.py
index 79eee98f4..888c49ca8 100644
--- a/tests/bot/cogs/sync/test_roles.py
+++ b/tests/bot/cogs/sync/test_roles.py
@@ -3,7 +3,7 @@ from unittest import mock
 
 import discord
 
-from bot.cogs.sync.syncers import RoleSyncer, _Diff, _Role
+from bot.cogs.backend.sync import RoleSyncer, _Diff, _Role
 from tests import helpers
 
 
diff --git a/tests/bot/cogs/sync/test_users.py b/tests/bot/cogs/sync/test_users.py
index 002a947ad..71f4b134c 100644
--- a/tests/bot/cogs/sync/test_users.py
+++ b/tests/bot/cogs/sync/test_users.py
@@ -1,7 +1,7 @@
 import unittest
 from unittest import mock
 
-from bot.cogs.sync.syncers import UserSyncer, _Diff, _User
+from bot.cogs.backend.sync import UserSyncer, _Diff, _User
 from tests import helpers
 
 
diff --git a/tests/bot/cogs/test_antimalware.py b/tests/bot/cogs/test_antimalware.py
index ecb7abf00..b00211f47 100644
--- a/tests/bot/cogs/test_antimalware.py
+++ b/tests/bot/cogs/test_antimalware.py
@@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, Mock
 
 from discord import NotFound
 
-from bot.cogs import antimalware
+from bot.cogs.filters import antimalware
 from bot.constants import Channels, STAFF_ROLES
 from tests.helpers import MockAttachment, MockBot, MockMessage, MockRole
 
diff --git a/tests/bot/cogs/test_antispam.py b/tests/bot/cogs/test_antispam.py
index ce5472c71..8a3d8d02e 100644
--- a/tests/bot/cogs/test_antispam.py
+++ b/tests/bot/cogs/test_antispam.py
@@ -1,6 +1,6 @@
 import unittest
 
-from bot.cogs import antispam
+from bot.cogs.filters import antispam
 
 
 class AntispamConfigurationValidationTests(unittest.TestCase):
diff --git a/tests/bot/cogs/test_information.py b/tests/bot/cogs/test_information.py
index 79c0e0ad3..305a2bad9 100644
--- a/tests/bot/cogs/test_information.py
+++ b/tests/bot/cogs/test_information.py
@@ -6,7 +6,7 @@ import unittest.mock
 import discord
 
 from bot import constants
-from bot.cogs import information
+from bot.cogs.info import information
 from bot.utils.checks import InWhitelistCheckFailure
 from tests import helpers
 
diff --git a/tests/bot/cogs/test_security.py b/tests/bot/cogs/test_security.py
index 9d1a62f7e..82679f69c 100644
--- a/tests/bot/cogs/test_security.py
+++ b/tests/bot/cogs/test_security.py
@@ -3,7 +3,7 @@ from unittest.mock import MagicMock
 
 from discord.ext.commands import NoPrivateMessage
 
-from bot.cogs import security
+from bot.cogs.filters import security
 from tests.helpers import MockBot, MockContext
 
 
diff --git a/tests/bot/cogs/test_snekbox.py b/tests/bot/cogs/test_snekbox.py
index 343e37db9..c7bac3ab3 100644
--- a/tests/bot/cogs/test_snekbox.py
+++ b/tests/bot/cogs/test_snekbox.py
@@ -6,8 +6,8 @@ from unittest.mock import AsyncMock, MagicMock, Mock, call, create_autospec, pat
 from discord.ext import commands
 
 from bot import constants
-from bot.cogs import snekbox
-from bot.cogs.snekbox import Snekbox
+from bot.cogs.utils import snekbox
+from bot.cogs.utils.snekbox import Snekbox
 from tests.helpers import MockBot, MockContext, MockMessage, MockReaction, MockUser
 
 
diff --git a/tests/bot/cogs/test_token_remover.py b/tests/bot/cogs/test_token_remover.py
index 3349caa73..e33f3af38 100644
--- a/tests/bot/cogs/test_token_remover.py
+++ b/tests/bot/cogs/test_token_remover.py
@@ -6,9 +6,9 @@ from unittest.mock import MagicMock
 from discord import Colour, NotFound
 
 from bot import constants
-from bot.cogs import token_remover
+from bot.cogs.filters import token_remover
+from bot.cogs.filters.token_remover import Token, TokenRemover
 from bot.cogs.moderation import ModLog
-from bot.cogs.token_remover import Token, TokenRemover
 from tests.helpers import MockBot, MockMessage, autospec