Removed unneeded NadekoSubmodule and NadekoSubmodule<T> classes

src/NadekoBot/Common/NadekoModule.cs

@@ -134,12 +134,4 @@ public abstract class NadekoModule : ModuleBase
 public abstract class NadekoModule<TService> : NadekoModule
 {
     public TService _service { get; set; }
-}
-
-public abstract class NadekoSubmodule : NadekoModule
-{
-}
-
-public abstract class NadekoSubmodule<TService> : NadekoModule<TService>
-{
 }

src/NadekoBot/Common/OldCreds.cs

@@ -1,4 +1,5 @@
-namespace NadekoBot.Common;
+#nullable disable
+namespace NadekoBot.Common;
 
 public class OldCreds
 {

src/NadekoBot/Modules/Administration/AutoAssignableRoles/AutoAssignRoleCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class AutoAssignRoleCommands : NadekoSubmodule<AutoAssignRoleService>
+    public partial class AutoAssignRoleCommands : NadekoModule<AutoAssignRoleService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Administration/DangerousCommands/DangerousCommands.cs

@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Administration
     {
         [Group]
         [OwnerOnly]
-        public partial class DangerousCommands : NadekoSubmodule<DangerousCommandsService>
+        public partial class DangerousCommands : NadekoModule<DangerousCommandsService>
         {
             private async Task InternalExecSql(string sql, params object[] reps)
             {

src/NadekoBot/Modules/Administration/GameVoiceChannel/GameVoiceChannelCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class GameVoiceChannelCommands : NadekoSubmodule<GameVoiceChannelService>
+    public partial class GameVoiceChannelCommands : NadekoModule<GameVoiceChannelService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Administration/GreetBye/GreetCommands.cs

@@ -3,7 +3,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class GreetCommands : NadekoSubmodule<GreetService>
+    public partial class GreetCommands : NadekoModule<GreetService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Administration/LocalizationCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class LocalizationCommands : NadekoSubmodule
+    public partial class LocalizationCommands : NadekoModule
     {
         private static readonly IReadOnlyDictionary<string, string> _supportedLocales = new Dictionary<string, string>
         {

src/NadekoBot/Modules/Administration/Mute/MuteCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class MuteCommands : NadekoSubmodule<MuteService>
+    public partial class MuteCommands : NadekoModule<MuteService>
     {
         private async Task<bool> VerifyMutePermissions(IGuildUser runnerUser, IGuildUser targetUser)
         {

src/NadekoBot/Modules/Administration/PermOverrides/DiscordPermOverrideCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class DiscordPermOverrideCommands : NadekoSubmodule<DiscordPermOverrideService>
+    public partial class DiscordPermOverrideCommands : NadekoModule<DiscordPermOverrideService>
     {
         // override stats, it should require that the user has managessages guild permission
         // .po 'stats' add user guild managemessages

src/NadekoBot/Modules/Administration/PlayingRotate/PlayingRotateCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class PlayingRotateCommands : NadekoSubmodule<PlayingRotateService>
+    public partial class PlayingRotateCommands : NadekoModule<PlayingRotateService>
     {
         [Cmd]
         [OwnerOnly]

src/NadekoBot/Modules/Administration/Prefix/PrefixCommands.cs

@@ -4,7 +4,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class PrefixCommands : NadekoSubmodule
+    public partial class PrefixCommands : NadekoModule
     {
         public enum Set
         {

src/NadekoBot/Modules/Administration/Protection/ProtectionCommands.cs

@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class ProtectionCommands : NadekoSubmodule<ProtectionService>
+    public partial class ProtectionCommands : NadekoModule<ProtectionService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Administration/Prune/PruneCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class PruneCommands : NadekoSubmodule<PruneService>
+    public partial class PruneCommands : NadekoModule<PruneService>
     {
         private static readonly TimeSpan _twoWeeks = TimeSpan.FromDays(14);
 

src/NadekoBot/Modules/Administration/Role/RoleCommands.cs

@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Administration;
 
 public partial class Administration
 {
-    public partial class RoleCommands : NadekoSubmodule<RoleCommandsService>
+    public partial class RoleCommands : NadekoModule<RoleCommandsService>
     {
         public enum Exclude { Excl }
 

src/NadekoBot/Modules/Administration/Self/SelfCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class SelfCommands : NadekoSubmodule<SelfService>
+    public partial class SelfCommands : NadekoModule<SelfService>
     {
         public enum SettableUserStatus
         {

src/NadekoBot/Modules/Administration/SelfAssignableRoles/SelfAssignedRolesCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class SelfAssignedRolesCommands : NadekoSubmodule<SelfAssignedRolesService>
+    public partial class SelfAssignedRolesCommands : NadekoModule<SelfAssignedRolesService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommands.cs

@@ -7,7 +7,7 @@ public partial class Administration
 {
     [Group]
     [NoPublicBot]
-    public partial class LogCommands : NadekoSubmodule<ILogCommandService>
+    public partial class LogCommands : NadekoModule<ILogCommandService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Administration/Timezone/TimeZoneCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class TimeZoneCommands : NadekoSubmodule<GuildTimezoneService>
+    public partial class TimeZoneCommands : NadekoModule<GuildTimezoneService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Administration/UserPunish/UserPunishCommands.cs

@@ -11,7 +11,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class UserPunishCommands : NadekoSubmodule<UserPunishService>
+    public partial class UserPunishCommands : NadekoModule<UserPunishService>
     {
         public enum AddRole
         {

src/NadekoBot/Modules/Administration/VcRole/VcRoleCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Administration;
 public partial class Administration
 {
     [Group]
-    public partial class VcRoleCommands : NadekoSubmodule<VcRoleService>
+    public partial class VcRoleCommands : NadekoModule<VcRoleService>
     {
         [Cmd]
         [UserPerm(GuildPerm.ManageRoles)]

src/NadekoBot/Modules/Gambling/DiceRoll/DiceRollCommands.cs

@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class DiceRollCommands : NadekoSubmodule
+    public partial class DiceRollCommands : NadekoModule
     {
         private static readonly Regex _dndRegex = new(@"^(?<n1>\d+)d(?<n2>\d+)(?:\+(?<add>\d+))?(?:\-(?<sub>\d+))?$",
             RegexOptions.Compiled);

src/NadekoBot/Modules/Gambling/Draw/DrawCommands.cs

@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Gambling;
 public partial class Gambling
 {
     [Group]
-    public partial class DrawCommands : NadekoSubmodule
+    public partial class DrawCommands : NadekoModule
     {
         private static readonly ConcurrentDictionary<IGuild, Deck> _allDecks = new();
         private readonly IImageCache _images;

src/NadekoBot/Modules/Games/Acrophobia/AcropobiaCommands.cs

@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class AcropobiaCommands : NadekoSubmodule<GamesService>
+    public partial class AcropobiaCommands : NadekoModule<GamesService>
     {
         private readonly DiscordSocketClient _client;
 

src/NadekoBot/Modules/Games/ChatterBot/CleverBotCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class ChatterBotCommands : NadekoSubmodule<ChatterBotService>
+    public partial class ChatterBotCommands : NadekoModule<ChatterBotService>
     {
         private readonly DbService _db;
 

src/NadekoBot/Modules/Games/Hangman/HangmanCommands.cs

@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class HangmanCommands : NadekoSubmodule<IHangmanService>
+    public partial class HangmanCommands : NadekoModule<IHangmanService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Games/Nunchi/NunchiCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class NunchiCommands : NadekoSubmodule<GamesService>
+    public partial class NunchiCommands : NadekoModule<GamesService>
     {
         private readonly DiscordSocketClient _client;
 

src/NadekoBot/Modules/Games/Polls/PollCommands.cs

@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class PollCommands : NadekoSubmodule<PollService>
+    public partial class PollCommands : NadekoModule<PollService>
     {
         private readonly DiscordSocketClient _client;
 

src/NadekoBot/Modules/Games/SpeedTyping/SpeedTypingCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class SpeedTypingCommands : NadekoSubmodule<GamesService>
+    public partial class SpeedTypingCommands : NadekoModule<GamesService>
     {
         private readonly GamesService _games;
         private readonly DiscordSocketClient _client;

src/NadekoBot/Modules/Games/TicTacToe/TicTacToeCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class TicTacToeCommands : NadekoSubmodule<GamesService>
+    public partial class TicTacToeCommands : NadekoModule<GamesService>
     {
         private readonly SemaphoreSlim _sem = new(1, 1);
         private readonly DiscordSocketClient _client;

src/NadekoBot/Modules/Games/Trivia/TriviaCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Games;
 public partial class Games
 {
     [Group]
-    public partial class TriviaCommands : NadekoSubmodule<GamesService>
+    public partial class TriviaCommands : NadekoModule<GamesService>
     {
         private readonly IDataCache _cache;
         private readonly ICurrencyService _cs;

src/NadekoBot/Modules/Permissions/Blacklist/BlacklistCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class BlacklistCommands : NadekoSubmodule<BlacklistService>
+    public partial class BlacklistCommands : NadekoModule<BlacklistService>
     {
         private readonly DiscordSocketClient _client;
 

src/NadekoBot/Modules/Permissions/CommandCooldown/CmdCdsCommands.cs

@@ -10,7 +10,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class CmdCdsCommands : NadekoSubmodule
+    public partial class CmdCdsCommands : NadekoModule
     {
         private ConcurrentDictionary<ulong, ConcurrentHashSet<CommandCooldown>> CommandCooldowns
             => _service.CommandCooldowns;

src/NadekoBot/Modules/Permissions/Filter/FilterCommands.cs

@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class FilterCommands : NadekoSubmodule<FilterService>
+    public partial class FilterCommands : NadekoModule<FilterService>
     {
         private readonly DbService _db;
 

src/NadekoBot/Modules/Permissions/GlobalPermissions/GlobalPermissionCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class GlobalPermissionCommands : NadekoSubmodule
+    public partial class GlobalPermissionCommands : NadekoModule
     {
         private readonly GlobalPermissionService _service;
         private readonly DbService _db;

src/NadekoBot/Modules/Permissions/ResetPermissionsCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Permissions;
 public partial class Permissions
 {
     [Group]
-    public partial class ResetPermissionsCommands : NadekoSubmodule
+    public partial class ResetPermissionsCommands : NadekoModule
     {
         private readonly GlobalPermissionService _gps;
         private readonly PermissionService _perms;

src/NadekoBot/Modules/Searches/Anime/AnimeSearchCommands.cs

@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class AnimeSearchCommands : NadekoSubmodule<AnimeSearchService>
+    public partial class AnimeSearchCommands : NadekoModule<AnimeSearchService>
     {
         // [NadekoCommand, Aliases]
         // public async Task Novel([Leftover] string query)

src/NadekoBot/Modules/Searches/Crypto/CryptoCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Searches;
 
 public partial class Searches
 {
-    public partial class FinanceCommands : NadekoSubmodule<CryptoService>
+    public partial class FinanceCommands : NadekoModule<CryptoService>
     {
         private readonly IStockDataService _stocksService;
         private readonly IStockChartDrawingService _stockDrawingService;

src/NadekoBot/Modules/Searches/Feeds/FeedCommands.cs

@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class FeedCommands : NadekoSubmodule<FeedsService>
+    public partial class FeedCommands : NadekoModule<FeedsService>
     {
         private static readonly Regex _ytChannelRegex =
             new(@"youtube\.com\/(?:c\/|channel\/|user\/)?(?<channelid>[a-zA-Z0-9\-]{1,})");

src/NadekoBot/Modules/Searches/JokeCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class JokeCommands : NadekoSubmodule<SearchesService>
+    public partial class JokeCommands : NadekoModule<SearchesService>
     {
         [Cmd]
         public async partial Task Yomama()

src/NadekoBot/Modules/Searches/MemegenCommands.cs

@@ -8,7 +8,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class MemegenCommands : NadekoSubmodule
+    public partial class MemegenCommands : NadekoModule
     {
         private static readonly ImmutableDictionary<char, string> _map = new Dictionary<char, string>
         {

src/NadekoBot/Modules/Searches/OsuCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class OsuCommands : NadekoSubmodule
+    public partial class OsuCommands : NadekoModule
     {
         private readonly IBotCredentials _creds;
         private readonly IHttpClientFactory _httpFactory;

src/NadekoBot/Modules/Searches/PathOfExileCommands.cs

@@ -12,7 +12,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class PathOfExileCommands : NadekoSubmodule<SearchesService>
+    public partial class PathOfExileCommands : NadekoModule<SearchesService>
     {
         private const string POE_URL = "https://www.pathofexile.com/character-window/get-characters?accountName=";
         private const string PON_URL = "http://poe.ninja/api/Data/GetCurrencyOverview?league=";

src/NadekoBot/Modules/Searches/PlaceCommands.cs

@@ -4,7 +4,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class PlaceCommands : NadekoSubmodule
+    public partial class PlaceCommands : NadekoModule
     {
         public enum PlaceType
         {

src/NadekoBot/Modules/Searches/PokemonSearchCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class PokemonSearchCommands : NadekoSubmodule<SearchesService>
+    public partial class PokemonSearchCommands : NadekoModule<SearchesService>
     {
         public IReadOnlyDictionary<string, SearchPokemon> Pokemons
             => _cache.LocalData.Pokemons;

src/NadekoBot/Modules/Searches/StreamNotification/StreamNotificationCommands.cs

@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class StreamNotificationCommands : NadekoSubmodule<StreamNotificationService>
+    public partial class StreamNotificationCommands : NadekoModule<StreamNotificationService>
     {
         private readonly DbService _db;
 

src/NadekoBot/Modules/Searches/Translate/TranslatorCommands.cs

@@ -4,7 +4,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class TranslateCommands : NadekoSubmodule<ITranslateService>
+    public partial class TranslateCommands : NadekoModule<ITranslateService>
     {
         public enum AutoDeleteAutoTranslate
         {

src/NadekoBot/Modules/Searches/XkcdCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     [Group]
-    public partial class XkcdCommands : NadekoSubmodule
+    public partial class XkcdCommands : NadekoModule
     {
         private const string XKCD_URL = "https://xkcd.com";
         private readonly IHttpClientFactory _httpFactory;

src/NadekoBot/Modules/Searches/YoutubeTrack/YtUploadCommands.cs

@@ -4,7 +4,7 @@ namespace NadekoBot.Modules.Searches;
 public partial class Searches
 {
     // [Group]
-    // public partial class YtTrackCommands : NadekoSubmodule<YtTrackService>
+    // public partial class YtTrackCommands : NadekoModule<YtTrackService>
     // {
     //     ;
     //     [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Utility/Calc/CalcCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class CalcCommands : NadekoSubmodule
+    public partial class CalcCommands : NadekoModule
     {
         [Cmd]
         public async partial Task Calculate([Leftover] string expression)

src/NadekoBot/Modules/Utility/CommandMap/CommandMapCommands.cs

@@ -9,7 +9,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class CommandMapCommands : NadekoSubmodule<CommandMapService>
+    public partial class CommandMapCommands : NadekoModule<CommandMapService>
     {
         private readonly DbService _db;
         private readonly DiscordSocketClient _client;

src/NadekoBot/Modules/Utility/ConfigCommands.cs

@@ -3,7 +3,7 @@ namespace NadekoBot.Modules.Utility;
 
 public partial class Utility
 {
-    public partial class ConfigCommands : NadekoSubmodule
+    public partial class ConfigCommands : NadekoModule
     {
         private readonly IEnumerable<IConfigService> _settingServices;
 

src/NadekoBot/Modules/Utility/Info/InfoCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class InfoCommands : NadekoSubmodule
+    public partial class InfoCommands : NadekoModule
     {
         private readonly DiscordSocketClient _client;
         private readonly IStatsService _stats;

src/NadekoBot/Modules/Utility/Info/InviteCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class InviteCommands : NadekoSubmodule<InviteService>
+    public partial class InviteCommands : NadekoModule<InviteService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Utility/Quote/QuoteCommands.cs

@@ -10,7 +10,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class QuoteCommands : NadekoSubmodule
+    public partial class QuoteCommands : NadekoModule
     {
         private const string PREPEND_EXPORT =
             @"# Keys are keywords, Each key has a LIST of quotes in the following format:

src/NadekoBot/Modules/Utility/Remind/RemindCommands.cs

@@ -10,7 +10,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class RemindCommands : NadekoSubmodule<RemindService>
+    public partial class RemindCommands : NadekoModule<RemindService>
     {
         public enum MeOrHere
         {

src/NadekoBot/Modules/Utility/Repeater/RepeatCommands.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class RepeatCommands : NadekoSubmodule<RepeaterService>
+    public partial class RepeatCommands : NadekoModule<RepeaterService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Utility/StreamRole/StreamRoleCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 
 public partial class Utility
 {
-    public partial class StreamRoleCommands : NadekoSubmodule<StreamRoleService>
+    public partial class StreamRoleCommands : NadekoModule<StreamRoleService>
     {
         [Cmd]
         [BotPerm(GuildPerm.ManageRoles)]

src/NadekoBot/Modules/Utility/UnitConversion/UnitConversionCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class UnitConverterCommands : NadekoSubmodule<ConverterService>
+    public partial class UnitConverterCommands : NadekoModule<ConverterService>
     {
         [Cmd]
         public async partial Task ConvertList()

src/NadekoBot/Modules/Utility/VerboseErrors/VerboseErrorCommands.cs

@@ -6,7 +6,7 @@ namespace NadekoBot.Modules.Utility;
 public partial class Utility
 {
     [Group]
-    public partial class VerboseErrorCommands : NadekoSubmodule<VerboseErrorsService>
+    public partial class VerboseErrorCommands : NadekoModule<VerboseErrorsService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]

src/NadekoBot/Modules/Xp/Club/Club.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Modules.Xp;
 public partial class Xp
 {
     [Group]
-    public partial class Club : NadekoSubmodule<ClubService>
+    public partial class Club : NadekoModule<ClubService>
     {
         private readonly XpService _xps;
 

src/NadekoBot/Modules/Xp/ResetCommands.cs

@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Xp;
 
 public partial class Xp
 {
-    public partial class ResetCommands : NadekoSubmodule<XpService>
+    public partial class ResetCommands : NadekoModule<XpService>
     {
         [Cmd]
         [RequireContext(ContextType.Guild)]