diff --git a/Bot/Attributes/Command.cs b/Bot/Attributes/Command.cs
index 6772c66..adbcc20 100644
--- a/Bot/Attributes/Command.cs
+++ b/Bot/Attributes/Command.cs
@@ -2,7 +2,7 @@
 
 namespace Bot
 {
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
     public class Command : Attribute
     {
         public string CommandText { get; private set; }
diff --git a/Bot/Implementations/CleanCommand.cs b/Bot/Implementations/Commands/CleanCommand.cs
similarity index 100%
rename from Bot/Implementations/CleanCommand.cs
rename to Bot/Implementations/Commands/CleanCommand.cs
diff --git a/Bot/Implementations/DocumentationCommand.cs b/Bot/Implementations/Commands/DocumentationCommand.cs
similarity index 100%
rename from Bot/Implementations/DocumentationCommand.cs
rename to Bot/Implementations/Commands/DocumentationCommand.cs
diff --git a/Bot/Implementations/ExpletiveCommand.cs b/Bot/Implementations/Commands/ExpletiveCommand.cs
similarity index 100%
rename from Bot/Implementations/ExpletiveCommand.cs
rename to Bot/Implementations/Commands/ExpletiveCommand.cs
diff --git a/Bot/Implementations/PingCommand.cs b/Bot/Implementations/Commands/PingCommand.cs
similarity index 100%
rename from Bot/Implementations/PingCommand.cs
rename to Bot/Implementations/Commands/PingCommand.cs
diff --git a/Bot/Implementations/RemindMeCommand.cs b/Bot/Implementations/Commands/RemindMeCommand.cs
similarity index 100%
rename from Bot/Implementations/RemindMeCommand.cs
rename to Bot/Implementations/Commands/RemindMeCommand.cs
diff --git a/Bot/Implementations/VoteCommand.cs b/Bot/Implementations/Commands/VoteCommand.cs
similarity index 100%
rename from Bot/Implementations/VoteCommand.cs
rename to Bot/Implementations/Commands/VoteCommand.cs
diff --git a/Bot/Implementations/DotaGameTracker.cs b/Bot/Implementations/Functionality/DotaGameTracker.cs
similarity index 100%
rename from Bot/Implementations/DotaGameTracker.cs
rename to Bot/Implementations/Functionality/DotaGameTracker.cs
diff --git a/Bot/Implementations/UserStatusTracker.cs b/Bot/Implementations/Functionality/UserStatusTracker.cs
similarity index 100%
rename from Bot/Implementations/UserStatusTracker.cs
rename to Bot/Implementations/Functionality/UserStatusTracker.cs