diff --git a/lib/aethyr/core/commands/agree.rb b/lib/aethyr/core/commands/emotes/agree.rb
similarity index 97%
rename from lib/aethyr/core/commands/agree.rb
rename to lib/aethyr/core/commands/emotes/agree.rb
index 315da044884461edf792998fd3f292153077bd7d..2056470da577161af05c4865929ae90405400f73 100644
--- a/lib/aethyr/core/commands/agree.rb
+++ b/lib/aethyr/core/commands/emotes/agree.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/back.rb b/lib/aethyr/core/commands/emotes/back.rb
similarity index 97%
rename from lib/aethyr/core/commands/back.rb
rename to lib/aethyr/core/commands/emotes/back.rb
index 2076aca9b00c6dcf6093b88756e85c260d1f6df6..d95a27d9d10260bc0308d45ba8703468ce120185 100644
--- a/lib/aethyr/core/commands/back.rb
+++ b/lib/aethyr/core/commands/emotes/back.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/blush.rb b/lib/aethyr/core/commands/emotes/blush.rb
similarity index 97%
rename from lib/aethyr/core/commands/blush.rb
rename to lib/aethyr/core/commands/emotes/blush.rb
index 63d9683f89a4909e831de00d6b9b11bb3cdab7ee..94e99bb7ceb2726d0c11d848a03ff309c743e290 100644
--- a/lib/aethyr/core/commands/blush.rb
+++ b/lib/aethyr/core/commands/emotes/blush.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/bow.rb b/lib/aethyr/core/commands/emotes/bow.rb
similarity index 97%
rename from lib/aethyr/core/commands/bow.rb
rename to lib/aethyr/core/commands/emotes/bow.rb
index bbc1680be5835a891cb5809e80a5e041c51daa5a..9dd79ccd3af23783fb9a498359729d8ad441b295 100644
--- a/lib/aethyr/core/commands/bow.rb
+++ b/lib/aethyr/core/commands/emotes/bow.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/brb.rb b/lib/aethyr/core/commands/emotes/brb.rb
similarity index 97%
rename from lib/aethyr/core/commands/brb.rb
rename to lib/aethyr/core/commands/emotes/brb.rb
index ad9a1d0a0c38e95a0ab6f24a45137a2bac8ceeb1..69fb99c1dc197763be62d4d17509d89dcb8861fe 100644
--- a/lib/aethyr/core/commands/brb.rb
+++ b/lib/aethyr/core/commands/emotes/brb.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/bye.rb b/lib/aethyr/core/commands/emotes/bye.rb
similarity index 97%
rename from lib/aethyr/core/commands/bye.rb
rename to lib/aethyr/core/commands/emotes/bye.rb
index 0cc239df80481913120621f44ed1588fd486c31a..92ca962e88e27b372f54e20e61117d3b3ecd2835 100644
--- a/lib/aethyr/core/commands/bye.rb
+++ b/lib/aethyr/core/commands/emotes/bye.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/cheer.rb b/lib/aethyr/core/commands/emotes/cheer.rb
similarity index 97%
rename from lib/aethyr/core/commands/cheer.rb
rename to lib/aethyr/core/commands/emotes/cheer.rb
index add552687a408dbb62eae9c4de7327d08e3ac4d6..ad1a4281d0e9fcc9a2f142140d34c84d9fe9e94a 100644
--- a/lib/aethyr/core/commands/cheer.rb
+++ b/lib/aethyr/core/commands/emotes/cheer.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/cry.rb b/lib/aethyr/core/commands/emotes/cry.rb
similarity index 96%
rename from lib/aethyr/core/commands/cry.rb
rename to lib/aethyr/core/commands/emotes/cry.rb
index 0166bffac89f3e97c9937c47df8c46362c6c7101..5996c33603454408b8abd567966ed0994eb15eb7 100644
--- a/lib/aethyr/core/commands/cry.rb
+++ b/lib/aethyr/core/commands/emotes/cry.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/curtsey.rb b/lib/aethyr/core/commands/emotes/curtsey.rb
similarity index 97%
rename from lib/aethyr/core/commands/curtsey.rb
rename to lib/aethyr/core/commands/emotes/curtsey.rb
index d78841551d01895cecfc44061fa069620ef89c41..a1fe14e6c2d7593d9d1be50c3f498e86b781341e 100644
--- a/lib/aethyr/core/commands/curtsey.rb
+++ b/lib/aethyr/core/commands/emotes/curtsey.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/eh.rb b/lib/aethyr/core/commands/emotes/eh.rb
similarity index 98%
rename from lib/aethyr/core/commands/eh.rb
rename to lib/aethyr/core/commands/emotes/eh.rb
index 639e7605c24f321546351ec115dd473d66da7655..18ad17680758d7c17c4b605d75b4ca69de8ea434 100644
--- a/lib/aethyr/core/commands/eh.rb
+++ b/lib/aethyr/core/commands/emotes/eh.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/emote.rb b/lib/aethyr/core/commands/emotes/emote.rb
similarity index 97%
rename from lib/aethyr/core/commands/emote.rb
rename to lib/aethyr/core/commands/emotes/emote.rb
index d4d58bea59986dda66daefc78ab13ac5d54fe68e..a8a8a0f1cd1223e90d14bd87245d8f3d237b734d 100644
--- a/lib/aethyr/core/commands/emote.rb
+++ b/lib/aethyr/core/commands/emotes/emote.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/emote_handler.rb b/lib/aethyr/core/commands/emotes/emote_handler.rb
similarity index 100%
rename from lib/aethyr/core/commands/emote_handler.rb
rename to lib/aethyr/core/commands/emotes/emote_handler.rb
diff --git a/lib/aethyr/core/commands/er.rb b/lib/aethyr/core/commands/emotes/er.rb
similarity index 97%
rename from lib/aethyr/core/commands/er.rb
rename to lib/aethyr/core/commands/emotes/er.rb
index f3e17ceec18e0a6f7d3b6e392a379760a684783f..d48087df2fc0b8948f61949aefe55f96392dca39 100644
--- a/lib/aethyr/core/commands/er.rb
+++ b/lib/aethyr/core/commands/emotes/er.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/ew.rb b/lib/aethyr/core/commands/emotes/ew.rb
similarity index 97%
rename from lib/aethyr/core/commands/ew.rb
rename to lib/aethyr/core/commands/emotes/ew.rb
index d890e7b21aee820b3dba161c88e2a94a2f47e2f4..13aac91cb71e3b3332e5f84a488b714ab0aa0da6 100644
--- a/lib/aethyr/core/commands/ew.rb
+++ b/lib/aethyr/core/commands/emotes/ew.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/frown.rb b/lib/aethyr/core/commands/emotes/frown.rb
similarity index 97%
rename from lib/aethyr/core/commands/frown.rb
rename to lib/aethyr/core/commands/emotes/frown.rb
index d2346a47c33fac69f328a1920f1ff56d5cc0510d..a9391edba78e629441edb1292ee3f1ad54d3b4cb 100644
--- a/lib/aethyr/core/commands/frown.rb
+++ b/lib/aethyr/core/commands/emotes/frown.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/grin.rb b/lib/aethyr/core/commands/emotes/grin.rb
similarity index 97%
rename from lib/aethyr/core/commands/grin.rb
rename to lib/aethyr/core/commands/emotes/grin.rb
index 6a7eaed9e49320c520d794bfe7eadf3e66c55a06..cea8422ee25dd6cc19c3fdca5f31a55459f72e55 100644
--- a/lib/aethyr/core/commands/grin.rb
+++ b/lib/aethyr/core/commands/emotes/grin.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/hi.rb b/lib/aethyr/core/commands/emotes/hi.rb
similarity index 97%
rename from lib/aethyr/core/commands/hi.rb
rename to lib/aethyr/core/commands/emotes/hi.rb
index 4e4cddc3481cc3d95d6f2ff930fa89b73af48c7f..62abdf569e25ec92e6f9a6a2164aef95c53df5af 100644
--- a/lib/aethyr/core/commands/hi.rb
+++ b/lib/aethyr/core/commands/emotes/hi.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/hm.rb b/lib/aethyr/core/commands/emotes/hm.rb
similarity index 97%
rename from lib/aethyr/core/commands/hm.rb
rename to lib/aethyr/core/commands/emotes/hm.rb
index 43e021b3054d578549b23b38b1f11766b614b923..8e24c0810a1b0aa90c9c5a997d0245728c9d8462 100644
--- a/lib/aethyr/core/commands/hm.rb
+++ b/lib/aethyr/core/commands/emotes/hm.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/hug.rb b/lib/aethyr/core/commands/emotes/hug.rb
similarity index 97%
rename from lib/aethyr/core/commands/hug.rb
rename to lib/aethyr/core/commands/emotes/hug.rb
index 6b6ad00823e8bf44473ed4784e9d7c74fc5b067a..165ef9d278e646cee03960881d74342612229bdb 100644
--- a/lib/aethyr/core/commands/hug.rb
+++ b/lib/aethyr/core/commands/emotes/hug.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/huh.rb b/lib/aethyr/core/commands/emotes/huh.rb
similarity index 97%
rename from lib/aethyr/core/commands/huh.rb
rename to lib/aethyr/core/commands/emotes/huh.rb
index 0f5730650343bda55204c371fe36792e017722e0..799e278b9ace1d42f29315c0e3084fd17cbd903a 100644
--- a/lib/aethyr/core/commands/huh.rb
+++ b/lib/aethyr/core/commands/emotes/huh.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/laugh.rb b/lib/aethyr/core/commands/emotes/laugh.rb
similarity index 97%
rename from lib/aethyr/core/commands/laugh.rb
rename to lib/aethyr/core/commands/emotes/laugh.rb
index db545c614d3399a7ad799a861f92343a5934075f..2f8c5400a13c7c5d9a7bc36c2f303806b5b60c5f 100644
--- a/lib/aethyr/core/commands/laugh.rb
+++ b/lib/aethyr/core/commands/emotes/laugh.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/no.rb b/lib/aethyr/core/commands/emotes/no.rb
similarity index 97%
rename from lib/aethyr/core/commands/no.rb
rename to lib/aethyr/core/commands/emotes/no.rb
index b81880a37b395e7a49366ae30f5dce29e1f32747..362f242becf1cd77aa3f9e8b1c3236934f66bbc6 100644
--- a/lib/aethyr/core/commands/no.rb
+++ b/lib/aethyr/core/commands/emotes/no.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/nod.rb b/lib/aethyr/core/commands/emotes/nod.rb
similarity index 97%
rename from lib/aethyr/core/commands/nod.rb
rename to lib/aethyr/core/commands/emotes/nod.rb
index 757d4ea623d5100d957b88cc9e56b9f173b617db..d3e81f2912c21b1f0b8ed0efbbe2881a9c87d3ee 100644
--- a/lib/aethyr/core/commands/nod.rb
+++ b/lib/aethyr/core/commands/emotes/nod.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/pet.rb b/lib/aethyr/core/commands/emotes/pet.rb
similarity index 97%
rename from lib/aethyr/core/commands/pet.rb
rename to lib/aethyr/core/commands/emotes/pet.rb
index b25d368c46c20b7dcf5bb02cb2e76deab3aff146..9e9fdd7449f1a4836a159150e9ab266e06579f98 100644
--- a/lib/aethyr/core/commands/pet.rb
+++ b/lib/aethyr/core/commands/emotes/pet.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/poke.rb b/lib/aethyr/core/commands/emotes/poke.rb
similarity index 97%
rename from lib/aethyr/core/commands/poke.rb
rename to lib/aethyr/core/commands/emotes/poke.rb
index a4964398b52abf688e361d6880e41570786f0697..9ee78535816577596deeb3b64d16196e4e8cfa30 100644
--- a/lib/aethyr/core/commands/poke.rb
+++ b/lib/aethyr/core/commands/emotes/poke.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/ponder.rb b/lib/aethyr/core/commands/emotes/ponder.rb
similarity index 97%
rename from lib/aethyr/core/commands/ponder.rb
rename to lib/aethyr/core/commands/emotes/ponder.rb
index 71e94e6bc10d4b5272932a467cdc83f8f5526aa0..73f79626d4d37ea05e83de98b6b580f6bbc27150 100644
--- a/lib/aethyr/core/commands/ponder.rb
+++ b/lib/aethyr/core/commands/emotes/ponder.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/shrug.rb b/lib/aethyr/core/commands/emotes/shrug.rb
similarity index 97%
rename from lib/aethyr/core/commands/shrug.rb
rename to lib/aethyr/core/commands/emotes/shrug.rb
index 2501474ddbaa6febe16069da9fc4855213a6525d..db39ea81490f666f3fc5f21b5e4ad643001b12ca 100644
--- a/lib/aethyr/core/commands/shrug.rb
+++ b/lib/aethyr/core/commands/emotes/shrug.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/sigh.rb b/lib/aethyr/core/commands/emotes/sigh.rb
similarity index 97%
rename from lib/aethyr/core/commands/sigh.rb
rename to lib/aethyr/core/commands/emotes/sigh.rb
index 48367a82f3c722eb5f7d1f25b9540a180cbe8d07..8056ad838afecbf5dadeec75d0bf29d3f5617227 100644
--- a/lib/aethyr/core/commands/sigh.rb
+++ b/lib/aethyr/core/commands/emotes/sigh.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/skip.rb b/lib/aethyr/core/commands/emotes/skip.rb
similarity index 97%
rename from lib/aethyr/core/commands/skip.rb
rename to lib/aethyr/core/commands/emotes/skip.rb
index 071ac751792f34e878c95c33de2965316c062d32..9a906c782191c1967a42da6847762f4931c7cbf0 100644
--- a/lib/aethyr/core/commands/skip.rb
+++ b/lib/aethyr/core/commands/emotes/skip.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/smile.rb b/lib/aethyr/core/commands/emotes/smile.rb
similarity index 97%
rename from lib/aethyr/core/commands/smile.rb
rename to lib/aethyr/core/commands/emotes/smile.rb
index 958278bcb1bb915785ddcb92501c99c8afc4a3c0..0101a45a63e7271e6991b97e26a793d6e6a1e8db 100644
--- a/lib/aethyr/core/commands/smile.rb
+++ b/lib/aethyr/core/commands/emotes/smile.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/snicker.rb b/lib/aethyr/core/commands/emotes/snicker.rb
similarity index 97%
rename from lib/aethyr/core/commands/snicker.rb
rename to lib/aethyr/core/commands/emotes/snicker.rb
index 51625de979a86ca7b501302ec25201a5fb30a266..3f5836bc77c7c3be295e3005a380ff4e49b16ba4 100644
--- a/lib/aethyr/core/commands/snicker.rb
+++ b/lib/aethyr/core/commands/emotes/snicker.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/uh.rb b/lib/aethyr/core/commands/emotes/uh.rb
similarity index 97%
rename from lib/aethyr/core/commands/uh.rb
rename to lib/aethyr/core/commands/emotes/uh.rb
index 0907624ebdae1dd7c33261d9f5705fc8e6707483..809d1cf322759c3bf26b611fd7e4f189612b635b 100644
--- a/lib/aethyr/core/commands/uh.rb
+++ b/lib/aethyr/core/commands/emotes/uh.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/wave.rb b/lib/aethyr/core/commands/emotes/wave.rb
similarity index 97%
rename from lib/aethyr/core/commands/wave.rb
rename to lib/aethyr/core/commands/emotes/wave.rb
index a75c9f05afd9271ba5eda2e7810ba71cfb30f357..c0d47787bc24bc1397e3924fd39dc0ff82d0ccc3 100644
--- a/lib/aethyr/core/commands/wave.rb
+++ b/lib/aethyr/core/commands/emotes/wave.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/yawn.rb b/lib/aethyr/core/commands/emotes/yawn.rb
similarity index 97%
rename from lib/aethyr/core/commands/yawn.rb
rename to lib/aethyr/core/commands/emotes/yawn.rb
index 629d21559821314caa75c44f25b2dd8c14835273..f82b5ed26c44108c53c64ba4876311ced0830349 100644
--- a/lib/aethyr/core/commands/yawn.rb
+++ b/lib/aethyr/core/commands/emotes/yawn.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/commands/yes.rb b/lib/aethyr/core/commands/emotes/yes.rb
similarity index 97%
rename from lib/aethyr/core/commands/yes.rb
rename to lib/aethyr/core/commands/emotes/yes.rb
index 65da292793b2b7d9d45938d44129ef019616a947..ea8a2fac8ae5c0e3607404d36196565aec8ace79 100644
--- a/lib/aethyr/core/commands/yes.rb
+++ b/lib/aethyr/core/commands/emotes/yes.rb
@@ -1,5 +1,5 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/emote_handler"
+require "aethyr/core/commands/emotes/emote_handler"
 
 module Aethyr
   module Core