diff --git a/src/main/java/creator/loki/core/BotInitializer.java b/src/main/java/creator/loki/core/BotInitializer.java
index ed855c2..a050a17 100644
--- a/src/main/java/creator/loki/core/BotInitializer.java
+++ b/src/main/java/creator/loki/core/BotInitializer.java
@@ -5,7 +5,7 @@ import java.util.List;
 import com.google.inject.Inject;
 import creator.loki.config.BotConfig;
 import creator.loki.core.registry.PrefixCommandRegistrar;
-import creator.loki.feature.counter.MemberCounterListener;
+import creator.loki.feature.counter.service.MemberCounterListener;
 import creator.loki.feature.metrics.HealthHttpServer;
 import creator.loki.feature.moderation.MuteScheduler;
 import creator.loki.feature.music.core.LavalinkManager;
diff --git a/src/main/java/creator/loki/core/ListenerAggregator.java b/src/main/java/creator/loki/core/ListenerAggregator.java
index f854d12..5ce334b 100644
--- a/src/main/java/creator/loki/core/ListenerAggregator.java
+++ b/src/main/java/creator/loki/core/ListenerAggregator.java
@@ -3,19 +3,19 @@ package creator.loki.core;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import creator.loki.bootstrap.ReadyListener;
-import creator.loki.feature.counter.MemberCounterListener;
+import creator.loki.feature.counter.service.MemberCounterListener;
 import creator.loki.feature.economy.FishMessageListener;
 import creator.loki.feature.help.HelpMenuHandler;
 import creator.loki.feature.leaderboard.LeaderboardButtonListener;
-import creator.loki.feature.level.MessageListener;
-import creator.loki.feature.level.ResetLevelsButtonHandler;
-import creator.loki.feature.level.VoiceTracker;
+import creator.loki.feature.level.listener.MessageListener;
+import creator.loki.feature.level.listener.ResetLevelsButtonHandler;
+import creator.loki.feature.level.service.VoiceTracker;
 import creator.loki.feature.moderation.log.ModerationLogger;
 import creator.loki.feature.music.MusicSlashCommands;
-import creator.loki.feature.voice.VoiceButtonHandler;
-import creator.loki.feature.voice.VoiceChannelListener;
-import creator.loki.feature.voice.VoiceModalHandler;
-import creator.loki.feature.voice.VoiceSyncListener;
+import creator.loki.feature.voice.handler.VoiceButtonHandler;
+import creator.loki.feature.voice.listener.VoiceChannelListener;
+import creator.loki.feature.voice.handler.VoiceModalHandler;
+import creator.loki.feature.voice.listener.VoiceSyncListener;
 import creator.loki.feature.welcome.WelcomeListener;
 
 @Singleton
diff --git a/src/main/java/creator/loki/core/ShutdownManager.java b/src/main/java/creator/loki/core/ShutdownManager.java
index 449f8d0..ef8f7ad 100644
--- a/src/main/java/creator/loki/core/ShutdownManager.java
+++ b/src/main/java/creator/loki/core/ShutdownManager.java
@@ -7,8 +7,8 @@ import com.google.inject.Singleton;
 import creator.loki.core.security.CooldownManager;
 import creator.loki.core.security.RateLimiter;
 import creator.loki.database.Database;
-import creator.loki.feature.counter.MemberCounterListener;
-import creator.loki.feature.level.VoiceTracker;
+import creator.loki.feature.counter.service.MemberCounterListener;
+import creator.loki.feature.level.service.VoiceTracker;
 import creator.loki.feature.metrics.HealthHttpServer;
 import creator.loki.feature.moderation.MuteScheduler;
 import creator.loki.feature.radio.RadioManager;
diff --git a/src/main/java/creator/loki/di/BotModule.java b/src/main/java/creator/loki/di/BotModule.java
index 7214942..7ba95aa 100644
--- a/src/main/java/creator/loki/di/BotModule.java
+++ b/src/main/java/creator/loki/di/BotModule.java
@@ -20,7 +20,7 @@ import creator.loki.feature.counter.CounterModule;
 import creator.loki.feature.economy.EconomyCommandRegistrar;
 import creator.loki.feature.economy.EconomyModule;
 import creator.loki.feature.entertainment.EntertainmentCommandRegistrar;
-import creator.loki.feature.level.LevelCommandRegistrar;
+import creator.loki.feature.level.commands.LevelCommandRegistrar;
 import creator.loki.feature.level.LevelModule;
 import creator.loki.feature.metrics.HealthHttpServer;
 import creator.loki.feature.metrics.MetricsCollector;
diff --git a/src/main/java/creator/loki/feature/counter/CounterModule.java b/src/main/java/creator/loki/feature/counter/CounterModule.java
index 368e6c6..a91ca91 100644
--- a/src/main/java/creator/loki/feature/counter/CounterModule.java
+++ b/src/main/java/creator/loki/feature/counter/CounterModule.java
@@ -6,6 +6,7 @@ import com.google.inject.Singleton;
 import creator.loki.database.Database;
 import creator.loki.feature.config.repository.ConfigRepository;
 import creator.loki.feature.counter.repository.CounterStatsRepository;
+import creator.loki.feature.counter.service.CounterManager;
 
 public class CounterModule extends AbstractModule {
 
diff --git a/src/main/java/creator/loki/feature/counter/repository/CounterStatsRepository.java b/src/main/java/creator/loki/feature/counter/repository/CounterStatsRepository.java
index 5286217..9df169b 100644
--- a/src/main/java/creator/loki/feature/counter/repository/CounterStatsRepository.java
+++ b/src/main/java/creator/loki/feature/counter/repository/CounterStatsRepository.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import creator.loki.database.Database;
-import creator.loki.feature.counter.DailyStats;
+import creator.loki.feature.counter.service.DailyStats;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/creator/loki/feature/counter/CounterConfigFormatter.java b/src/main/java/creator/loki/feature/counter/service/CounterConfigFormatter.java
similarity index 98%
rename from src/main/java/creator/loki/feature/counter/CounterConfigFormatter.java
rename to src/main/java/creator/loki/feature/counter/service/CounterConfigFormatter.java
index 23504c6..180c547 100644
--- a/src/main/java/creator/loki/feature/counter/CounterConfigFormatter.java
+++ b/src/main/java/creator/loki/feature/counter/service/CounterConfigFormatter.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.counter;
+package creator.loki.feature.counter.service;
 
 import java.awt.Color;
 
diff --git a/src/main/java/creator/loki/feature/counter/CounterManager.java b/src/main/java/creator/loki/feature/counter/service/CounterManager.java
similarity index 98%
rename from src/main/java/creator/loki/feature/counter/CounterManager.java
rename to src/main/java/creator/loki/feature/counter/service/CounterManager.java
index ea72115..db7e13b 100644
--- a/src/main/java/creator/loki/feature/counter/CounterManager.java
+++ b/src/main/java/creator/loki/feature/counter/service/CounterManager.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.counter;
+package creator.loki.feature.counter.service;
 
 import java.util.List;
 
diff --git a/src/main/java/creator/loki/feature/counter/CounterSetupPrefixCommand.java b/src/main/java/creator/loki/feature/counter/service/CounterSetupPrefixCommand.java
similarity index 98%
rename from src/main/java/creator/loki/feature/counter/CounterSetupPrefixCommand.java
rename to src/main/java/creator/loki/feature/counter/service/CounterSetupPrefixCommand.java
index 01c3bf0..2c0e07c 100644
--- a/src/main/java/creator/loki/feature/counter/CounterSetupPrefixCommand.java
+++ b/src/main/java/creator/loki/feature/counter/service/CounterSetupPrefixCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.counter;
+package creator.loki.feature.counter.service;
 
 import java.util.List;
 
diff --git a/src/main/java/creator/loki/feature/counter/DailyStats.java b/src/main/java/creator/loki/feature/counter/service/DailyStats.java
similarity index 96%
rename from src/main/java/creator/loki/feature/counter/DailyStats.java
rename to src/main/java/creator/loki/feature/counter/service/DailyStats.java
index e016355..122b652 100644
--- a/src/main/java/creator/loki/feature/counter/DailyStats.java
+++ b/src/main/java/creator/loki/feature/counter/service/DailyStats.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.counter;
+package creator.loki.feature.counter.service;
 
 import java.time.LocalDate;
 
diff --git a/src/main/java/creator/loki/feature/counter/MemberCounterListener.java b/src/main/java/creator/loki/feature/counter/service/MemberCounterListener.java
similarity index 98%
rename from src/main/java/creator/loki/feature/counter/MemberCounterListener.java
rename to src/main/java/creator/loki/feature/counter/service/MemberCounterListener.java
index 7fb9d78..a845ba6 100644
--- a/src/main/java/creator/loki/feature/counter/MemberCounterListener.java
+++ b/src/main/java/creator/loki/feature/counter/service/MemberCounterListener.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.counter;
+package creator.loki.feature.counter.service;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/src/main/java/creator/loki/feature/entertainment/EntertainmentCommandRegistrar.java b/src/main/java/creator/loki/feature/entertainment/EntertainmentCommandRegistrar.java
index c09e7f3..135e105 100644
--- a/src/main/java/creator/loki/feature/entertainment/EntertainmentCommandRegistrar.java
+++ b/src/main/java/creator/loki/feature/entertainment/EntertainmentCommandRegistrar.java
@@ -5,19 +5,19 @@ import creator.loki.config.BotConfig;
 import creator.loki.core.registry.CommandRegistrar;
 import creator.loki.core.registry.CommandRegistry;
 import creator.loki.core.security.CooldownManager;
-import creator.loki.feature.entertainment.commands.CoinCommand;
-import creator.loki.feature.entertainment.commands.DiceCommand;
-import creator.loki.feature.entertainment.commands.EightBallCommand;
+import creator.loki.feature.entertainment.commands.random.CoinCommand;
+import creator.loki.feature.entertainment.commands.random.DiceCommand;
+import creator.loki.feature.entertainment.commands.random.EightBallCommand;
 import creator.loki.feature.entertainment.commands.GlazbobaCommand;
 import creator.loki.feature.entertainment.commands.MemeCommand;
-import creator.loki.feature.entertainment.commands.RandomChoiceCommand;
-import creator.loki.feature.entertainment.commands.rating.BoykisserCommand;
-import creator.loki.feature.entertainment.commands.rating.FatCommand;
-import creator.loki.feature.entertainment.commands.rating.GayCommand;
-import creator.loki.feature.entertainment.commands.rating.IqCommand;
-import creator.loki.feature.entertainment.commands.rating.MustacheCommand;
-import creator.loki.feature.entertainment.commands.rating.PpCommand;
-import creator.loki.feature.entertainment.commands.rating.RateCommand;
+import creator.loki.feature.entertainment.commands.random.RandomChoiceCommand;
+import creator.loki.feature.rating.commands.BoykisserCommand;
+import creator.loki.feature.rating.commands.FatCommand;
+import creator.loki.feature.rating.commands.GayCommand;
+import creator.loki.feature.rating.commands.IqCommand;
+import creator.loki.feature.rating.commands.MustacheCommand;
+import creator.loki.feature.rating.commands.PpCommand;
+import creator.loki.feature.rating.commands.RateCommand;
 import creator.loki.feature.entertainment.service.RatingService;
 import creator.loki.feature.ship.ShipCommand;
 import creator.loki.feature.ship.repository.ShipPairRepository;
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/ChoiceOptionParser.java b/src/main/java/creator/loki/feature/entertainment/commands/random/ChoiceOptionParser.java
similarity index 89%
rename from src/main/java/creator/loki/feature/entertainment/commands/ChoiceOptionParser.java
rename to src/main/java/creator/loki/feature/entertainment/commands/random/ChoiceOptionParser.java
index 249abf8..81c5f03 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/ChoiceOptionParser.java
+++ b/src/main/java/creator/loki/feature/entertainment/commands/random/ChoiceOptionParser.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.entertainment.commands;
+package creator.loki.feature.entertainment.commands.random;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,7 +11,7 @@ import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 /** Разбор хвоста сообщения и строки вариантов для {@link RandomChoiceCommand}. */
-final class ChoiceOptionParser {
+final public class ChoiceOptionParser {
 
   private static final Pattern OR_SPLIT = Pattern.compile("(?i)\\s+или\\s+");
 
@@ -28,7 +28,7 @@ final class ChoiceOptionParser {
 
   private ChoiceOptionParser() {}
 
-  static String tailAfterCommand(String raw, String prefix, String commandName) {
+  public static String tailAfterCommand(String raw, String prefix, String commandName) {
     String t = raw.trim();
     if (!t.startsWith(prefix)) {
       return "";
@@ -45,7 +45,7 @@ final class ChoiceOptionParser {
     return rest.substring(sp).trim();
   }
 
-  static List<String> parseOptions(String tail) {
+ public static List<String> parseOptions(String tail) {
     String t = tail.strip();
     for (SplitRule rule : RULES) {
       if (rule.when.test(t)) {
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/CoinCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/random/CoinCommand.java
similarity index 95%
rename from src/main/java/creator/loki/feature/entertainment/commands/CoinCommand.java
rename to src/main/java/creator/loki/feature/entertainment/commands/random/CoinCommand.java
index bd986a6..8ec37df 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/CoinCommand.java
+++ b/src/main/java/creator/loki/feature/entertainment/commands/random/CoinCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.entertainment.commands;
+package creator.loki.feature.entertainment.commands.random;
 
 import java.awt.Color;
 import java.util.Random;
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/DiceCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/random/DiceCommand.java
similarity index 96%
rename from src/main/java/creator/loki/feature/entertainment/commands/DiceCommand.java
rename to src/main/java/creator/loki/feature/entertainment/commands/random/DiceCommand.java
index bbb92ee..86adfa8 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/DiceCommand.java
+++ b/src/main/java/creator/loki/feature/entertainment/commands/random/DiceCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.entertainment.commands;
+package creator.loki.feature.entertainment.commands.random;
 
 import java.awt.Color;
 import java.util.Random;
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/EightBallCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/random/EightBallCommand.java
similarity index 97%
rename from src/main/java/creator/loki/feature/entertainment/commands/EightBallCommand.java
rename to src/main/java/creator/loki/feature/entertainment/commands/random/EightBallCommand.java
index ae813d9..d4eb4c6 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/EightBallCommand.java
+++ b/src/main/java/creator/loki/feature/entertainment/commands/random/EightBallCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.entertainment.commands;
+package creator.loki.feature.entertainment.commands.random;
 
 import java.awt.Color;
 import java.util.Random;
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/RandomChoiceCommand.java b/src/main/java/creator/loki/feature/entertainment/commands/random/RandomChoiceCommand.java
similarity index 98%
rename from src/main/java/creator/loki/feature/entertainment/commands/RandomChoiceCommand.java
rename to src/main/java/creator/loki/feature/entertainment/commands/random/RandomChoiceCommand.java
index 12d412d..1e5f932 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/RandomChoiceCommand.java
+++ b/src/main/java/creator/loki/feature/entertainment/commands/random/RandomChoiceCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.entertainment.commands;
+package creator.loki.feature.entertainment.commands.random;
 
 import java.awt.Color;
 import java.util.List;
diff --git a/src/main/java/creator/loki/feature/level/LevelModule.java b/src/main/java/creator/loki/feature/level/LevelModule.java
index 4b9f414..3f8de86 100644
--- a/src/main/java/creator/loki/feature/level/LevelModule.java
+++ b/src/main/java/creator/loki/feature/level/LevelModule.java
@@ -9,9 +9,14 @@ import creator.loki.feature.config.repository.GuildConfigRepository;
 import creator.loki.feature.level.domain.XpFormula;
 import creator.loki.feature.level.repository.SqlUserStatsRepository;
 import creator.loki.feature.level.repository.UserStatsRepository;
+import creator.loki.feature.level.commands.ResetLevelsCommand;
+import creator.loki.feature.level.listener.ResetLevelsButtonHandler;
 import creator.loki.feature.level.service.LeaderboardService;
+import creator.loki.feature.level.service.LevelRoleService;
 import creator.loki.feature.level.service.LevelService;
+import creator.loki.feature.level.service.LevelUpNotifier;
 import creator.loki.feature.level.service.MessageCooldownService;
+import creator.loki.feature.level.service.VoiceTracker;
 
 public class LevelModule extends AbstractModule {
 
diff --git a/src/main/java/creator/loki/feature/level/LevelCommandRegistrar.java b/src/main/java/creator/loki/feature/level/commands/LevelCommandRegistrar.java
similarity index 87%
rename from src/main/java/creator/loki/feature/level/LevelCommandRegistrar.java
rename to src/main/java/creator/loki/feature/level/commands/LevelCommandRegistrar.java
index 3fc60f0..dea93ff 100644
--- a/src/main/java/creator/loki/feature/level/LevelCommandRegistrar.java
+++ b/src/main/java/creator/loki/feature/level/commands/LevelCommandRegistrar.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.level;
+package creator.loki.feature.level.commands;
 
 import com.google.inject.Inject;
 import creator.loki.core.registry.CommandRegistrar;
@@ -7,8 +7,9 @@ import creator.loki.feature.config.repository.ConfigRepository;
 import creator.loki.feature.leaderboard.LeaderboardCommand;
 import creator.loki.feature.level.commands.LevelRoleCommand;
 import creator.loki.feature.level.service.LeaderboardService;
-import creator.loki.feature.profile.ProfileCommand;
-import creator.loki.feature.profile.ProfileService;
+import creator.loki.feature.level.service.LevelRoleService;
+import creator.loki.feature.profile.command.ProfileCommand;
+import creator.loki.feature.profile.service.ProfileService;
 
 public class LevelCommandRegistrar implements CommandRegistrar {
   private final LeaderboardService leaderboardService;
diff --git a/src/main/java/creator/loki/feature/level/commands/LevelRoleCommand.java b/src/main/java/creator/loki/feature/level/commands/LevelRoleCommand.java
index ee5c7e1..350f9b5 100644
--- a/src/main/java/creator/loki/feature/level/commands/LevelRoleCommand.java
+++ b/src/main/java/creator/loki/feature/level/commands/LevelRoleCommand.java
@@ -7,7 +7,7 @@ import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedTemplates;
 import creator.loki.feature.config.repository.ConfigRepository;
-import creator.loki.feature.level.LevelRoleService;
+import creator.loki.feature.level.service.LevelRoleService;
 import net.dv8tion.jda.api.Permission;
 
 public class LevelRoleCommand implements Command {
diff --git a/src/main/java/creator/loki/feature/level/commands/LevelRoleFormatter.java b/src/main/java/creator/loki/feature/level/commands/LevelRoleFormatter.java
index 89728c3..74b5b0e 100644
--- a/src/main/java/creator/loki/feature/level/commands/LevelRoleFormatter.java
+++ b/src/main/java/creator/loki/feature/level/commands/LevelRoleFormatter.java
@@ -4,7 +4,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import creator.loki.feature.config.repository.ConfigRepository;
-import creator.loki.feature.level.LevelRoleService;
+import creator.loki.feature.level.service.LevelRoleService;
 import net.dv8tion.jda.api.EmbedBuilder;
 
 public class LevelRoleFormatter {
diff --git a/src/main/java/creator/loki/feature/level/ResetLevelsCommand.java b/src/main/java/creator/loki/feature/level/commands/ResetLevelsCommand.java
similarity index 99%
rename from src/main/java/creator/loki/feature/level/ResetLevelsCommand.java
rename to src/main/java/creator/loki/feature/level/commands/ResetLevelsCommand.java
index 8a9d1af..01dd418 100644
--- a/src/main/java/creator/loki/feature/level/ResetLevelsCommand.java
+++ b/src/main/java/creator/loki/feature/level/commands/ResetLevelsCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.level;
+package creator.loki.feature.level.commands;
 
 import java.awt.Color;
 
diff --git a/src/main/java/creator/loki/feature/level/StatsCommand.java b/src/main/java/creator/loki/feature/level/commands/StatsCommand.java
similarity index 98%
rename from src/main/java/creator/loki/feature/level/StatsCommand.java
rename to src/main/java/creator/loki/feature/level/commands/StatsCommand.java
index 3732c2b..7095aaa 100644
--- a/src/main/java/creator/loki/feature/level/StatsCommand.java
+++ b/src/main/java/creator/loki/feature/level/commands/StatsCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.level;
+package creator.loki.feature.level.commands;
 
 import java.awt.Color;
 
diff --git a/src/main/java/creator/loki/feature/level/MessageListener.java b/src/main/java/creator/loki/feature/level/listener/MessageListener.java
similarity index 94%
rename from src/main/java/creator/loki/feature/level/MessageListener.java
rename to src/main/java/creator/loki/feature/level/listener/MessageListener.java
index 1839551..97d247d 100644
--- a/src/main/java/creator/loki/feature/level/MessageListener.java
+++ b/src/main/java/creator/loki/feature/level/listener/MessageListener.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.level;
+package creator.loki.feature.level.listener;
 
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -8,6 +8,7 @@ import creator.loki.core.EventDispatcher;
 import creator.loki.feature.economy.service.EconomyService;
 import creator.loki.feature.level.domain.LevelUpResult;
 import creator.loki.feature.level.service.LevelService;
+import creator.loki.feature.level.service.LevelUpNotifier;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.slf4j.Logger;
diff --git a/src/main/java/creator/loki/feature/level/ResetLevelsButtonHandler.java b/src/main/java/creator/loki/feature/level/listener/ResetLevelsButtonHandler.java
similarity index 97%
rename from src/main/java/creator/loki/feature/level/ResetLevelsButtonHandler.java
rename to src/main/java/creator/loki/feature/level/listener/ResetLevelsButtonHandler.java
index dbeac8a..ed41f57 100644
--- a/src/main/java/creator/loki/feature/level/ResetLevelsButtonHandler.java
+++ b/src/main/java/creator/loki/feature/level/listener/ResetLevelsButtonHandler.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.level;
+package creator.loki.feature.level.listener;
 
 import java.awt.Color;
 
@@ -6,6 +6,7 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import creator.loki.embed.EmbedFactory;
 import creator.loki.util.LoggerDecorator;
+import creator.loki.feature.level.commands.ResetLevelsCommand;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.slf4j.Logger;
diff --git a/src/main/java/creator/loki/feature/level/LevelRoleService.java b/src/main/java/creator/loki/feature/level/service/LevelRoleService.java
similarity index 98%
rename from src/main/java/creator/loki/feature/level/LevelRoleService.java
rename to src/main/java/creator/loki/feature/level/service/LevelRoleService.java
index 9734c67..8ac4f63 100644
--- a/src/main/java/creator/loki/feature/level/LevelRoleService.java
+++ b/src/main/java/creator/loki/feature/level/service/LevelRoleService.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.level;
+package creator.loki.feature.level.service;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/creator/loki/feature/level/LevelUpNotifier.java b/src/main/java/creator/loki/feature/level/service/LevelUpNotifier.java
similarity index 98%
rename from src/main/java/creator/loki/feature/level/LevelUpNotifier.java
rename to src/main/java/creator/loki/feature/level/service/LevelUpNotifier.java
index abc4b0a..63c9c54 100644
--- a/src/main/java/creator/loki/feature/level/LevelUpNotifier.java
+++ b/src/main/java/creator/loki/feature/level/service/LevelUpNotifier.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.level;
+package creator.loki.feature.level.service;
 
 import java.awt.Color;
 
diff --git a/src/main/java/creator/loki/feature/level/VoiceTracker.java b/src/main/java/creator/loki/feature/level/service/VoiceTracker.java
similarity index 98%
rename from src/main/java/creator/loki/feature/level/VoiceTracker.java
rename to src/main/java/creator/loki/feature/level/service/VoiceTracker.java
index 0db57ca..097aa02 100644
--- a/src/main/java/creator/loki/feature/level/VoiceTracker.java
+++ b/src/main/java/creator/loki/feature/level/service/VoiceTracker.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.level;
+package creator.loki.feature.level.service;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/creator/loki/feature/moderation/ModerationCommandRegistrar.java b/src/main/java/creator/loki/feature/moderation/ModerationCommandRegistrar.java
index fc74270..b3b7bcb 100644
--- a/src/main/java/creator/loki/feature/moderation/ModerationCommandRegistrar.java
+++ b/src/main/java/creator/loki/feature/moderation/ModerationCommandRegistrar.java
@@ -20,10 +20,10 @@ import creator.loki.feature.moderation.repository.ActiveMuteRepository;
 import creator.loki.feature.moderation.repository.ModerationCaseRepository;
 import creator.loki.feature.moderation.repository.WarningRepository;
 import creator.loki.feature.role.CustomRoleManager;
-import creator.loki.feature.role.DeleteRoleCommand;
-import creator.loki.feature.role.EditRoleCommand;
-import creator.loki.feature.role.MyRolesCommand;
-import creator.loki.feature.role.commands.CreateRoleCommand;
+import creator.loki.feature.role.command.DeleteRoleCommand;
+import creator.loki.feature.role.command.EditRoleCommand;
+import creator.loki.feature.role.command.MyRolesCommand;
+import creator.loki.feature.role.command.CreateRoleCommand;
 
 public class ModerationCommandRegistrar implements CommandRegistrar {
   private final CustomRoleManager roleManager;
diff --git a/src/main/java/creator/loki/feature/profile/ProfileModule.java b/src/main/java/creator/loki/feature/profile/ProfileModule.java
index 08a00de..430857f 100644
--- a/src/main/java/creator/loki/feature/profile/ProfileModule.java
+++ b/src/main/java/creator/loki/feature/profile/ProfileModule.java
@@ -6,6 +6,7 @@ import com.google.inject.Singleton;
 import creator.loki.feature.level.repository.UserStatsRepository;
 import creator.loki.feature.level.service.LeaderboardService;
 import creator.loki.feature.level.service.LevelService;
+import creator.loki.feature.profile.service.ProfileService;
 import creator.loki.feature.reputation.repository.ReputationRepository;
 
 public class ProfileModule extends AbstractModule {
diff --git a/src/main/java/creator/loki/feature/profile/ProfileCommand.java b/src/main/java/creator/loki/feature/profile/command/ProfileCommand.java
similarity index 96%
rename from src/main/java/creator/loki/feature/profile/ProfileCommand.java
rename to src/main/java/creator/loki/feature/profile/command/ProfileCommand.java
index 0797dfa..4a05abf 100644
--- a/src/main/java/creator/loki/feature/profile/ProfileCommand.java
+++ b/src/main/java/creator/loki/feature/profile/command/ProfileCommand.java
@@ -1,7 +1,8 @@
-package creator.loki.feature.profile;
+package creator.loki.feature.profile.command;
 
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
+import creator.loki.feature.profile.service.ProfileService;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.utils.FileUpload;
 import org.slf4j.Logger;
diff --git a/src/main/java/creator/loki/feature/profile/ProfileData.java b/src/main/java/creator/loki/feature/profile/model/ProfileData.java
similarity index 97%
rename from src/main/java/creator/loki/feature/profile/ProfileData.java
rename to src/main/java/creator/loki/feature/profile/model/ProfileData.java
index f8d5cd2..9995eb0 100644
--- a/src/main/java/creator/loki/feature/profile/ProfileData.java
+++ b/src/main/java/creator/loki/feature/profile/model/ProfileData.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.profile;
+package creator.loki.feature.profile.model;
 
 public class ProfileData {
   private String username;
diff --git a/src/main/java/creator/loki/feature/profile/RankCardConstants.java b/src/main/java/creator/loki/feature/profile/render/RankCardConstants.java
similarity index 95%
rename from src/main/java/creator/loki/feature/profile/RankCardConstants.java
rename to src/main/java/creator/loki/feature/profile/render/RankCardConstants.java
index e0f7e5c..449921a 100644
--- a/src/main/java/creator/loki/feature/profile/RankCardConstants.java
+++ b/src/main/java/creator/loki/feature/profile/render/RankCardConstants.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.profile;
+package creator.loki.feature.profile.render;
 
 import java.awt.Color;
 
diff --git a/src/main/java/creator/loki/feature/profile/RankCardGenerator.java b/src/main/java/creator/loki/feature/profile/render/RankCardGenerator.java
similarity index 96%
rename from src/main/java/creator/loki/feature/profile/RankCardGenerator.java
rename to src/main/java/creator/loki/feature/profile/render/RankCardGenerator.java
index 01ba47f..9e3a001 100644
--- a/src/main/java/creator/loki/feature/profile/RankCardGenerator.java
+++ b/src/main/java/creator/loki/feature/profile/render/RankCardGenerator.java
@@ -1,6 +1,6 @@
-package creator.loki.feature.profile;
+package creator.loki.feature.profile.render;
 
-import static creator.loki.feature.profile.RankCardConstants.*;
+import static creator.loki.feature.profile.render.RankCardConstants.*;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -12,6 +12,7 @@ import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
 import java.net.URI;
 
+import creator.loki.feature.profile.model.ProfileData;
 import javax.imageio.ImageIO;
 
 public class RankCardGenerator {
diff --git a/src/main/java/creator/loki/feature/profile/RankCardIcons.java b/src/main/java/creator/loki/feature/profile/render/RankCardIcons.java
similarity index 97%
rename from src/main/java/creator/loki/feature/profile/RankCardIcons.java
rename to src/main/java/creator/loki/feature/profile/render/RankCardIcons.java
index 34f97ae..62d87ac 100644
--- a/src/main/java/creator/loki/feature/profile/RankCardIcons.java
+++ b/src/main/java/creator/loki/feature/profile/render/RankCardIcons.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.profile;
+package creator.loki.feature.profile.render;
 
 import java.awt.BasicStroke;
 import java.awt.Graphics2D;
diff --git a/src/main/java/creator/loki/feature/profile/RankCardRenderer.java b/src/main/java/creator/loki/feature/profile/render/RankCardRenderer.java
similarity index 97%
rename from src/main/java/creator/loki/feature/profile/RankCardRenderer.java
rename to src/main/java/creator/loki/feature/profile/render/RankCardRenderer.java
index 44e9c52..47e1bd1 100644
--- a/src/main/java/creator/loki/feature/profile/RankCardRenderer.java
+++ b/src/main/java/creator/loki/feature/profile/render/RankCardRenderer.java
@@ -1,6 +1,6 @@
-package creator.loki.feature.profile;
+package creator.loki.feature.profile.render;
 
-import static creator.loki.feature.profile.RankCardConstants.*;
+import static creator.loki.feature.profile.render.RankCardConstants.*;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
diff --git a/src/main/java/creator/loki/feature/profile/ProfileService.java b/src/main/java/creator/loki/feature/profile/service/ProfileService.java
similarity index 94%
rename from src/main/java/creator/loki/feature/profile/ProfileService.java
rename to src/main/java/creator/loki/feature/profile/service/ProfileService.java
index ab837cf..8e4e0d0 100644
--- a/src/main/java/creator/loki/feature/profile/ProfileService.java
+++ b/src/main/java/creator/loki/feature/profile/service/ProfileService.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.profile;
+package creator.loki.feature.profile.service;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
@@ -9,6 +9,8 @@ import creator.loki.feature.level.domain.UserStats;
 import creator.loki.feature.level.repository.UserStatsRepository;
 import creator.loki.feature.level.service.LeaderboardService;
 import creator.loki.feature.level.service.LevelService;
+import creator.loki.feature.profile.model.ProfileData;
+import creator.loki.feature.profile.render.RankCardGenerator;
 import creator.loki.feature.reputation.repository.ReputationRepository;
 import net.dv8tion.jda.api.entities.Member;
 
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/rating/BoykisserCommand.java b/src/main/java/creator/loki/feature/rating/commands/BoykisserCommand.java
similarity index 93%
rename from src/main/java/creator/loki/feature/entertainment/commands/rating/BoykisserCommand.java
rename to src/main/java/creator/loki/feature/rating/commands/BoykisserCommand.java
index 1c15407..5ce6a97 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/rating/BoykisserCommand.java
+++ b/src/main/java/creator/loki/feature/rating/commands/BoykisserCommand.java
@@ -1,10 +1,12 @@
-package creator.loki.feature.entertainment.commands.rating;
+package creator.loki.feature.rating.commands;
 
 import com.google.inject.Inject;
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedFactory;
 import creator.loki.feature.entertainment.service.RatingService;
+import creator.loki.feature.rating.config.RatingConfig;
+import creator.loki.feature.rating.config.RatingLevel;
 import net.dv8tion.jda.api.entities.Member;
 
 public class BoykisserCommand implements Command {
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/rating/FatCommand.java b/src/main/java/creator/loki/feature/rating/commands/FatCommand.java
similarity index 92%
rename from src/main/java/creator/loki/feature/entertainment/commands/rating/FatCommand.java
rename to src/main/java/creator/loki/feature/rating/commands/FatCommand.java
index 3efd589..9909a1b 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/rating/FatCommand.java
+++ b/src/main/java/creator/loki/feature/rating/commands/FatCommand.java
@@ -1,10 +1,12 @@
-package creator.loki.feature.entertainment.commands.rating;
+package creator.loki.feature.rating.commands;
 
 import com.google.inject.Inject;
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedFactory;
 import creator.loki.feature.entertainment.service.RatingService;
+import creator.loki.feature.rating.config.RatingConfig;
+import creator.loki.feature.rating.config.RatingLevel;
 import net.dv8tion.jda.api.entities.Member;
 
 public class FatCommand implements Command {
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/rating/GayCommand.java b/src/main/java/creator/loki/feature/rating/commands/GayCommand.java
similarity index 97%
rename from src/main/java/creator/loki/feature/entertainment/commands/rating/GayCommand.java
rename to src/main/java/creator/loki/feature/rating/commands/GayCommand.java
index 5b8a3f4..6cb8188 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/rating/GayCommand.java
+++ b/src/main/java/creator/loki/feature/rating/commands/GayCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.entertainment.commands.rating;
+package creator.loki.feature.rating.commands;
 
 import java.awt.Color;
 
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/rating/IqCommand.java b/src/main/java/creator/loki/feature/rating/commands/IqCommand.java
similarity index 92%
rename from src/main/java/creator/loki/feature/entertainment/commands/rating/IqCommand.java
rename to src/main/java/creator/loki/feature/rating/commands/IqCommand.java
index 5f0723d..22df9f1 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/rating/IqCommand.java
+++ b/src/main/java/creator/loki/feature/rating/commands/IqCommand.java
@@ -1,10 +1,12 @@
-package creator.loki.feature.entertainment.commands.rating;
+package creator.loki.feature.rating.commands;
 
 import com.google.inject.Inject;
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedFactory;
 import creator.loki.feature.entertainment.service.RatingService;
+import creator.loki.feature.rating.config.RatingConfig;
+import creator.loki.feature.rating.config.RatingLevel;
 import net.dv8tion.jda.api.entities.Member;
 
 public class IqCommand implements Command {
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/rating/MustacheCommand.java b/src/main/java/creator/loki/feature/rating/commands/MustacheCommand.java
similarity index 93%
rename from src/main/java/creator/loki/feature/entertainment/commands/rating/MustacheCommand.java
rename to src/main/java/creator/loki/feature/rating/commands/MustacheCommand.java
index c924d99..50408e3 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/rating/MustacheCommand.java
+++ b/src/main/java/creator/loki/feature/rating/commands/MustacheCommand.java
@@ -1,10 +1,12 @@
-package creator.loki.feature.entertainment.commands.rating;
+package creator.loki.feature.rating.commands;
 
 import com.google.inject.Inject;
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedFactory;
 import creator.loki.feature.entertainment.service.RatingService;
+import creator.loki.feature.rating.config.RatingConfig;
+import creator.loki.feature.rating.config.RatingLevel;
 import net.dv8tion.jda.api.entities.Member;
 
 public class MustacheCommand implements Command {
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/rating/PpCommand.java b/src/main/java/creator/loki/feature/rating/commands/PpCommand.java
similarity index 93%
rename from src/main/java/creator/loki/feature/entertainment/commands/rating/PpCommand.java
rename to src/main/java/creator/loki/feature/rating/commands/PpCommand.java
index 35f0905..ecb15c7 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/rating/PpCommand.java
+++ b/src/main/java/creator/loki/feature/rating/commands/PpCommand.java
@@ -1,10 +1,12 @@
-package creator.loki.feature.entertainment.commands.rating;
+package creator.loki.feature.rating.commands;
 
 import com.google.inject.Inject;
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedFactory;
 import creator.loki.feature.entertainment.service.RatingService;
+import creator.loki.feature.rating.config.RatingConfig;
+import creator.loki.feature.rating.config.RatingLevel;
 import net.dv8tion.jda.api.entities.Member;
 
 public class PpCommand implements Command {
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/rating/RateCommand.java b/src/main/java/creator/loki/feature/rating/commands/RateCommand.java
similarity index 97%
rename from src/main/java/creator/loki/feature/entertainment/commands/rating/RateCommand.java
rename to src/main/java/creator/loki/feature/rating/commands/RateCommand.java
index 1b9ee50..2c4f504 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/rating/RateCommand.java
+++ b/src/main/java/creator/loki/feature/rating/commands/RateCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.entertainment.commands.rating;
+package creator.loki.feature.rating.commands;
 
 import java.awt.Color;
 import java.util.HashMap;
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/rating/RatingConfig.java b/src/main/java/creator/loki/feature/rating/config/RatingConfig.java
similarity index 98%
rename from src/main/java/creator/loki/feature/entertainment/commands/rating/RatingConfig.java
rename to src/main/java/creator/loki/feature/rating/config/RatingConfig.java
index fed7f33..d82e96f 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/rating/RatingConfig.java
+++ b/src/main/java/creator/loki/feature/rating/config/RatingConfig.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.entertainment.commands.rating;
+package creator.loki.feature.rating.config;
 
 import java.awt.Color;
 import java.util.Collections;
diff --git a/src/main/java/creator/loki/feature/entertainment/commands/rating/RatingLevel.java b/src/main/java/creator/loki/feature/rating/config/RatingLevel.java
similarity index 95%
rename from src/main/java/creator/loki/feature/entertainment/commands/rating/RatingLevel.java
rename to src/main/java/creator/loki/feature/rating/config/RatingLevel.java
index 54821df..32a9d0f 100644
--- a/src/main/java/creator/loki/feature/entertainment/commands/rating/RatingLevel.java
+++ b/src/main/java/creator/loki/feature/rating/config/RatingLevel.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.entertainment.commands.rating;
+package creator.loki.feature.rating.config;
 
 import java.awt.Color;
 import java.util.List;
diff --git a/src/main/java/creator/loki/feature/role/commands/CreateRoleCommand.java b/src/main/java/creator/loki/feature/role/command/CreateRoleCommand.java
similarity index 96%
rename from src/main/java/creator/loki/feature/role/commands/CreateRoleCommand.java
rename to src/main/java/creator/loki/feature/role/command/CreateRoleCommand.java
index 7b2f089..e3fef81 100644
--- a/src/main/java/creator/loki/feature/role/commands/CreateRoleCommand.java
+++ b/src/main/java/creator/loki/feature/role/command/CreateRoleCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.role.commands;
+package creator.loki.feature.role.command;
 
 import java.awt.Color;
 
@@ -6,7 +6,8 @@ import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedTemplates;
 import creator.loki.feature.role.CustomRoleManager;
-import creator.loki.feature.role.RoleCommandValidator;
+import creator.loki.feature.role.validation.RoleCommandValidator;
+import creator.loki.feature.role.validation.RoleValidators;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Role;
 
diff --git a/src/main/java/creator/loki/feature/role/DeleteRoleCommand.java b/src/main/java/creator/loki/feature/role/command/DeleteRoleCommand.java
similarity index 98%
rename from src/main/java/creator/loki/feature/role/DeleteRoleCommand.java
rename to src/main/java/creator/loki/feature/role/command/DeleteRoleCommand.java
index a108204..f94ef1f 100644
--- a/src/main/java/creator/loki/feature/role/DeleteRoleCommand.java
+++ b/src/main/java/creator/loki/feature/role/command/DeleteRoleCommand.java
@@ -1,10 +1,11 @@
-package creator.loki.feature.role;
+package creator.loki.feature.role.command;
 
 import java.util.List;
 
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedTemplates;
+import creator.loki.feature.role.CustomRoleManager;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Role;
diff --git a/src/main/java/creator/loki/feature/role/EditRoleCommand.java b/src/main/java/creator/loki/feature/role/command/EditRoleCommand.java
similarity index 98%
rename from src/main/java/creator/loki/feature/role/EditRoleCommand.java
rename to src/main/java/creator/loki/feature/role/command/EditRoleCommand.java
index fe1aa22..ea88ec3 100644
--- a/src/main/java/creator/loki/feature/role/EditRoleCommand.java
+++ b/src/main/java/creator/loki/feature/role/command/EditRoleCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.role;
+package creator.loki.feature.role.command;
 
 import java.awt.Color;
 import java.util.List;
@@ -7,6 +7,7 @@ import java.util.regex.Pattern;
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedTemplates;
+import creator.loki.feature.role.CustomRoleManager;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Role;
diff --git a/src/main/java/creator/loki/feature/role/MyRolesCommand.java b/src/main/java/creator/loki/feature/role/command/MyRolesCommand.java
similarity index 97%
rename from src/main/java/creator/loki/feature/role/MyRolesCommand.java
rename to src/main/java/creator/loki/feature/role/command/MyRolesCommand.java
index 5717b03..4ad1e60 100644
--- a/src/main/java/creator/loki/feature/role/MyRolesCommand.java
+++ b/src/main/java/creator/loki/feature/role/command/MyRolesCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.role;
+package creator.loki.feature.role.command;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -8,6 +8,7 @@ import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedFactory;
 import creator.loki.embed.EmbedTemplates;
+import creator.loki.feature.role.CustomRoleManager;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Role;
 
diff --git a/src/main/java/creator/loki/feature/role/RoleCommandValidator.java b/src/main/java/creator/loki/feature/role/validation/RoleCommandValidator.java
similarity index 98%
rename from src/main/java/creator/loki/feature/role/RoleCommandValidator.java
rename to src/main/java/creator/loki/feature/role/validation/RoleCommandValidator.java
index 493ac19..266c434 100644
--- a/src/main/java/creator/loki/feature/role/RoleCommandValidator.java
+++ b/src/main/java/creator/loki/feature/role/validation/RoleCommandValidator.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.role;
+package creator.loki.feature.role.validation;
 
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedTemplates;
diff --git a/src/main/java/creator/loki/feature/role/commands/RoleValidators.java b/src/main/java/creator/loki/feature/role/validation/RoleValidators.java
similarity index 98%
rename from src/main/java/creator/loki/feature/role/commands/RoleValidators.java
rename to src/main/java/creator/loki/feature/role/validation/RoleValidators.java
index 8c7a18b..4dfa00e 100644
--- a/src/main/java/creator/loki/feature/role/commands/RoleValidators.java
+++ b/src/main/java/creator/loki/feature/role/validation/RoleValidators.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.role.commands;
+package creator.loki.feature.role.validation;
 
 import java.awt.Color;
 import java.util.regex.Pattern;
diff --git a/src/main/java/creator/loki/feature/serverstats/ServerStatsService.java b/src/main/java/creator/loki/feature/serverstats/ServerStatsService.java
index 27b26d1..39d5082 100644
--- a/src/main/java/creator/loki/feature/serverstats/ServerStatsService.java
+++ b/src/main/java/creator/loki/feature/serverstats/ServerStatsService.java
@@ -11,7 +11,7 @@ import java.util.List;
 
 import javax.imageio.ImageIO;
 
-import creator.loki.feature.counter.DailyStats;
+import creator.loki.feature.counter.service.DailyStats;
 import creator.loki.feature.counter.repository.CounterStatsRepository;
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Guild;
diff --git a/src/main/java/creator/loki/feature/utility/UtilityCommandRegistrar.java b/src/main/java/creator/loki/feature/utility/UtilityCommandRegistrar.java
index d2ae164..7c06ac2 100644
--- a/src/main/java/creator/loki/feature/utility/UtilityCommandRegistrar.java
+++ b/src/main/java/creator/loki/feature/utility/UtilityCommandRegistrar.java
@@ -7,8 +7,8 @@ import creator.loki.core.registry.CommandRegistry;
 import creator.loki.core.security.CooldownManager;
 import creator.loki.feature.admin.commands.GenerateRatingsCommand;
 import creator.loki.feature.config.repository.ConfigRepository;
-import creator.loki.feature.counter.CounterManager;
-import creator.loki.feature.counter.CounterSetupPrefixCommand;
+import creator.loki.feature.counter.service.CounterManager;
+import creator.loki.feature.counter.service.CounterSetupPrefixCommand;
 import creator.loki.feature.counter.repository.CounterStatsRepository;
 import creator.loki.feature.help.commands.HelpCommand;
 import creator.loki.feature.info.commands.AvatarCommand;
@@ -24,8 +24,8 @@ import creator.loki.feature.reputation.RepTopCommand;
 import creator.loki.feature.reputation.repository.ReputationRepository;
 import creator.loki.feature.serverstats.ServerStatsService;
 import creator.loki.feature.utility.commands.PollCommand;
-import creator.loki.feature.voice.VoiceChannelManager;
-import creator.loki.feature.voice.VoiceSetupPrefixCommand;
+import creator.loki.feature.voice.service.VoiceChannelManager;
+import creator.loki.feature.voice.service.VoiceSetupPrefixCommand;
 
 public class UtilityCommandRegistrar implements CommandRegistrar {
   private final CommandRegistry commandRegistry;
diff --git a/src/main/java/creator/loki/feature/voice/VoiceModule.java b/src/main/java/creator/loki/feature/voice/VoiceModule.java
index e594a64..35e1e92 100644
--- a/src/main/java/creator/loki/feature/voice/VoiceModule.java
+++ b/src/main/java/creator/loki/feature/voice/VoiceModule.java
@@ -5,8 +5,13 @@ import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import creator.loki.database.Database;
 import creator.loki.feature.config.repository.ConfigRepository;
+import creator.loki.feature.voice.handler.VoiceButtonHandler;
+import creator.loki.feature.voice.handler.VoiceModalHandler;
+import creator.loki.feature.voice.listener.VoiceChannelListener;
+import creator.loki.feature.voice.listener.VoiceSyncListener;
 import creator.loki.feature.voice.repository.VoiceChannelRepository;
 import creator.loki.feature.voice.repository.VoicePresetRepository;
+import creator.loki.feature.voice.service.VoiceChannelManager;
 
 public class VoiceModule extends AbstractModule {
 
diff --git a/src/main/java/creator/loki/feature/voice/VoiceButtonHandler.java b/src/main/java/creator/loki/feature/voice/handler/VoiceButtonHandler.java
similarity index 98%
rename from src/main/java/creator/loki/feature/voice/VoiceButtonHandler.java
rename to src/main/java/creator/loki/feature/voice/handler/VoiceButtonHandler.java
index 01a90ba..86960fb 100644
--- a/src/main/java/creator/loki/feature/voice/VoiceButtonHandler.java
+++ b/src/main/java/creator/loki/feature/voice/handler/VoiceButtonHandler.java
@@ -1,7 +1,8 @@
-package creator.loki.feature.voice;
+package creator.loki.feature.voice.handler;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import creator.loki.feature.voice.service.VoiceChannelManager;
 import creator.loki.util.LoggerDecorator;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.components.label.Label;
diff --git a/src/main/java/creator/loki/feature/voice/VoiceModalHandler.java b/src/main/java/creator/loki/feature/voice/handler/VoiceModalHandler.java
similarity index 97%
rename from src/main/java/creator/loki/feature/voice/VoiceModalHandler.java
rename to src/main/java/creator/loki/feature/voice/handler/VoiceModalHandler.java
index 3c9d5bf..027a210 100644
--- a/src/main/java/creator/loki/feature/voice/VoiceModalHandler.java
+++ b/src/main/java/creator/loki/feature/voice/handler/VoiceModalHandler.java
@@ -1,7 +1,8 @@
-package creator.loki.feature.voice;
+package creator.loki.feature.voice.handler;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import creator.loki.feature.voice.service.VoiceChannelManager;
 import creator.loki.util.LoggerDecorator;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
diff --git a/src/main/java/creator/loki/feature/voice/VoiceChannelListener.java b/src/main/java/creator/loki/feature/voice/listener/VoiceChannelListener.java
similarity index 95%
rename from src/main/java/creator/loki/feature/voice/VoiceChannelListener.java
rename to src/main/java/creator/loki/feature/voice/listener/VoiceChannelListener.java
index da04b61..c75ce1b 100644
--- a/src/main/java/creator/loki/feature/voice/VoiceChannelListener.java
+++ b/src/main/java/creator/loki/feature/voice/listener/VoiceChannelListener.java
@@ -1,7 +1,8 @@
-package creator.loki.feature.voice;
+package creator.loki.feature.voice.listener;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import creator.loki.feature.voice.service.VoiceChannelManager;
 import creator.loki.util.LoggerDecorator;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
diff --git a/src/main/java/creator/loki/feature/voice/VoiceSyncListener.java b/src/main/java/creator/loki/feature/voice/listener/VoiceSyncListener.java
similarity index 88%
rename from src/main/java/creator/loki/feature/voice/VoiceSyncListener.java
rename to src/main/java/creator/loki/feature/voice/listener/VoiceSyncListener.java
index da5d8f4..ebad643 100644
--- a/src/main/java/creator/loki/feature/voice/VoiceSyncListener.java
+++ b/src/main/java/creator/loki/feature/voice/listener/VoiceSyncListener.java
@@ -1,7 +1,9 @@
-package creator.loki.feature.voice;
+package creator.loki.feature.voice.listener;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import creator.loki.feature.voice.VoiceChannelData;
+import creator.loki.feature.voice.service.VoiceChannelManager;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.events.channel.update.ChannelUpdateNameEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
diff --git a/src/main/java/creator/loki/feature/voice/repository/VoicePresetRepository.java b/src/main/java/creator/loki/feature/voice/repository/VoicePresetRepository.java
index 51d7307..5f125e9 100644
--- a/src/main/java/creator/loki/feature/voice/repository/VoicePresetRepository.java
+++ b/src/main/java/creator/loki/feature/voice/repository/VoicePresetRepository.java
@@ -5,7 +5,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import creator.loki.database.Database;
-import creator.loki.feature.voice.VoicePreset;
+import creator.loki.feature.voice.service.VoicePreset;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/creator/loki/feature/voice/AudioPlayerSendHandler.java b/src/main/java/creator/loki/feature/voice/service/AudioPlayerSendHandler.java
similarity index 94%
rename from src/main/java/creator/loki/feature/voice/AudioPlayerSendHandler.java
rename to src/main/java/creator/loki/feature/voice/service/AudioPlayerSendHandler.java
index e249115..78054d4 100644
--- a/src/main/java/creator/loki/feature/voice/AudioPlayerSendHandler.java
+++ b/src/main/java/creator/loki/feature/voice/service/AudioPlayerSendHandler.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.voice;
+package creator.loki.feature.voice.service;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/creator/loki/feature/voice/VoiceChannelManager.java b/src/main/java/creator/loki/feature/voice/service/VoiceChannelManager.java
similarity index 98%
rename from src/main/java/creator/loki/feature/voice/VoiceChannelManager.java
rename to src/main/java/creator/loki/feature/voice/service/VoiceChannelManager.java
index 192eaca..2acec92 100644
--- a/src/main/java/creator/loki/feature/voice/VoiceChannelManager.java
+++ b/src/main/java/creator/loki/feature/voice/service/VoiceChannelManager.java
@@ -1,9 +1,10 @@
-package creator.loki.feature.voice;
+package creator.loki.feature.voice.service;
 
 import java.awt.Color;
 import java.util.EnumSet;
 
 import creator.loki.feature.config.repository.ConfigRepository;
+import creator.loki.feature.voice.VoiceChannelData;
 import creator.loki.feature.voice.repository.VoiceChannelRepository;
 import creator.loki.feature.voice.repository.VoicePresetRepository;
 import creator.loki.util.LoggerDecorator;
diff --git a/src/main/java/creator/loki/feature/voice/VoicePreset.java b/src/main/java/creator/loki/feature/voice/service/VoicePreset.java
similarity index 97%
rename from src/main/java/creator/loki/feature/voice/VoicePreset.java
rename to src/main/java/creator/loki/feature/voice/service/VoicePreset.java
index a455474..b53be55 100644
--- a/src/main/java/creator/loki/feature/voice/VoicePreset.java
+++ b/src/main/java/creator/loki/feature/voice/service/VoicePreset.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.voice;
+package creator.loki.feature.voice.service;
 
 /** Пресет настроек голосового канала с расширенными опциями */
 public class VoicePreset {
diff --git a/src/main/java/creator/loki/feature/voice/VoiceSetupPrefixCommand.java b/src/main/java/creator/loki/feature/voice/service/VoiceSetupPrefixCommand.java
similarity index 99%
rename from src/main/java/creator/loki/feature/voice/VoiceSetupPrefixCommand.java
rename to src/main/java/creator/loki/feature/voice/service/VoiceSetupPrefixCommand.java
index 0b859e1..f2abbba 100644
--- a/src/main/java/creator/loki/feature/voice/VoiceSetupPrefixCommand.java
+++ b/src/main/java/creator/loki/feature/voice/service/VoiceSetupPrefixCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.feature.voice;
+package creator.loki.feature.voice.service;
 
 import java.awt.Color;
 import java.util.List;
diff --git a/src/test/java/creator/loki/core/registry/SmokeCommandRegistrationTest.java b/src/test/java/creator/loki/core/registry/SmokeCommandRegistrationTest.java
index a5b4f7c..c0f850a 100644
--- a/src/test/java/creator/loki/core/registry/SmokeCommandRegistrationTest.java
+++ b/src/test/java/creator/loki/core/registry/SmokeCommandRegistrationTest.java
@@ -10,15 +10,15 @@ import creator.loki.config.BotConfig;
 import creator.loki.core.security.CooldownManager;
 import creator.loki.feature.config.repository.ConfigRepository;
 import creator.loki.feature.config.repository.GuildConfigRepository;
-import creator.loki.feature.counter.CounterManager;
+import creator.loki.feature.counter.service.CounterManager;
 import creator.loki.feature.counter.repository.CounterStatsRepository;
 import creator.loki.feature.economy.EconomyCommandRegistrar;
 import creator.loki.feature.economy.service.*;
 import creator.loki.feature.entertainment.EntertainmentCommandRegistrar;
 import creator.loki.feature.entertainment.service.RatingService;
-import creator.loki.feature.level.LevelCommandRegistrar;
-import creator.loki.feature.level.LevelRoleService;
-import creator.loki.feature.level.ResetLevelsCommand;
+import creator.loki.feature.level.commands.LevelCommandRegistrar;
+import creator.loki.feature.level.service.LevelRoleService;
+import creator.loki.feature.level.commands.ResetLevelsCommand;
 import creator.loki.feature.level.repository.UserStatsRepository;
 import creator.loki.feature.level.service.LeaderboardService;
 import creator.loki.feature.metrics.MetricsCollector;
@@ -29,13 +29,13 @@ import creator.loki.feature.moderation.repository.*;
 import creator.loki.feature.music.MusicCommandRegistrar;
 import creator.loki.feature.music.core.PlayerManager;
 import creator.loki.feature.music.core.SearchManager;
-import creator.loki.feature.profile.ProfileService;
+import creator.loki.feature.profile.service.ProfileService;
 import creator.loki.feature.rating.repository.RatingsRepository;
 import creator.loki.feature.reputation.repository.ReputationRepository;
 import creator.loki.feature.role.CustomRoleManager;
 import creator.loki.feature.ship.repository.ShipPairRepository;
 import creator.loki.feature.utility.UtilityCommandRegistrar;
-import creator.loki.feature.voice.VoiceChannelManager;
+import creator.loki.feature.voice.service.VoiceChannelManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/creator/loki/feature/entertainment/commands/ChoiceOptionParserTest.java b/src/test/java/creator/loki/feature/entertainment/commands/ChoiceOptionParserTest.java
index 76ef70b..369a1f7 100644
--- a/src/test/java/creator/loki/feature/entertainment/commands/ChoiceOptionParserTest.java
+++ b/src/test/java/creator/loki/feature/entertainment/commands/ChoiceOptionParserTest.java
@@ -1,4 +1,5 @@
 package creator.loki.feature.entertainment.commands;
+import creator.loki.feature.entertainment.commands.random.ChoiceOptionParser;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/creator/loki/feature/entertainment/commands/CoinCommandTest.java b/src/test/java/creator/loki/feature/entertainment/commands/CoinCommandTest.java
index 7d8b44a..7706fd6 100644
--- a/src/test/java/creator/loki/feature/entertainment/commands/CoinCommandTest.java
+++ b/src/test/java/creator/loki/feature/entertainment/commands/CoinCommandTest.java
@@ -1,4 +1,5 @@
 package creator.loki.feature.entertainment.commands;
+import creator.loki.feature.entertainment.commands.random.CoinCommand;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/creator/loki/feature/entertainment/commands/DiceCommandTest.java b/src/test/java/creator/loki/feature/entertainment/commands/DiceCommandTest.java
index 55726ac..313e46e 100644
--- a/src/test/java/creator/loki/feature/entertainment/commands/DiceCommandTest.java
+++ b/src/test/java/creator/loki/feature/entertainment/commands/DiceCommandTest.java
@@ -1,4 +1,5 @@
 package creator.loki.feature.entertainment.commands;
+import creator.loki.feature.entertainment.commands.random.DiceCommand;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/creator/loki/feature/entertainment/commands/EightBallCommandTest.java b/src/test/java/creator/loki/feature/entertainment/commands/EightBallCommandTest.java
index 9b38bb8..818d2a0 100644
--- a/src/test/java/creator/loki/feature/entertainment/commands/EightBallCommandTest.java
+++ b/src/test/java/creator/loki/feature/entertainment/commands/EightBallCommandTest.java
@@ -1,4 +1,5 @@
 package creator.loki.feature.entertainment.commands;
+import creator.loki.feature.entertainment.commands.random.EightBallCommand;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/creator/loki/feature/entertainment/commands/RatingLevelTest.java b/src/test/java/creator/loki/feature/entertainment/commands/RatingLevelTest.java
index e77e46c..01bbaf8 100644
--- a/src/test/java/creator/loki/feature/entertainment/commands/RatingLevelTest.java
+++ b/src/test/java/creator/loki/feature/entertainment/commands/RatingLevelTest.java
@@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.*;
 import java.awt.Color;
 import java.util.List;
 
-import creator.loki.feature.entertainment.commands.rating.RatingConfig;
-import creator.loki.feature.entertainment.commands.rating.RatingLevel;
+import creator.loki.feature.rating.config.RatingConfig;
+import creator.loki.feature.rating.config.RatingLevel;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/creator/loki/feature/profile/RankCardGeneratorTest.java b/src/test/java/creator/loki/feature/profile/RankCardGeneratorTest.java
index d31e2be..b562275 100644
--- a/src/test/java/creator/loki/feature/profile/RankCardGeneratorTest.java
+++ b/src/test/java/creator/loki/feature/profile/RankCardGeneratorTest.java
@@ -1,4 +1,6 @@
 package creator.loki.feature.profile;
+import creator.loki.feature.profile.render.RankCardGenerator;
+import creator.loki.feature.profile.model.ProfileData;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
diff --git a/src/test/java/creator/loki/feature/voice/VoiceChannelManagerTest.java b/src/test/java/creator/loki/feature/voice/VoiceChannelManagerTest.java
index 8c440ff..ed6be6d 100644
--- a/src/test/java/creator/loki/feature/voice/VoiceChannelManagerTest.java
+++ b/src/test/java/creator/loki/feature/voice/VoiceChannelManagerTest.java
@@ -1,4 +1,6 @@
 package creator.loki.feature.voice;
+import creator.loki.feature.voice.service.VoicePreset;
+import creator.loki.feature.voice.service.VoiceChannelManager;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;