diff --git a/lib/aethyr/core/actions/commands/acarea.rb b/lib/aethyr/core/actions/commands/acarea.rb
index 4f70fc3f0709fc29851e8a55812394ddeaf37357..a5361597b40091d710fba1b3f931fa4cda4fd443 100644
--- a/lib/aethyr/core/actions/commands/acarea.rb
+++ b/lib/aethyr/core/actions/commands/acarea.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/acdoor.rb b/lib/aethyr/core/actions/commands/acdoor.rb
index cf592c24133225c40030f995ff4f1c6930d25ec1..70d7d3ca6e624446ee3dfcaa3c826d9088ad14b7 100644
--- a/lib/aethyr/core/actions/commands/acdoor.rb
+++ b/lib/aethyr/core/actions/commands/acdoor.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/acomment.rb b/lib/aethyr/core/actions/commands/acomment.rb
index 12907e79a6af9c35a11aa0ef7207f73552f36637..24ef59f82ace5c9473d4e4438b9a77ae8ecdee98 100644
--- a/lib/aethyr/core/actions/commands/acomment.rb
+++ b/lib/aethyr/core/actions/commands/acomment.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/aconfig.rb b/lib/aethyr/core/actions/commands/aconfig.rb
index 717f53f5753f0588b3adde724148397bd842b151..38a24811f095d3c3c8d4816ccbf00fbdd0fe284b 100644
--- a/lib/aethyr/core/actions/commands/aconfig.rb
+++ b/lib/aethyr/core/actions/commands/aconfig.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/acportal.rb b/lib/aethyr/core/actions/commands/acportal.rb
index e669eaff9879add3991f8216c3badef049d3bf05..61f003a390fd613507e72885b878040a4d939e58 100644
--- a/lib/aethyr/core/actions/commands/acportal.rb
+++ b/lib/aethyr/core/actions/commands/acportal.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/acreate.rb b/lib/aethyr/core/actions/commands/acreate.rb
index bf8f660e4ed4cdbc980995642b081664603110ac..d8e1d07350a6047e4ae7410c3ba11172123b68ac 100644
--- a/lib/aethyr/core/actions/commands/acreate.rb
+++ b/lib/aethyr/core/actions/commands/acreate.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/acroom.rb b/lib/aethyr/core/actions/commands/acroom.rb
index 345c0376f02f179c081127523346d3f26e766d79..f68efd91d572ec752aeb0826d050839c0d5b8b30 100644
--- a/lib/aethyr/core/actions/commands/acroom.rb
+++ b/lib/aethyr/core/actions/commands/acroom.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/adelete.rb b/lib/aethyr/core/actions/commands/adelete.rb
index f740862a1dc61413ec6bb0948aaef39cc2a69be7..e94927d8ecb115f155b1ec92fbdf5834ac01e719 100644
--- a/lib/aethyr/core/actions/commands/adelete.rb
+++ b/lib/aethyr/core/actions/commands/adelete.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/adesc.rb b/lib/aethyr/core/actions/commands/adesc.rb
index fe23f9a244581fd49df84da7c2a1293553d0886f..f57b482c10af94a345dec888ba223c4dad9b72af 100644
--- a/lib/aethyr/core/actions/commands/adesc.rb
+++ b/lib/aethyr/core/actions/commands/adesc.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/aforce.rb b/lib/aethyr/core/actions/commands/aforce.rb
index 6359f70585c60378cf632494d3f37160c3d5a487..5ce4c21a5f7754f1f2d00790a359af1544bedc21 100644
--- a/lib/aethyr/core/actions/commands/aforce.rb
+++ b/lib/aethyr/core/actions/commands/aforce.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/ahelp.rb b/lib/aethyr/core/actions/commands/ahelp.rb
index 0d060e62bdc4d0a0dcc2e9f34e85f608f6fe98a1..d7e9e6bfe34c1cdf96da507dd3467c10942227bb 100644
--- a/lib/aethyr/core/actions/commands/ahelp.rb
+++ b/lib/aethyr/core/actions/commands/ahelp.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/ahide.rb b/lib/aethyr/core/actions/commands/ahide.rb
index 51f9bb99ebdf890e3197e61767382c4bbbde99d9..7151ad01b2b3a73884ed86f2aeaa83cd68ac7301 100644
--- a/lib/aethyr/core/actions/commands/ahide.rb
+++ b/lib/aethyr/core/actions/commands/ahide.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/ainfo.rb b/lib/aethyr/core/actions/commands/ainfo.rb
index 0cd564ba3ac10be954dd85aee51067029eb401b6..a7c7f97d835287ff1004ec8089ce5103748df3f5 100644
--- a/lib/aethyr/core/actions/commands/ainfo.rb
+++ b/lib/aethyr/core/actions/commands/ainfo.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/alearn.rb b/lib/aethyr/core/actions/commands/alearn.rb
index 58a8a987ee1b3b6a1086b48eea31526a0b113e27..3ec75e828a83cc55aa24f5cd6f0cb23373a33136 100644
--- a/lib/aethyr/core/actions/commands/alearn.rb
+++ b/lib/aethyr/core/actions/commands/alearn.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/alist.rb b/lib/aethyr/core/actions/commands/alist.rb
index 925610e3c6dd07424a51161e743b8ab6ff63d27e..835b90d6b75c26774764a89829ddbd1e525c0cde 100644
--- a/lib/aethyr/core/actions/commands/alist.rb
+++ b/lib/aethyr/core/actions/commands/alist.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/all.rb b/lib/aethyr/core/actions/commands/all.rb
index 83d00058d24dd576278ad53ca6c709a360aca600..7c5d101dc41239a690c8c552c294d5a94db8269b 100644
--- a/lib/aethyr/core/actions/commands/all.rb
+++ b/lib/aethyr/core/actions/commands/all.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/alog.rb b/lib/aethyr/core/actions/commands/alog.rb
index 6c67e352303ace1f83624a6e742df1bbc70c72e9..9865553434981a85750f9e744cd796a995104a04 100644
--- a/lib/aethyr/core/actions/commands/alog.rb
+++ b/lib/aethyr/core/actions/commands/alog.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/alook.rb b/lib/aethyr/core/actions/commands/alook.rb
index 144ab35ef070435f159571d727d32136a5254eab..921e0eef3e8a1d588b2730d593e7840ea8ae9e8d 100644
--- a/lib/aethyr/core/actions/commands/alook.rb
+++ b/lib/aethyr/core/actions/commands/alook.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/aput.rb b/lib/aethyr/core/actions/commands/aput.rb
index c58e543de8dde07c056020c5880bd96e8e3873e3..a08e1032a470c545e9605a766fec79a782e0a793 100644
--- a/lib/aethyr/core/actions/commands/aput.rb
+++ b/lib/aethyr/core/actions/commands/aput.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/areaction.rb b/lib/aethyr/core/actions/commands/areaction.rb
index 09a3908d30eb850e6118d4c1d11e583e9ae0890b..b9b95251501f831c336b2fc10e97c4a20005edf4 100644
--- a/lib/aethyr/core/actions/commands/areaction.rb
+++ b/lib/aethyr/core/actions/commands/areaction.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/areas.rb b/lib/aethyr/core/actions/commands/areas.rb
index 11378e696af24fbb1244282d79ca496526e91e2e..42c0778e256f6d5fff2fcf2ee40c4f2092f1c09f 100644
--- a/lib/aethyr/core/actions/commands/areas.rb
+++ b/lib/aethyr/core/actions/commands/areas.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/areload.rb b/lib/aethyr/core/actions/commands/areload.rb
index 6148f1bbe8c3507a1fd179bb451b3808fe0295d3..f23248fcb98c132ff8cbf96e6a677ae704bfe6e4 100644
--- a/lib/aethyr/core/actions/commands/areload.rb
+++ b/lib/aethyr/core/actions/commands/areload.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/asave.rb b/lib/aethyr/core/actions/commands/asave.rb
index b197ebeedc6e02100d5c919f7a8f43189050434c..29c08f752d164784303a4e96512b381738a768b5 100644
--- a/lib/aethyr/core/actions/commands/asave.rb
+++ b/lib/aethyr/core/actions/commands/asave.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/aset.rb b/lib/aethyr/core/actions/commands/aset.rb
index 1324a862d916eecfb9d57d68499a955a14fe5303..ffb488ed5cd74040cb794e855411acaa566d35f4 100644
--- a/lib/aethyr/core/actions/commands/aset.rb
+++ b/lib/aethyr/core/actions/commands/aset.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/astatus.rb b/lib/aethyr/core/actions/commands/astatus.rb
index 2ce5dc3472f577d8e0c1b48b786afbd50f5a640e..c5466d5ce62e73e14dfb5ea6205b0c32ac01f1df 100644
--- a/lib/aethyr/core/actions/commands/astatus.rb
+++ b/lib/aethyr/core/actions/commands/astatus.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/ateach.rb b/lib/aethyr/core/actions/commands/ateach.rb
index 5acae607ed6872500d3391247369ced3d2cf5457..39d3318320984348271f860622b698b310f18613 100644
--- a/lib/aethyr/core/actions/commands/ateach.rb
+++ b/lib/aethyr/core/actions/commands/ateach.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/awatch.rb b/lib/aethyr/core/actions/commands/awatch.rb
index 66ecf3473ede39f9bf675aeabaf6ebffcb42ecb5..bb2a58f3824197191a4ebf6cee3d0bf4f9791f6e 100644
--- a/lib/aethyr/core/actions/commands/awatch.rb
+++ b/lib/aethyr/core/actions/commands/awatch.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/awho.rb b/lib/aethyr/core/actions/commands/awho.rb
index 1632f9e39dbc3df380ea2cb7f99febe16ba8b935..916eb3e8529ef6e7962c8e173b27d6260061f810 100644
--- a/lib/aethyr/core/actions/commands/awho.rb
+++ b/lib/aethyr/core/actions/commands/awho.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/close.rb b/lib/aethyr/core/actions/commands/close.rb
index ec14e2f750cc52ff6e92400110380e06aa6e71f3..778ca0b9165427bfb43fd5370d40232bdf8c61a2 100644
--- a/lib/aethyr/core/actions/commands/close.rb
+++ b/lib/aethyr/core/actions/commands/close.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/command_action.rb b/lib/aethyr/core/actions/commands/command_action.rb
similarity index 100%
rename from lib/aethyr/core/actions/command_action.rb
rename to lib/aethyr/core/actions/commands/command_action.rb
diff --git a/lib/aethyr/core/actions/commands/date.rb b/lib/aethyr/core/actions/commands/date.rb
index 477be8c52bc59235f4ff30cd44e3aac0c32c9731..73cdd45ec4f86709b73a143d14fc1c39dff995d8 100644
--- a/lib/aethyr/core/actions/commands/date.rb
+++ b/lib/aethyr/core/actions/commands/date.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/delete_player.rb b/lib/aethyr/core/actions/commands/delete_player.rb
index 4a4882b12411f53a6df4481d3417b0d0d4a582bd..ae41a003e0bee0421530c96780393bfc771c80ff 100644
--- a/lib/aethyr/core/actions/commands/delete_player.rb
+++ b/lib/aethyr/core/actions/commands/delete_player.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/delete_post.rb b/lib/aethyr/core/actions/commands/delete_post.rb
index f2b8b40d38e056e57c3b6130548656cc5013a08d..9d072e5446bc00b7e2e0850d27d0a5c1d09ff9e4 100644
--- a/lib/aethyr/core/actions/commands/delete_post.rb
+++ b/lib/aethyr/core/actions/commands/delete_post.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/deleteme.rb b/lib/aethyr/core/actions/commands/deleteme.rb
index 9388dff6af3b5f982371328563fe7313492d1c86..51708867cf24402bcdebe636da0f8c0ec15ef620 100644
--- a/lib/aethyr/core/actions/commands/deleteme.rb
+++ b/lib/aethyr/core/actions/commands/deleteme.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/drop.rb b/lib/aethyr/core/actions/commands/drop.rb
index 92e3f7166131c8ff6e071d6bb7bec72a68120182..3bfd9398f0351803c510138592a19e0acd6ddccc 100644
--- a/lib/aethyr/core/actions/commands/drop.rb
+++ b/lib/aethyr/core/actions/commands/drop.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/emotes/emote_action.rb b/lib/aethyr/core/actions/commands/emotes/emote_action.rb
index eeb19e6a76b8c0e941b2e1ff48d61d678f6fa0bb..cbfc4d35343c291dbe6ebdf5fa6944bfe4992141 100644
--- a/lib/aethyr/core/actions/commands/emotes/emote_action.rb
+++ b/lib/aethyr/core/actions/commands/emotes/emote_action.rb
@@ -1,4 +1,4 @@
-require 'aethyr/core/actions/command_action'
+require 'aethyr/core/actions/commands/command_action'
 
 module Aethyr
   module Extend
diff --git a/lib/aethyr/core/actions/commands/feel.rb b/lib/aethyr/core/actions/commands/feel.rb
index 7efcb739242e26ace1ba59313440fefd37e8cada..74ab95dc8ee8d5c8a53d7884030346d245fd8ec9 100644
--- a/lib/aethyr/core/actions/commands/feel.rb
+++ b/lib/aethyr/core/actions/commands/feel.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/fill.rb b/lib/aethyr/core/actions/commands/fill.rb
index a7301995600979682fb5750bc8a7e9d91180ae31..0b53c406d565d54cc18c1a850ca5594e91faf1af 100644
--- a/lib/aethyr/core/actions/commands/fill.rb
+++ b/lib/aethyr/core/actions/commands/fill.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/gait.rb b/lib/aethyr/core/actions/commands/gait.rb
index 4b97d7c8a84dc0bdaffa7398569585f3f7f04071..2aa1a718a94596b7b85cb4b0c4594993a4213090 100644
--- a/lib/aethyr/core/actions/commands/gait.rb
+++ b/lib/aethyr/core/actions/commands/gait.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/get.rb b/lib/aethyr/core/actions/commands/get.rb
index 9788ebe898006c7c0646dede6bdb10b2f538b468..dab0089cd3cb760fc23c43b6ff162298265b1c76 100644
--- a/lib/aethyr/core/actions/commands/get.rb
+++ b/lib/aethyr/core/actions/commands/get.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/give.rb b/lib/aethyr/core/actions/commands/give.rb
index b4ed399f640a06ed157ee316f2fa7fe87f8b729e..45aa75cc765cc8512bf1a1dce611ee60c4a23f75 100644
--- a/lib/aethyr/core/actions/commands/give.rb
+++ b/lib/aethyr/core/actions/commands/give.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/health.rb b/lib/aethyr/core/actions/commands/health.rb
index d29ef0d36993175fd6f1a5bdd499aca434ba6a2a..d9319368d32222317ec9a44e128937c6b0a4b222 100644
--- a/lib/aethyr/core/actions/commands/health.rb
+++ b/lib/aethyr/core/actions/commands/health.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/inventory.rb b/lib/aethyr/core/actions/commands/inventory.rb
index b3b639bf61f4872d412cb283cb42d3f168faacff..afe765c53c6582690ca7a82d6edfb1455e0689f4 100644
--- a/lib/aethyr/core/actions/commands/inventory.rb
+++ b/lib/aethyr/core/actions/commands/inventory.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/issue.rb b/lib/aethyr/core/actions/commands/issue.rb
index a0396785f3d87d046c08c7801fd9979dd3d5f19a..9c5980f2ccf6f6461b4e4415f350b62541953cfb 100644
--- a/lib/aethyr/core/actions/commands/issue.rb
+++ b/lib/aethyr/core/actions/commands/issue.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/kick.rb b/lib/aethyr/core/actions/commands/kick.rb
index 3f1c1a55e4cd4308d103ed4a74ca1f70c670c073..a326619e9ef66a0303acfe1d9597064744a08303 100644
--- a/lib/aethyr/core/actions/commands/kick.rb
+++ b/lib/aethyr/core/actions/commands/kick.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/latest_news.rb b/lib/aethyr/core/actions/commands/latest_news.rb
index 04fc83254a3e06c9a2fb77757921b6b0dd432099..5af68eb641aaab535cf53631478df91d9397b676 100644
--- a/lib/aethyr/core/actions/commands/latest_news.rb
+++ b/lib/aethyr/core/actions/commands/latest_news.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/list_unread.rb b/lib/aethyr/core/actions/commands/list_unread.rb
index 13078688d303592f2d581a15ef5f5c7234a5d127..67e39a8e246b639e300fdfe1f8a43f80aa8c2c20 100644
--- a/lib/aethyr/core/actions/commands/list_unread.rb
+++ b/lib/aethyr/core/actions/commands/list_unread.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/listen.rb b/lib/aethyr/core/actions/commands/listen.rb
index 7d7fd25525774e422192cedd8b2a819c64f50f09..45910582ca9fc4c544fa06630ea233ed1cf821d3 100644
--- a/lib/aethyr/core/actions/commands/listen.rb
+++ b/lib/aethyr/core/actions/commands/listen.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/lock.rb b/lib/aethyr/core/actions/commands/lock.rb
index a0d564f8d4221e788d367c72503fdd5b43fbc52e..474d7c5ac1c12318e53de9a62fd27698807dc8d4 100644
--- a/lib/aethyr/core/actions/commands/lock.rb
+++ b/lib/aethyr/core/actions/commands/lock.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
@@ -58,7 +58,7 @@ module Aethyr
               @player.output("You do not have the key to that #{object.name}.")
             end
           end
-          
+
         end
       end
     end
diff --git a/lib/aethyr/core/actions/commands/look.rb b/lib/aethyr/core/actions/commands/look.rb
index 5991723cde1a71e2d807850fe830101ae765f2c9..1036385c9459cd0325aae05090640c5bd7510c35 100644
--- a/lib/aethyr/core/actions/commands/look.rb
+++ b/lib/aethyr/core/actions/commands/look.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 require 'aethyr/core/objects/attributes/blind'
 
 module Aethyr
diff --git a/lib/aethyr/core/actions/commands/map.rb b/lib/aethyr/core/actions/commands/map.rb
index 12c89b1b185def32bdcac41fad901ab1527b0f7f..c8c57280a111257cb1e089f0217788cc507745f5 100644
--- a/lib/aethyr/core/actions/commands/map.rb
+++ b/lib/aethyr/core/actions/commands/map.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/more.rb b/lib/aethyr/core/actions/commands/more.rb
index 8b6703303625daba0da031ffe5f63c8ca02bc260..9a92180348d86f0c74e4ea3282ef21783486744e 100644
--- a/lib/aethyr/core/actions/commands/more.rb
+++ b/lib/aethyr/core/actions/commands/more.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/move.rb b/lib/aethyr/core/actions/commands/move.rb
index f4fa764b75693bdfffe6961b06869ea433af729b..3bc7c7dc7e282986b64013583c31f6793f7e3eaa 100644
--- a/lib/aethyr/core/actions/commands/move.rb
+++ b/lib/aethyr/core/actions/commands/move.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/open.rb b/lib/aethyr/core/actions/commands/open.rb
index f71b7e9cd295c0af62fdc75b27d93d1287744966..05245108fc3252f09d161c1feae2a9f93aa35582 100644
--- a/lib/aethyr/core/actions/commands/open.rb
+++ b/lib/aethyr/core/actions/commands/open.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/portal.rb b/lib/aethyr/core/actions/commands/portal.rb
index 5a19d143b7503f0c74f073645e8e402edbc7af17..849e4f40fbfca38b078b9ff396b1c999cc772ab4 100644
--- a/lib/aethyr/core/actions/commands/portal.rb
+++ b/lib/aethyr/core/actions/commands/portal.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/pose.rb b/lib/aethyr/core/actions/commands/pose.rb
index 09c383187bbb7556bd098d394258c15a94e1a707..83f1be534d4913960cc624719a165f6e89cb61f8 100644
--- a/lib/aethyr/core/actions/commands/pose.rb
+++ b/lib/aethyr/core/actions/commands/pose.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/punch.rb b/lib/aethyr/core/actions/commands/punch.rb
index 555cca5b717196036c774c9a72b96a29123815ee..0cf8805c6d268e908086bfd86420982927c2b632 100644
--- a/lib/aethyr/core/actions/commands/punch.rb
+++ b/lib/aethyr/core/actions/commands/punch.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/put.rb b/lib/aethyr/core/actions/commands/put.rb
index 21a2a0cb35c1ac83894026f06b4e044814fcf527..593563c5225e9b5dae1f2999d42d50ac93f69d63 100644
--- a/lib/aethyr/core/actions/commands/put.rb
+++ b/lib/aethyr/core/actions/commands/put.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/quit.rb b/lib/aethyr/core/actions/commands/quit.rb
index ea4fea557bc1a0bc47af7e1272552cb46eb2330a..1551ec46fa4bf5f379dc2baa884f6a055d4bca33 100644
--- a/lib/aethyr/core/actions/commands/quit.rb
+++ b/lib/aethyr/core/actions/commands/quit.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/read_post.rb b/lib/aethyr/core/actions/commands/read_post.rb
index 879f534b68f1c6779258aa7623b8798dcfdd13bb..6e5a73ee6c0ec68e3ac45dcc53d13d8488a1393c 100644
--- a/lib/aethyr/core/actions/commands/read_post.rb
+++ b/lib/aethyr/core/actions/commands/read_post.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/remove.rb b/lib/aethyr/core/actions/commands/remove.rb
index 2abe0197cc6b81cf37240e85cb53ed9982fd05d4..598cbef7f6afa0990450929add2d5623574498cb 100644
--- a/lib/aethyr/core/actions/commands/remove.rb
+++ b/lib/aethyr/core/actions/commands/remove.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/reply.rb b/lib/aethyr/core/actions/commands/reply.rb
index fd3058b1c2fc6c943a935988b7f69722878f2cea..d1dc5f55c517d210005602c3c4872041c2f77795 100644
--- a/lib/aethyr/core/actions/commands/reply.rb
+++ b/lib/aethyr/core/actions/commands/reply.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/restart.rb b/lib/aethyr/core/actions/commands/restart.rb
index 4d949650145f88994e858c8c7e021fdb6e13994a..a0bc9a89ef14a0326fc6143119d131500e2d524e 100644
--- a/lib/aethyr/core/actions/commands/restart.rb
+++ b/lib/aethyr/core/actions/commands/restart.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/satiety.rb b/lib/aethyr/core/actions/commands/satiety.rb
index 0800665546fd608629694e701c7eeca3b5c7122b..62777a5660ed1470642e08337ffdf2a977c0e278 100644
--- a/lib/aethyr/core/actions/commands/satiety.rb
+++ b/lib/aethyr/core/actions/commands/satiety.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/say.rb b/lib/aethyr/core/actions/commands/say.rb
index cbd7f9a03da64ae478132e2453bfb51302a2387c..a26d6118151ecb3147b3c489b6d43a0f11d9df3b 100644
--- a/lib/aethyr/core/actions/commands/say.rb
+++ b/lib/aethyr/core/actions/commands/say.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/set.rb b/lib/aethyr/core/actions/commands/set.rb
index d528d6ba3a412d7efe0754cce723d3d20bd8d4b3..0b3692806ee16d081924580752e3d59a77fe45c9 100644
--- a/lib/aethyr/core/actions/commands/set.rb
+++ b/lib/aethyr/core/actions/commands/set.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/setcolor.rb b/lib/aethyr/core/actions/commands/setcolor.rb
index 4d5410e189fd5e120d7c5bb6bee7a85a05e45f1b..798431939c1aad4578520ab8f987fe1383afb4ed 100644
--- a/lib/aethyr/core/actions/commands/setcolor.rb
+++ b/lib/aethyr/core/actions/commands/setcolor.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/setpassword.rb b/lib/aethyr/core/actions/commands/setpassword.rb
index ef58d3384b07d978744eeecfb257fa20b7069998..dfb6fcd616f556435b222ddc3c2cb422b74f265e 100644
--- a/lib/aethyr/core/actions/commands/setpassword.rb
+++ b/lib/aethyr/core/actions/commands/setpassword.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/showcolors.rb b/lib/aethyr/core/actions/commands/showcolors.rb
index 45c146aedbb92a84cce47bcc3955daecd8ee9a33..3606bd403bba40c45ede292be244e9c032ac57ef 100644
--- a/lib/aethyr/core/actions/commands/showcolors.rb
+++ b/lib/aethyr/core/actions/commands/showcolors.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/simple_block.rb b/lib/aethyr/core/actions/commands/simple_block.rb
index 22479a134f959aa251ada12ec88b6e62802084c0..da58f6f448226f8ab7a59657a492621b4a331338 100644
--- a/lib/aethyr/core/actions/commands/simple_block.rb
+++ b/lib/aethyr/core/actions/commands/simple_block.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/simple_dodge.rb b/lib/aethyr/core/actions/commands/simple_dodge.rb
index 9fe19d0482109748d5dcd38d47b305d5368c2cf0..a8c1ec907b06164519a3b2b32fd2ab4358f41482 100644
--- a/lib/aethyr/core/actions/commands/simple_dodge.rb
+++ b/lib/aethyr/core/actions/commands/simple_dodge.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/sit.rb b/lib/aethyr/core/actions/commands/sit.rb
index b8aa009b96fb444540705f0a550f2a99d3a956a6..74ee9a6e1c620ae2f2134b2068dc41b1f8ab2d8c 100644
--- a/lib/aethyr/core/actions/commands/sit.rb
+++ b/lib/aethyr/core/actions/commands/sit.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/skills.rb b/lib/aethyr/core/actions/commands/skills.rb
index 5f076032a862e6b5fd3063449e80340de9d66a9d..1a60014b0f970a3f1f7ce24e259a0c783a617378 100644
--- a/lib/aethyr/core/actions/commands/skills.rb
+++ b/lib/aethyr/core/actions/commands/skills.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/slash.rb b/lib/aethyr/core/actions/commands/slash.rb
index c00a3445470c83d1ea242d4d6954cceeb2829649..07b63c6a56777df94783fbaf463ba4a1a4589cdb 100644
--- a/lib/aethyr/core/actions/commands/slash.rb
+++ b/lib/aethyr/core/actions/commands/slash.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/smell.rb b/lib/aethyr/core/actions/commands/smell.rb
index 72b0be03e4814e35971c2b580d1cbce76782441e..67fac43222523cdefa9552358419d68c48ec5b36 100644
--- a/lib/aethyr/core/actions/commands/smell.rb
+++ b/lib/aethyr/core/actions/commands/smell.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/stand.rb b/lib/aethyr/core/actions/commands/stand.rb
index f97890a7094a6fbd4a7a17ada8b5bab57e4a8028..bcdf67e341f16e7d4950278b19af6627b5efe16d 100644
--- a/lib/aethyr/core/actions/commands/stand.rb
+++ b/lib/aethyr/core/actions/commands/stand.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/status.rb b/lib/aethyr/core/actions/commands/status.rb
index aac5e8c951fecde6d8b7930702718933976ec0af..0c7d93bb6cb9c14454eb6ca9d490b495df56dffb 100644
--- a/lib/aethyr/core/actions/commands/status.rb
+++ b/lib/aethyr/core/actions/commands/status.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/taste.rb b/lib/aethyr/core/actions/commands/taste.rb
index ead897f980f89b877ea6e933f07fab6771423fbf..bb7ba8ebe2dbf431f7fde0f29318d654653c392e 100644
--- a/lib/aethyr/core/actions/commands/taste.rb
+++ b/lib/aethyr/core/actions/commands/taste.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/tell.rb b/lib/aethyr/core/actions/commands/tell.rb
index efa0147e64299525831f39e68db85bdfaadca3f7..e71175261824329a96c3f6c2c26816271077f5e2 100644
--- a/lib/aethyr/core/actions/commands/tell.rb
+++ b/lib/aethyr/core/actions/commands/tell.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/terrain.rb b/lib/aethyr/core/actions/commands/terrain.rb
index 72f70365512ab93d9d673ff3b09381b104a19000..f76044f5a969e76da41a6f7385fad969ec8bd9fb 100644
--- a/lib/aethyr/core/actions/commands/terrain.rb
+++ b/lib/aethyr/core/actions/commands/terrain.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/time.rb b/lib/aethyr/core/actions/commands/time.rb
index b1109c335386f6c7dfd24cac4eb409d02e600da1..17a56686fa2769defb3419bf10df73919a06ad95 100644
--- a/lib/aethyr/core/actions/commands/time.rb
+++ b/lib/aethyr/core/actions/commands/time.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/unlock.rb b/lib/aethyr/core/actions/commands/unlock.rb
index 0b43aa259f18996a81d867dd3c216258e1fcb1d8..34eb204bc5aab9c0a2d438ab5091905ecda67038 100644
--- a/lib/aethyr/core/actions/commands/unlock.rb
+++ b/lib/aethyr/core/actions/commands/unlock.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/unwield.rb b/lib/aethyr/core/actions/commands/unwield.rb
index 5b6d0765b93593a8c91f9882124d1030bbf51339..496ed9cb6e637feaaf7356a38858d1a34c1aa742 100644
--- a/lib/aethyr/core/actions/commands/unwield.rb
+++ b/lib/aethyr/core/actions/commands/unwield.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/wear.rb b/lib/aethyr/core/actions/commands/wear.rb
index 8f705a3481be690089288738afb40f105f56cb73..452aeab114b21250ebdc81d82ae7717d2265fccc 100644
--- a/lib/aethyr/core/actions/commands/wear.rb
+++ b/lib/aethyr/core/actions/commands/wear.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/whereis.rb b/lib/aethyr/core/actions/commands/whereis.rb
index 6d7ca0b7ee867d7d117278f15c3d8da3b1812c0a..0263080bbac44d65d1a0697884506e03c4d29223 100644
--- a/lib/aethyr/core/actions/commands/whereis.rb
+++ b/lib/aethyr/core/actions/commands/whereis.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/whisper.rb b/lib/aethyr/core/actions/commands/whisper.rb
index af16e79e52da874b88b0620ac431572c81a25baa..9336f8992b28da21bc6fb4b9fb030b744fe236ae 100644
--- a/lib/aethyr/core/actions/commands/whisper.rb
+++ b/lib/aethyr/core/actions/commands/whisper.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/who.rb b/lib/aethyr/core/actions/commands/who.rb
index 3db7c9e29f3b685847858facd22954cbd2d3bed3..f10ef4de617a8ad7a723a0cdfc07b4a5485d6887 100644
--- a/lib/aethyr/core/actions/commands/who.rb
+++ b/lib/aethyr/core/actions/commands/who.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/wield.rb b/lib/aethyr/core/actions/commands/wield.rb
index 82476261f0736e2b188574ab378e8982d3a49492..90e8dc616b451579d98afed9002dea28ab5de9e9 100644
--- a/lib/aethyr/core/actions/commands/wield.rb
+++ b/lib/aethyr/core/actions/commands/wield.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/write.rb b/lib/aethyr/core/actions/commands/write.rb
index ea29d146b91f8876ffe2defe0fd314f87ed50418..b197e9201816473fb7c6d7e4d3c29b87b7539418 100644
--- a/lib/aethyr/core/actions/commands/write.rb
+++ b/lib/aethyr/core/actions/commands/write.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/actions/commands/write_post.rb b/lib/aethyr/core/actions/commands/write_post.rb
index e0a1fa70442aac3b0e91f4acc1ad97565ff349a4..cf7c399a2a0a8e25d27bb5c84d187053a9a3a1d7 100644
--- a/lib/aethyr/core/actions/commands/write_post.rb
+++ b/lib/aethyr/core/actions/commands/write_post.rb
@@ -1,4 +1,4 @@
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 
 module Aethyr
   module Core
diff --git a/lib/aethyr/core/input_handlers/close.rb b/lib/aethyr/core/input_handlers/close.rb
index 535a34efee513b81d2ac75afb7a4a0f88e3b1788..49790b39bf016bd6549deca7ac2acdb980f1f0cf 100644
--- a/lib/aethyr/core/input_handlers/close.rb
+++ b/lib/aethyr/core/input_handlers/close.rb
@@ -2,7 +2,7 @@ require "aethyr/core/registry"
 require "aethyr/core/input_handlers/command_handler"
 require "aethyr/core/util/direction"
 require "aethyr/core/help/help_entry"
-require "aethyr/core/actions/command_action"
+require "aethyr/core/actions/commands/command_action"
 require "aethyr/core/actions/commands/close"
 
 module Aethyr