diff --git a/src/main/java/creator/loki/core/BotInitializer.java b/src/main/java/creator/loki/core/BotInitializer.java
index 60e6c1d..a3cfe97 100644
--- a/src/main/java/creator/loki/core/BotInitializer.java
+++ b/src/main/java/creator/loki/core/BotInitializer.java
@@ -1,9 +1,8 @@
 package creator.loki.core;
 
 import com.google.inject.Inject;
-import creator.loki.command.impl.setup.CounterSetupCommand;
+
 import creator.loki.command.impl.setup.LogSetupCommand;
-import creator.loki.command.impl.setup.VoiceSetupCommand;
 import creator.loki.command.impl.stats.leaderboard.LeaderboardButtonListener;
 import creator.loki.config.BotConfig;
 import creator.loki.core.EventDispatcher;
@@ -11,23 +10,28 @@ import creator.loki.core.registry.CommandRegistry;
 import creator.loki.core.registry.PrefixCommandRegistrar;
 import creator.loki.core.registry.SlashCommandRegistrar;
 import creator.loki.core.registry.SlashCommandRegistry;
-import creator.loki.counter.CounterManager;
+import creator.loki.feature.counter.CounterManager;
 import creator.loki.data.JsonDataStore;
 import creator.loki.database.ConfigRepository;
 import creator.loki.database.Database;
+import creator.loki.feature.counter.CounterSetupCommand;
+import creator.loki.feature.counter.MemberCounterListener;
 import creator.loki.feature.level.LevelUpNotifier;
 import creator.loki.feature.level.service.LevelService;
+import creator.loki.feature.voice.VoiceButtonHandler;
+import creator.loki.feature.voice.VoiceChannelListener;
+import creator.loki.feature.voice.VoiceChannelManager;
+import creator.loki.feature.voice.VoiceSetupCommand;
 import creator.loki.feature.level.VoiceTracker;
 import creator.loki.level.LevelSystem;
 import creator.loki.listener.*;
 import creator.loki.listener.interaction.SlashCommandListener;
-import creator.loki.listener.voice.VoiceChannelListener;
 import creator.loki.metrics.MetricsCollector;
 import creator.loki.profile.ProfileService;
-import creator.loki.role.CustomRoleManager;
+import creator.loki.feature.role.CustomRoleManager;
 import creator.loki.core.security.CooldownManager;
 import creator.loki.core.security.RateLimiter;
-import creator.loki.voice.VoiceChannelManager;
+import creator.loki.feature.voice.VoiceChannelManager;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.OnlineStatus;
diff --git a/src/main/java/creator/loki/core/registry/PrefixCommandRegistrar.java b/src/main/java/creator/loki/core/registry/PrefixCommandRegistrar.java
index 2c56f31..aa24d8d 100644
--- a/src/main/java/creator/loki/core/registry/PrefixCommandRegistrar.java
+++ b/src/main/java/creator/loki/core/registry/PrefixCommandRegistrar.java
@@ -22,7 +22,7 @@ import creator.loki.command.impl.entertainment.interaction.positive.HugCommand;
 import creator.loki.command.impl.entertainment.interaction.positive.KissCommand;
 import creator.loki.command.impl.entertainment.interaction.positive.PatCommand;
 import creator.loki.command.impl.moderation.*;
-import creator.loki.command.impl.roles.*;
+import creator.loki.feature.role.*;
 import creator.loki.command.impl.stats.*;
 import creator.loki.command.impl.utility.*;
 import creator.loki.command.impl.utility.info.*;
@@ -30,10 +30,14 @@ import creator.loki.command.impl.utility.system.*;
 import creator.loki.config.BotConfig;
 import creator.loki.data.JsonDataStore;
 import creator.loki.feature.level.service.LevelService;
+import creator.loki.feature.role.CreateRoleCommand;
+import creator.loki.feature.role.DeleteRoleCommand;
+import creator.loki.feature.role.EditRoleCommand;
+import creator.loki.feature.role.MyRolesCommand;
 import creator.loki.level.LevelSystem;
 import creator.loki.metrics.MetricsCollector;
 import creator.loki.profile.ProfileService;
-import creator.loki.role.CustomRoleManager;
+import creator.loki.feature.role.CustomRoleManager;
 import creator.loki.core.security.CooldownManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/creator/loki/di/BotModule.java b/src/main/java/creator/loki/di/BotModule.java
index ef4779a..2d82785 100644
--- a/src/main/java/creator/loki/di/BotModule.java
+++ b/src/main/java/creator/loki/di/BotModule.java
@@ -10,7 +10,7 @@ import creator.loki.core.registry.CommandRegistry;
 import creator.loki.core.registry.SlashCommandRegistry;
 import creator.loki.core.security.CooldownManager;
 import creator.loki.core.security.RateLimiter;
-import creator.loki.counter.CounterManager;
+import creator.loki.feature.counter.CounterManager;
 import creator.loki.data.JsonDataStore;
 import creator.loki.database.ConfigRepository;
 import creator.loki.database.Database;
@@ -27,8 +27,8 @@ import creator.loki.metrics.MetricsCollector;
 import creator.loki.profile.ProfileService;
 import creator.loki.repository.UserStatsRepository;
 import creator.loki.repository.impl.JsonUserStatsRepository;
-import creator.loki.role.CustomRoleManager;
-import creator.loki.voice.VoiceChannelManager;
+import creator.loki.feature.role.CustomRoleManager;
+import creator.loki.feature.voice.VoiceChannelManager;
 
 /**
  * Главный модуль Guice для конфигурации Dependency Injection
diff --git a/src/main/java/creator/loki/counter/CounterManager.java b/src/main/java/creator/loki/feature/counter/CounterManager.java
similarity index 99%
rename from src/main/java/creator/loki/counter/CounterManager.java
rename to src/main/java/creator/loki/feature/counter/CounterManager.java
index 0ae08aa..d5dcd33 100644
--- a/src/main/java/creator/loki/counter/CounterManager.java
+++ b/src/main/java/creator/loki/feature/counter/CounterManager.java
@@ -1,4 +1,4 @@
-package creator.loki.counter;
+package creator.loki.feature.counter;
 
 import com.google.gson.reflect.TypeToken;
 import creator.loki.data.JsonDataStore;
diff --git a/src/main/java/creator/loki/command/impl/setup/CounterSetupCommand.java b/src/main/java/creator/loki/feature/counter/CounterSetupCommand.java
similarity index 99%
rename from src/main/java/creator/loki/command/impl/setup/CounterSetupCommand.java
rename to src/main/java/creator/loki/feature/counter/CounterSetupCommand.java
index 4d6e446..d71a37d 100644
--- a/src/main/java/creator/loki/command/impl/setup/CounterSetupCommand.java
+++ b/src/main/java/creator/loki/feature/counter/CounterSetupCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.command.impl.setup;
+package creator.loki.feature.counter;
 
 import creator.loki.database.ConfigRepository;
 import net.dv8tion.jda.api.EmbedBuilder;
diff --git a/src/main/java/creator/loki/counter/DailyStats.java b/src/main/java/creator/loki/feature/counter/DailyStats.java
similarity index 97%
rename from src/main/java/creator/loki/counter/DailyStats.java
rename to src/main/java/creator/loki/feature/counter/DailyStats.java
index e1f078b..a417b8b 100644
--- a/src/main/java/creator/loki/counter/DailyStats.java
+++ b/src/main/java/creator/loki/feature/counter/DailyStats.java
@@ -1,4 +1,4 @@
-package creator.loki.counter;
+package creator.loki.feature.counter;
 
 import java.time.LocalDate;
 
diff --git a/src/main/java/creator/loki/listener/MemberCounterListener.java b/src/main/java/creator/loki/feature/counter/MemberCounterListener.java
similarity index 96%
rename from src/main/java/creator/loki/listener/MemberCounterListener.java
rename to src/main/java/creator/loki/feature/counter/MemberCounterListener.java
index ed13a40..a12f38b 100644
--- a/src/main/java/creator/loki/listener/MemberCounterListener.java
+++ b/src/main/java/creator/loki/feature/counter/MemberCounterListener.java
@@ -1,6 +1,6 @@
-package creator.loki.listener;
+package creator.loki.feature.counter;
 
-import creator.loki.counter.CounterManager;
+import creator.loki.feature.counter.CounterManager;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent;
diff --git a/src/main/java/creator/loki/command/impl/roles/CreateRoleCommand.java b/src/main/java/creator/loki/feature/role/CreateRoleCommand.java
similarity index 98%
rename from src/main/java/creator/loki/command/impl/roles/CreateRoleCommand.java
rename to src/main/java/creator/loki/feature/role/CreateRoleCommand.java
index 1ac41aa..ac8b4b9 100644
--- a/src/main/java/creator/loki/command/impl/roles/CreateRoleCommand.java
+++ b/src/main/java/creator/loki/feature/role/CreateRoleCommand.java
@@ -1,9 +1,9 @@
-package creator.loki.command.impl.roles;
+package creator.loki.feature.role;
 
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedTemplates;
-import creator.loki.role.CustomRoleManager;
+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/role/CustomRoleManager.java b/src/main/java/creator/loki/feature/role/CustomRoleManager.java
similarity index 99%
rename from src/main/java/creator/loki/role/CustomRoleManager.java
rename to src/main/java/creator/loki/feature/role/CustomRoleManager.java
index 1df1461..639f253 100644
--- a/src/main/java/creator/loki/role/CustomRoleManager.java
+++ b/src/main/java/creator/loki/feature/role/CustomRoleManager.java
@@ -1,4 +1,4 @@
-package creator.loki.role;
+package creator.loki.feature.role;
 
 import com.google.gson.reflect.TypeToken;
 import creator.loki.data.JsonDataStore;
diff --git a/src/main/java/creator/loki/command/impl/roles/DeleteRoleCommand.java b/src/main/java/creator/loki/feature/role/DeleteRoleCommand.java
similarity index 98%
rename from src/main/java/creator/loki/command/impl/roles/DeleteRoleCommand.java
rename to src/main/java/creator/loki/feature/role/DeleteRoleCommand.java
index b15d992..47e646d 100644
--- a/src/main/java/creator/loki/command/impl/roles/DeleteRoleCommand.java
+++ b/src/main/java/creator/loki/feature/role/DeleteRoleCommand.java
@@ -1,9 +1,9 @@
-package creator.loki.command.impl.roles;
+package creator.loki.feature.role;
 
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedTemplates;
-import creator.loki.role.CustomRoleManager;
+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/command/impl/roles/EditRoleCommand.java b/src/main/java/creator/loki/feature/role/EditRoleCommand.java
similarity index 98%
rename from src/main/java/creator/loki/command/impl/roles/EditRoleCommand.java
rename to src/main/java/creator/loki/feature/role/EditRoleCommand.java
index ed0cedf..5179ebf 100644
--- a/src/main/java/creator/loki/command/impl/roles/EditRoleCommand.java
+++ b/src/main/java/creator/loki/feature/role/EditRoleCommand.java
@@ -1,9 +1,9 @@
-package creator.loki.command.impl.roles;
+package creator.loki.feature.role;
 
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedTemplates;
-import creator.loki.role.CustomRoleManager;
+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/command/impl/roles/MyRolesCommand.java b/src/main/java/creator/loki/feature/role/MyRolesCommand.java
similarity index 98%
rename from src/main/java/creator/loki/command/impl/roles/MyRolesCommand.java
rename to src/main/java/creator/loki/feature/role/MyRolesCommand.java
index 5001b17..33e3ed5 100644
--- a/src/main/java/creator/loki/command/impl/roles/MyRolesCommand.java
+++ b/src/main/java/creator/loki/feature/role/MyRolesCommand.java
@@ -1,10 +1,10 @@
-package creator.loki.command.impl.roles;
+package creator.loki.feature.role;
 
 import creator.loki.command.Command;
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedFactory;
 import creator.loki.embed.EmbedTemplates;
-import creator.loki.role.CustomRoleManager;
+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/command/impl/roles/RoleCommandValidator.java b/src/main/java/creator/loki/feature/role/RoleCommandValidator.java
similarity index 98%
rename from src/main/java/creator/loki/command/impl/roles/RoleCommandValidator.java
rename to src/main/java/creator/loki/feature/role/RoleCommandValidator.java
index 5ad876b..4ff3ba4 100644
--- a/src/main/java/creator/loki/command/impl/roles/RoleCommandValidator.java
+++ b/src/main/java/creator/loki/feature/role/RoleCommandValidator.java
@@ -1,4 +1,4 @@
-package creator.loki.command.impl.roles;
+package creator.loki.feature.role;
 
 import creator.loki.command.CommandContext;
 import creator.loki.embed.EmbedTemplates;
diff --git a/src/main/java/creator/loki/listener/voice/VoiceButtonHandler.java b/src/main/java/creator/loki/feature/voice/VoiceButtonHandler.java
similarity index 99%
rename from src/main/java/creator/loki/listener/voice/VoiceButtonHandler.java
rename to src/main/java/creator/loki/feature/voice/VoiceButtonHandler.java
index c3b5e5f..af410ab 100644
--- a/src/main/java/creator/loki/listener/voice/VoiceButtonHandler.java
+++ b/src/main/java/creator/loki/feature/voice/VoiceButtonHandler.java
@@ -1,6 +1,6 @@
-package creator.loki.listener;
+package creator.loki.feature.voice;
 
-import creator.loki.voice.VoiceChannelManager;
+import creator.loki.feature.voice.VoiceChannelManager;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
diff --git a/src/main/java/creator/loki/voice/VoiceChannelData.java b/src/main/java/creator/loki/feature/voice/VoiceChannelData.java
similarity index 97%
rename from src/main/java/creator/loki/voice/VoiceChannelData.java
rename to src/main/java/creator/loki/feature/voice/VoiceChannelData.java
index 95c7211..7e51d8f 100644
--- a/src/main/java/creator/loki/voice/VoiceChannelData.java
+++ b/src/main/java/creator/loki/feature/voice/VoiceChannelData.java
@@ -1,4 +1,4 @@
-package creator.loki.voice;
+package creator.loki.feature.voice;
 
 /**
  * Данные личного голосового канала
diff --git a/src/main/java/creator/loki/listener/voice/VoiceChannelListener.java b/src/main/java/creator/loki/feature/voice/VoiceChannelListener.java
similarity index 97%
rename from src/main/java/creator/loki/listener/voice/VoiceChannelListener.java
rename to src/main/java/creator/loki/feature/voice/VoiceChannelListener.java
index 302ce69..d812159 100644
--- a/src/main/java/creator/loki/listener/voice/VoiceChannelListener.java
+++ b/src/main/java/creator/loki/feature/voice/VoiceChannelListener.java
@@ -1,6 +1,6 @@
-package creator.loki.listener.voice;
+package creator.loki.feature.voice;
 
-import creator.loki.voice.VoiceChannelManager;
+import creator.loki.feature.voice.VoiceChannelManager;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
diff --git a/src/main/java/creator/loki/voice/VoiceChannelManager.java b/src/main/java/creator/loki/feature/voice/VoiceChannelManager.java
similarity index 99%
rename from src/main/java/creator/loki/voice/VoiceChannelManager.java
rename to src/main/java/creator/loki/feature/voice/VoiceChannelManager.java
index 46a2481..c6b3d05 100644
--- a/src/main/java/creator/loki/voice/VoiceChannelManager.java
+++ b/src/main/java/creator/loki/feature/voice/VoiceChannelManager.java
@@ -1,4 +1,4 @@
-package creator.loki.voice;
+package creator.loki.feature.voice;
 
 import creator.loki.database.ConfigRepository;
 import creator.loki.data.JsonDataStore;
diff --git a/src/main/java/creator/loki/voice/VoicePreset.java b/src/main/java/creator/loki/feature/voice/VoicePreset.java
similarity index 95%
rename from src/main/java/creator/loki/voice/VoicePreset.java
rename to src/main/java/creator/loki/feature/voice/VoicePreset.java
index 38692fa..c725985 100644
--- a/src/main/java/creator/loki/voice/VoicePreset.java
+++ b/src/main/java/creator/loki/feature/voice/VoicePreset.java
@@ -1,4 +1,4 @@
-package creator.loki.voice;
+package creator.loki.feature.voice;
 
 /**
  * Пресет настроек голосового канала
diff --git a/src/main/java/creator/loki/command/impl/setup/VoiceSetupCommand.java b/src/main/java/creator/loki/feature/voice/VoiceSetupCommand.java
similarity index 99%
rename from src/main/java/creator/loki/command/impl/setup/VoiceSetupCommand.java
rename to src/main/java/creator/loki/feature/voice/VoiceSetupCommand.java
index de9be9b..b477ff5 100644
--- a/src/main/java/creator/loki/command/impl/setup/VoiceSetupCommand.java
+++ b/src/main/java/creator/loki/feature/voice/VoiceSetupCommand.java
@@ -1,4 +1,4 @@
-package creator.loki.command.impl.setup;
+package creator.loki.feature.voice;
 
 import creator.loki.database.ConfigRepository;
 import net.dv8tion.jda.api.EmbedBuilder;