diff --git a/lib/aethyr/core/actions/commands/agree.rb b/lib/aethyr/core/actions/commands/emotes/agree.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/agree.rb
rename to lib/aethyr/core/actions/commands/emotes/agree.rb
diff --git a/lib/aethyr/core/actions/commands/back.rb b/lib/aethyr/core/actions/commands/emotes/back.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/back.rb
rename to lib/aethyr/core/actions/commands/emotes/back.rb
diff --git a/lib/aethyr/core/actions/commands/blush.rb b/lib/aethyr/core/actions/commands/emotes/blush.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/blush.rb
rename to lib/aethyr/core/actions/commands/emotes/blush.rb
diff --git a/lib/aethyr/core/actions/commands/bow.rb b/lib/aethyr/core/actions/commands/emotes/bow.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/bow.rb
rename to lib/aethyr/core/actions/commands/emotes/bow.rb
diff --git a/lib/aethyr/core/actions/commands/brb.rb b/lib/aethyr/core/actions/commands/emotes/brb.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/brb.rb
rename to lib/aethyr/core/actions/commands/emotes/brb.rb
diff --git a/lib/aethyr/core/actions/commands/bye.rb b/lib/aethyr/core/actions/commands/emotes/bye.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/bye.rb
rename to lib/aethyr/core/actions/commands/emotes/bye.rb
diff --git a/lib/aethyr/core/actions/commands/cheer.rb b/lib/aethyr/core/actions/commands/emotes/cheer.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/cheer.rb
rename to lib/aethyr/core/actions/commands/emotes/cheer.rb
diff --git a/lib/aethyr/core/actions/commands/cry.rb b/lib/aethyr/core/actions/commands/emotes/cry.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/cry.rb
rename to lib/aethyr/core/actions/commands/emotes/cry.rb
diff --git a/lib/aethyr/core/actions/commands/curtsey.rb b/lib/aethyr/core/actions/commands/emotes/curtsey.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/curtsey.rb
rename to lib/aethyr/core/actions/commands/emotes/curtsey.rb
diff --git a/lib/aethyr/core/actions/commands/eh.rb b/lib/aethyr/core/actions/commands/emotes/eh.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/eh.rb
rename to lib/aethyr/core/actions/commands/emotes/eh.rb
diff --git a/lib/aethyr/core/actions/commands/er.rb b/lib/aethyr/core/actions/commands/emotes/er.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/er.rb
rename to lib/aethyr/core/actions/commands/emotes/er.rb
diff --git a/lib/aethyr/core/actions/commands/ew.rb b/lib/aethyr/core/actions/commands/emotes/ew.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/ew.rb
rename to lib/aethyr/core/actions/commands/emotes/ew.rb
diff --git a/lib/aethyr/core/actions/commands/frown.rb b/lib/aethyr/core/actions/commands/emotes/frown.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/frown.rb
rename to lib/aethyr/core/actions/commands/emotes/frown.rb
diff --git a/lib/aethyr/core/actions/commands/grin.rb b/lib/aethyr/core/actions/commands/emotes/grin.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/grin.rb
rename to lib/aethyr/core/actions/commands/emotes/grin.rb
diff --git a/lib/aethyr/core/actions/commands/hi.rb b/lib/aethyr/core/actions/commands/emotes/hi.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/hi.rb
rename to lib/aethyr/core/actions/commands/emotes/hi.rb
diff --git a/lib/aethyr/core/actions/commands/hm.rb b/lib/aethyr/core/actions/commands/emotes/hm.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/hm.rb
rename to lib/aethyr/core/actions/commands/emotes/hm.rb
diff --git a/lib/aethyr/core/actions/commands/hug.rb b/lib/aethyr/core/actions/commands/emotes/hug.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/hug.rb
rename to lib/aethyr/core/actions/commands/emotes/hug.rb
diff --git a/lib/aethyr/core/actions/commands/huh.rb b/lib/aethyr/core/actions/commands/emotes/huh.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/huh.rb
rename to lib/aethyr/core/actions/commands/emotes/huh.rb
diff --git a/lib/aethyr/core/actions/commands/laugh.rb b/lib/aethyr/core/actions/commands/emotes/laugh.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/laugh.rb
rename to lib/aethyr/core/actions/commands/emotes/laugh.rb
diff --git a/lib/aethyr/core/actions/commands/no.rb b/lib/aethyr/core/actions/commands/emotes/no.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/no.rb
rename to lib/aethyr/core/actions/commands/emotes/no.rb
diff --git a/lib/aethyr/core/actions/commands/nod.rb b/lib/aethyr/core/actions/commands/emotes/nod.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/nod.rb
rename to lib/aethyr/core/actions/commands/emotes/nod.rb
diff --git a/lib/aethyr/core/actions/commands/pet.rb b/lib/aethyr/core/actions/commands/emotes/pet.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/pet.rb
rename to lib/aethyr/core/actions/commands/emotes/pet.rb
diff --git a/lib/aethyr/core/actions/commands/poke.rb b/lib/aethyr/core/actions/commands/emotes/poke.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/poke.rb
rename to lib/aethyr/core/actions/commands/emotes/poke.rb
diff --git a/lib/aethyr/core/actions/commands/ponder.rb b/lib/aethyr/core/actions/commands/emotes/ponder.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/ponder.rb
rename to lib/aethyr/core/actions/commands/emotes/ponder.rb
diff --git a/lib/aethyr/core/actions/commands/shrug.rb b/lib/aethyr/core/actions/commands/emotes/shrug.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/shrug.rb
rename to lib/aethyr/core/actions/commands/emotes/shrug.rb
diff --git a/lib/aethyr/core/actions/commands/sigh.rb b/lib/aethyr/core/actions/commands/emotes/sigh.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/sigh.rb
rename to lib/aethyr/core/actions/commands/emotes/sigh.rb
diff --git a/lib/aethyr/core/actions/commands/skip.rb b/lib/aethyr/core/actions/commands/emotes/skip.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/skip.rb
rename to lib/aethyr/core/actions/commands/emotes/skip.rb
diff --git a/lib/aethyr/core/actions/commands/smile.rb b/lib/aethyr/core/actions/commands/emotes/smile.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/smile.rb
rename to lib/aethyr/core/actions/commands/emotes/smile.rb
diff --git a/lib/aethyr/core/actions/commands/snicker.rb b/lib/aethyr/core/actions/commands/emotes/snicker.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/snicker.rb
rename to lib/aethyr/core/actions/commands/emotes/snicker.rb
diff --git a/lib/aethyr/core/actions/commands/uh.rb b/lib/aethyr/core/actions/commands/emotes/uh.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/uh.rb
rename to lib/aethyr/core/actions/commands/emotes/uh.rb
diff --git a/lib/aethyr/core/actions/commands/wave.rb b/lib/aethyr/core/actions/commands/emotes/wave.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/wave.rb
rename to lib/aethyr/core/actions/commands/emotes/wave.rb
diff --git a/lib/aethyr/core/actions/commands/yawn.rb b/lib/aethyr/core/actions/commands/emotes/yawn.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/yawn.rb
rename to lib/aethyr/core/actions/commands/emotes/yawn.rb
diff --git a/lib/aethyr/core/actions/commands/yes.rb b/lib/aethyr/core/actions/commands/emotes/yes.rb
similarity index 100%
rename from lib/aethyr/core/actions/commands/yes.rb
rename to lib/aethyr/core/actions/commands/emotes/yes.rb