diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs
similarity index 97%
rename from src/NadekoBot/Modules/CustomReactions/CustomReactions.cs
rename to src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs
index c7f0f8827..9ace7bf7b 100644
--- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs
+++ b/src/NadekoBot/Modules/CustomReactions/NadekoExpressions.cs
@@ -2,7 +2,7 @@
 
 namespace NadekoBot.Modules.CustomReactions;
 
-public partial class CustomReactions : NadekoModule<CustomReactionsService>
+public partial class NadekoExpressions : NadekoModule<CustomReactionsService>
 {
     public enum All
     {
@@ -12,7 +12,7 @@ public partial class CustomReactions : NadekoModule<CustomReactionsService>
     private readonly IBotCredentials _creds;
     private readonly IHttpClientFactory _clientFactory;
 
-    public CustomReactions(IBotCredentials creds, IHttpClientFactory clientFactory)
+    public NadekoExpressions(IBotCredentials creds, IHttpClientFactory clientFactory)
     {
         _creds = creds;
         _clientFactory = clientFactory;
@@ -25,7 +25,6 @@ public partial class CustomReactions : NadekoModule<CustomReactionsService>
     [Cmd]
     public async partial Task AddCustReact(string key, [Leftover] string message)
     {
-        var channel = ctx.Channel as ITextChannel;
         if (string.IsNullOrWhiteSpace(message) || string.IsNullOrWhiteSpace(key))
             return;
 
@@ -231,7 +230,6 @@ public partial class CustomReactions : NadekoModule<CustomReactionsService>
 
     private async Task InternalCrEdit(kwum id, CustomReactionsService.CrField option)
     {
-        var cr = _service.GetCustomReaction(ctx.Guild?.Id, id);
         if (!AdminInGuildOrOwnerInDm())
         {
             await ReplyErrorLocalizedAsync(strs.insuff_perms);
diff --git a/src/NadekoBot/Modules/Gambling/VoteRewardService.cs b/src/NadekoBot/Modules/Gambling/VoteRewardService.cs
index 96f6bb4e9..936cfce30 100644
--- a/src/NadekoBot/Modules/Gambling/VoteRewardService.cs
+++ b/src/NadekoBot/Modules/Gambling/VoteRewardService.cs
@@ -71,7 +71,7 @@ public class VoteRewardService : INService, IReadyExecutor
             }
             catch (Exception ex)
             {
-                Log.Error(ex, "Critical error loading top.gg vote rewards.");
+                Log.Error(ex, "Critical error loading top.gg vote rewards");
             }
 
             var discordsKey = _creds.Votes?.DiscordsKey;
diff --git a/src/NadekoBot/Modules/Permissions/_Common/PermissionCache.cs b/src/NadekoBot/Modules/Permissions/PermissionCache.cs
similarity index 100%
rename from src/NadekoBot/Modules/Permissions/_Common/PermissionCache.cs
rename to src/NadekoBot/Modules/Permissions/PermissionCache.cs
diff --git a/src/NadekoBot/Modules/Permissions/_Common/PermissionExtensions.cs b/src/NadekoBot/Modules/Permissions/PermissionExtensions.cs
similarity index 100%
rename from src/NadekoBot/Modules/Permissions/_Common/PermissionExtensions.cs
rename to src/NadekoBot/Modules/Permissions/PermissionExtensions.cs
diff --git a/src/NadekoBot/Modules/Permissions/_Common/PermissionsCollection.cs b/src/NadekoBot/Modules/Permissions/PermissionsCollection.cs
similarity index 100%
rename from src/NadekoBot/Modules/Permissions/_Common/PermissionsCollection.cs
rename to src/NadekoBot/Modules/Permissions/PermissionsCollection.cs
diff --git a/src/NadekoBot/Modules/Searches/PathOfExileCommands.cs b/src/NadekoBot/Modules/Searches/PathOfExileCommands.cs
index 1684c4be1..9058eabc8 100644
--- a/src/NadekoBot/Modules/Searches/PathOfExileCommands.cs
+++ b/src/NadekoBot/Modules/Searches/PathOfExileCommands.cs
@@ -14,17 +14,17 @@ public partial class Searches
     [Group]
     public partial class PathOfExileCommands : NadekoSubmodule<SearchesService>
     {
-        private const string _poeURL = "https://www.pathofexile.com/character-window/get-characters?accountName=";
-        private const string _ponURL = "http://poe.ninja/api/Data/GetCurrencyOverview?league=";
-        private const string _pogsURL = "http://pathofexile.gamepedia.com/api.php?action=opensearch&search=";
+        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=";
+        private const string POGS_URL = "http://pathofexile.gamepedia.com/api.php?action=opensearch&search=";
 
-        private const string _pogURL =
+        private const string POG_URL =
             "https://pathofexile.gamepedia.com/api.php?action=browsebysubject&format=json&subject=";
 
-        private const string _pogiURL =
+        private const string POGI_URL =
             "https://pathofexile.gamepedia.com/api.php?action=query&prop=imageinfo&iiprop=url&format=json&titles=File:";
 
-        private const string _profileURL = "https://www.pathofexile.com/account/view-profile/";
+        private const string PROFILE_URL = "https://www.pathofexile.com/account/view-profile/";
 
         private readonly IHttpClientFactory _httpFactory;
 
@@ -131,7 +131,7 @@ public partial class Searches
             try
             {
                 using var http = _httpFactory.CreateClient();
-                var res = await http.GetStringAsync($"{_poeURL}{usr}");
+                var res = await http.GetStringAsync($"{POE_URL}{usr}");
                 characters = JsonConvert.DeserializeObject<List<Account>>(res);
             }
             catch
@@ -150,7 +150,7 @@ public partial class Searches
                     var embed = _eb.Create()
                                    .WithAuthor($"Characters on {usr}'s account",
                                        "https://web.poecdn.com/image/favicon/ogimage.png",
-                                       $"{_profileURL}{usr}")
+                                       $"{PROFILE_URL}{usr}")
                                    .WithOkColor();
 
                     var tempList = characters.Skip(curPage * 9).Take(9).ToList();
@@ -237,7 +237,7 @@ public partial class Searches
 
             try
             {
-                var res = $"{_ponURL}{leagueName}";
+                var res = $"{PON_URL}{leagueName}";
                 using var http = _httpFactory.CreateClient();
                 var obj = JObject.Parse(await http.GetStringAsync(res));
 
diff --git a/src/NadekoBot/Modules/Utility/Services/RunningRepeater.cs b/src/NadekoBot/Modules/Utility/Repeater/RunningRepeater.cs
similarity index 100%
rename from src/NadekoBot/Modules/Utility/Services/RunningRepeater.cs
rename to src/NadekoBot/Modules/Utility/Repeater/RunningRepeater.cs
diff --git a/src/NadekoBot/Modules/Utility/Services/ConverterService.cs b/src/NadekoBot/Modules/Utility/UnitConversion/ConverterService.cs
similarity index 100%
rename from src/NadekoBot/Modules/Utility/Services/ConverterService.cs
rename to src/NadekoBot/Modules/Utility/UnitConversion/ConverterService.cs