diff --git a/lib/aethyr/core/commands/acarea.rb b/lib/aethyr/core/commands/admin/acarea.rb
similarity index 91%
rename from lib/aethyr/core/commands/acarea.rb
rename to lib/aethyr/core/commands/admin/acarea.rb
index ee9138e501bcba48501957c9dfe2dd86a0cc8b2d..1c64faad02ea4ec29bbf51a7af9ef593d8b59ee8 100644
--- a/lib/aethyr/core/commands/acarea.rb
+++ b/lib/aethyr/core/commands/admin/acarea.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Acarea
-        class AcareaHandler < Aethyr::Extend::CommandHandler
+        class AcareaHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["acarea"])
           end
diff --git a/lib/aethyr/core/commands/acdoor.rb b/lib/aethyr/core/commands/admin/acdoor.rb
similarity index 96%
rename from lib/aethyr/core/commands/acdoor.rb
rename to lib/aethyr/core/commands/admin/acdoor.rb
index c0d914710b89daf15d0e8b5f51945f8819033e85..ea803f7b412a4e7105768811f1f5fb9933523b61 100644
--- a/lib/aethyr/core/commands/acdoor.rb
+++ b/lib/aethyr/core/commands/admin/acdoor.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Acdoor
-        class AcdoorHandler < Aethyr::Extend::CommandHandler
+        class AcdoorHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["acdoor"])
           end
diff --git a/lib/aethyr/core/commands/acexit.rb b/lib/aethyr/core/commands/admin/acexit.rb
similarity index 95%
rename from lib/aethyr/core/commands/acexit.rb
rename to lib/aethyr/core/commands/admin/acexit.rb
index af3c01ef16ab0dc27ec1eff685ad71d0ce2e52a1..196494de5c96dfa840f05754a721e8913716c207 100644
--- a/lib/aethyr/core/commands/acexit.rb
+++ b/lib/aethyr/core/commands/admin/acexit.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Acexit
-        class AcexitHandler < Aethyr::Extend::CommandHandler
+        class AcexitHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["acexit"])
           end
diff --git a/lib/aethyr/core/commands/acomm.rb b/lib/aethyr/core/commands/admin/acomm.rb
similarity index 92%
rename from lib/aethyr/core/commands/acomm.rb
rename to lib/aethyr/core/commands/admin/acomm.rb
index 43d6beb5b5c2dd5841b1107b8e0099ab9db63d02..4faf52d1877b230c35672908e9b5177fe3760f0c 100644
--- a/lib/aethyr/core/commands/acomm.rb
+++ b/lib/aethyr/core/commands/admin/acomm.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Acomm
-        class AcommHandler < Aethyr::Extend::CommandHandler
+        class AcommHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["acomm"])
           end
diff --git a/lib/aethyr/core/commands/acomment.rb b/lib/aethyr/core/commands/admin/acomment.rb
similarity index 92%
rename from lib/aethyr/core/commands/acomment.rb
rename to lib/aethyr/core/commands/admin/acomment.rb
index 90aa4ac72c06bc32854396b4088b23a28c7571aa..1cd588925de6f5444755e2232eb8211a221f8725 100644
--- a/lib/aethyr/core/commands/acomment.rb
+++ b/lib/aethyr/core/commands/admin/acomment.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Acomment
-        class AcommentHandler < Aethyr::Extend::CommandHandler
+        class AcommentHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["acomment"])
           end
diff --git a/lib/aethyr/core/commands/aconfig.rb b/lib/aethyr/core/commands/admin/aconfig.rb
similarity index 94%
rename from lib/aethyr/core/commands/aconfig.rb
rename to lib/aethyr/core/commands/admin/aconfig.rb
index 4608a1a11dcdd8a8d94b2a8e3308b080e139bd5e..f5c5f995173035c27af55fcb3eb6ab18dda15ce8 100644
--- a/lib/aethyr/core/commands/aconfig.rb
+++ b/lib/aethyr/core/commands/admin/aconfig.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Aconfig
-        class AconfigHandler < Aethyr::Extend::CommandHandler
+        class AconfigHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["aconfig"])
           end
diff --git a/lib/aethyr/core/commands/acportal.rb b/lib/aethyr/core/commands/admin/acportal.rb
similarity index 93%
rename from lib/aethyr/core/commands/acportal.rb
rename to lib/aethyr/core/commands/admin/acportal.rb
index d37da603df6954403a50b50a639dc080162c511a..6b75b5f0e62521146e10356fcda1d90439b158ac 100644
--- a/lib/aethyr/core/commands/acportal.rb
+++ b/lib/aethyr/core/commands/admin/acportal.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Acportal
-        class AcportalHandler < Aethyr::Extend::CommandHandler
+        class AcportalHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["acportal"])
           end
diff --git a/lib/aethyr/core/commands/acprop.rb b/lib/aethyr/core/commands/admin/acprop.rb
similarity index 95%
rename from lib/aethyr/core/commands/acprop.rb
rename to lib/aethyr/core/commands/admin/acprop.rb
index 9dabd8a9e656a978913e23f0faf354bd10babe59..1f73bca3b5e85257786543ff7016e275f1fba5ed 100644
--- a/lib/aethyr/core/commands/acprop.rb
+++ b/lib/aethyr/core/commands/admin/acprop.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Acprop
-        class AcpropHandler < Aethyr::Extend::CommandHandler
+        class AcpropHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["acprop"])
           end
diff --git a/lib/aethyr/core/commands/acreate.rb b/lib/aethyr/core/commands/admin/acreate.rb
similarity index 95%
rename from lib/aethyr/core/commands/acreate.rb
rename to lib/aethyr/core/commands/admin/acreate.rb
index 181bd601f6b874773700f24260ec7a92d08c442d..a3748f5816f2034a9e6d10a87ee233da07987ba6 100644
--- a/lib/aethyr/core/commands/acreate.rb
+++ b/lib/aethyr/core/commands/admin/acreate.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Acreate
-        class AcreateHandler < Aethyr::Extend::CommandHandler
+        class AcreateHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["acreate"])
           end
diff --git a/lib/aethyr/core/commands/acroom.rb b/lib/aethyr/core/commands/admin/acroom.rb
similarity index 98%
rename from lib/aethyr/core/commands/acroom.rb
rename to lib/aethyr/core/commands/admin/acroom.rb
index 2d18bc5c9e72c69fce722c1384d2764738f80591..283ebeeb03ba1d6f6f1a48f462b68e85a68da08c 100644
--- a/lib/aethyr/core/commands/acroom.rb
+++ b/lib/aethyr/core/commands/admin/acroom.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Acroom
-        class AcroomHandler < Aethyr::Extend::CommandHandler
+        class AcroomHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["acroom"])
           end
diff --git a/lib/aethyr/core/commands/adelete.rb b/lib/aethyr/core/commands/admin/adelete.rb
similarity index 96%
rename from lib/aethyr/core/commands/adelete.rb
rename to lib/aethyr/core/commands/admin/adelete.rb
index 1590254323533ba821b028bf5a30d4421484f56a..6d0cfce6fb5f36fe24b91415242a708639c040e5 100644
--- a/lib/aethyr/core/commands/adelete.rb
+++ b/lib/aethyr/core/commands/admin/adelete.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Adelete
-        class AdeleteHandler < Aethyr::Extend::CommandHandler
+        class AdeleteHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["adelete"])
           end
diff --git a/lib/aethyr/core/commands/adesc.rb b/lib/aethyr/core/commands/admin/adesc.rb
similarity index 95%
rename from lib/aethyr/core/commands/adesc.rb
rename to lib/aethyr/core/commands/admin/adesc.rb
index 2163a22fb0f745b4da966861c06999bcb3d2d076..55ed33cc058485b3cafce9645c91a27230eedc5e 100644
--- a/lib/aethyr/core/commands/adesc.rb
+++ b/lib/aethyr/core/commands/admin/adesc.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Adesc
-        class AdescHandler < Aethyr::Extend::CommandHandler
+        class AdescHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["adesc"])
           end
diff --git a/lib/aethyr/core/commands/admin/admin_handler.rb b/lib/aethyr/core/commands/admin/admin_handler.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7df4a8e6de86bcbe6acbec5a47eafe0161537ed0
--- /dev/null
+++ b/lib/aethyr/core/commands/admin/admin_handler.rb
@@ -0,0 +1,31 @@
+require 'aethyr/core/commands/command_handler'
+
+module Aethyr
+  module Extend
+    class AdminHandler < CommandHandler
+      def initialize(player, commands, *args)
+        super(player, commands, *args)
+      end
+
+      protected
+      #Tail a file
+      def tail file, lines = 10
+        require 'util/tail'
+
+        output = []
+        File::Tail::Logfile.tail(file, :backward => lines, :return_if_eof => true) do |line|
+          output << line.strip
+        end
+
+        output << "(#{output.length} lines shown.)"
+      end
+
+      #Looks in player's inventory and room for name.
+      #Then checks at global level for GOID.
+      def find_object(name, event)
+        $manager.find(name, event[:player]) || $manager.find(name, event[:player].container) || $manager.get_object(name)
+      end
+
+    end
+  end
+end
diff --git a/lib/aethyr/core/commands/aforce.rb b/lib/aethyr/core/commands/admin/aforce.rb
similarity index 93%
rename from lib/aethyr/core/commands/aforce.rb
rename to lib/aethyr/core/commands/admin/aforce.rb
index 5ae6ab2d0677575ed6a15aba49bb6527bb44ce4a..33be7130d29cd96924465f9a62d3ba4a102aa083 100644
--- a/lib/aethyr/core/commands/aforce.rb
+++ b/lib/aethyr/core/commands/admin/aforce.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Aforce
-        class AforceHandler < Aethyr::Extend::CommandHandler
+        class AforceHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["aforce"])
           end
diff --git a/lib/aethyr/core/commands/ahelp.rb b/lib/aethyr/core/commands/admin/ahelp.rb
similarity index 91%
rename from lib/aethyr/core/commands/ahelp.rb
rename to lib/aethyr/core/commands/admin/ahelp.rb
index ed425f558a701a37dda3ce05ca0f584b075e42a8..fdd86b09d081544e5beb20e094888b9331e3508c 100644
--- a/lib/aethyr/core/commands/ahelp.rb
+++ b/lib/aethyr/core/commands/admin/ahelp.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Ahelp
-        class AhelpHandler < Aethyr::Extend::CommandHandler
+        class AhelpHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["ahelp"])
           end
diff --git a/lib/aethyr/core/commands/ahide.rb b/lib/aethyr/core/commands/admin/ahide.rb
similarity index 93%
rename from lib/aethyr/core/commands/ahide.rb
rename to lib/aethyr/core/commands/admin/ahide.rb
index 27446ab569c1e9ba0c2f029f03ebab5fd429d637..c044d6be0fefe3bf0976ff8b4131be1afe8e0a2c 100644
--- a/lib/aethyr/core/commands/ahide.rb
+++ b/lib/aethyr/core/commands/admin/ahide.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Ahide
-        class AhideHandler < Aethyr::Extend::CommandHandler
+        class AhideHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["ahide"])
           end
diff --git a/lib/aethyr/core/commands/ainfo.rb b/lib/aethyr/core/commands/admin/ainfo.rb
similarity index 97%
rename from lib/aethyr/core/commands/ainfo.rb
rename to lib/aethyr/core/commands/admin/ainfo.rb
index ba0176891713c9df9e98726b6b88cf806f2c3de2..4d4289c52399a5dd807fa0eb4a7d0468bd36d0de 100644
--- a/lib/aethyr/core/commands/ainfo.rb
+++ b/lib/aethyr/core/commands/admin/ainfo.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Ainfo
-        class AinfoHandler < Aethyr::Extend::CommandHandler
+        class AinfoHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["ainfo"])
           end
diff --git a/lib/aethyr/core/commands/alearn.rb b/lib/aethyr/core/commands/admin/alearn.rb
similarity index 90%
rename from lib/aethyr/core/commands/alearn.rb
rename to lib/aethyr/core/commands/admin/alearn.rb
index 951a03530c7da52a32bb236bd9b96fe1620c9c78..ebaec22120e1bd5436138a4498211fcd2ab28bc8 100644
--- a/lib/aethyr/core/commands/alearn.rb
+++ b/lib/aethyr/core/commands/admin/alearn.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Alearn
-        class AlearnHandler < Aethyr::Extend::CommandHandler
+        class AlearnHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["alearn"])
           end
diff --git a/lib/aethyr/core/commands/alist.rb b/lib/aethyr/core/commands/admin/alist.rb
similarity index 94%
rename from lib/aethyr/core/commands/alist.rb
rename to lib/aethyr/core/commands/admin/alist.rb
index 9dafa74feca433a74162dee8842a5dc435162155..0b6a29785e4bee2a33e851e871b64e6c465eb3c8 100644
--- a/lib/aethyr/core/commands/alist.rb
+++ b/lib/aethyr/core/commands/admin/alist.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Alist
-        class AlistHandler < Aethyr::Extend::CommandHandler
+        class AlistHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["alist"])
           end
diff --git a/lib/aethyr/core/commands/alog.rb b/lib/aethyr/core/commands/admin/alog.rb
similarity index 96%
rename from lib/aethyr/core/commands/alog.rb
rename to lib/aethyr/core/commands/admin/alog.rb
index 0a55bd6577304097fc1407abdc65b66d03472519..2ead2ec49f94835c33be2084340a70aa1e4e8fe5 100644
--- a/lib/aethyr/core/commands/alog.rb
+++ b/lib/aethyr/core/commands/admin/alog.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Alog
-        class AlogHandler < Aethyr::Extend::CommandHandler
+        class AlogHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["alog"])
           end
diff --git a/lib/aethyr/core/commands/alook.rb b/lib/aethyr/core/commands/admin/alook.rb
similarity index 95%
rename from lib/aethyr/core/commands/alook.rb
rename to lib/aethyr/core/commands/admin/alook.rb
index 075ba5ab4bdf6226dd287f443962c2119847f1ac..a162b26fc78059663780ec854a063d5519914ad0 100644
--- a/lib/aethyr/core/commands/alook.rb
+++ b/lib/aethyr/core/commands/admin/alook.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Alook
-        class AlookHandler < Aethyr::Extend::CommandHandler
+        class AlookHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["alook"])
           end
diff --git a/lib/aethyr/core/commands/aput.rb b/lib/aethyr/core/commands/admin/aput.rb
similarity index 96%
rename from lib/aethyr/core/commands/aput.rb
rename to lib/aethyr/core/commands/admin/aput.rb
index e241977d800e3db19ed21b5780b7f3a7738d3752..620c478f11fd3722211aee6603133f84e554dd88 100644
--- a/lib/aethyr/core/commands/aput.rb
+++ b/lib/aethyr/core/commands/admin/aput.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Aput
-        class AputHandler < Aethyr::Extend::CommandHandler
+        class AputHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["aput"])
           end
diff --git a/lib/aethyr/core/commands/areact.rb b/lib/aethyr/core/commands/admin/areact.rb
similarity index 97%
rename from lib/aethyr/core/commands/areact.rb
rename to lib/aethyr/core/commands/admin/areact.rb
index efe803bc5bf1295bde06dda6b62eb0442ae378f7..afc11308b170107b3068be15eb09eae69ef73692 100644
--- a/lib/aethyr/core/commands/areact.rb
+++ b/lib/aethyr/core/commands/admin/areact.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Areact
-        class AreactHandler < Aethyr::Extend::CommandHandler
+        class AreactHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["areact"])
           end
diff --git a/lib/aethyr/core/commands/areas.rb b/lib/aethyr/core/commands/admin/areas.rb
similarity index 92%
rename from lib/aethyr/core/commands/areas.rb
rename to lib/aethyr/core/commands/admin/areas.rb
index 549bcf26f8a081ef32ad2f8271a4b8f20165f91d..ec4497df2d2377ce64925f75e0f8d8ab0baa8579 100644
--- a/lib/aethyr/core/commands/areas.rb
+++ b/lib/aethyr/core/commands/admin/areas.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Areas
-        class AreasHandler < Aethyr::Extend::CommandHandler
+        class AreasHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["areas"])
           end
diff --git a/lib/aethyr/core/commands/areload.rb b/lib/aethyr/core/commands/admin/areload.rb
similarity index 92%
rename from lib/aethyr/core/commands/areload.rb
rename to lib/aethyr/core/commands/admin/areload.rb
index bf108ef7d3320ae030e5fd7229089d7ec32f94a3..f9730958707dc661d7815deab6dc3fafa2b9b7a0 100644
--- a/lib/aethyr/core/commands/areload.rb
+++ b/lib/aethyr/core/commands/admin/areload.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Areload
-        class AreloadHandler < Aethyr::Extend::CommandHandler
+        class AreloadHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["areload"])
           end
diff --git a/lib/aethyr/core/commands/asave.rb b/lib/aethyr/core/commands/admin/asave.rb
similarity index 91%
rename from lib/aethyr/core/commands/asave.rb
rename to lib/aethyr/core/commands/admin/asave.rb
index 82d6fb8391fa45d8b2fab92c5856303a7e6c7413..c3dd7628d4f71629c4fc2fba520639418428faa5 100644
--- a/lib/aethyr/core/commands/asave.rb
+++ b/lib/aethyr/core/commands/admin/asave.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Asave
-        class AsaveHandler < Aethyr::Extend::CommandHandler
+        class AsaveHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["asave"])
           end
diff --git a/lib/aethyr/core/commands/aset.rb b/lib/aethyr/core/commands/admin/aset.rb
similarity index 98%
rename from lib/aethyr/core/commands/aset.rb
rename to lib/aethyr/core/commands/admin/aset.rb
index 970c7113bb14e86442e1d239870539049786b2ab..75c0998dcf58e131809a87e992e606408be79bb3 100644
--- a/lib/aethyr/core/commands/aset.rb
+++ b/lib/aethyr/core/commands/admin/aset.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Aset
-        class AsetHandler < Aethyr::Extend::CommandHandler
+        class AsetHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["aset", "aset!"])
           end
diff --git a/lib/aethyr/core/commands/ashow.rb b/lib/aethyr/core/commands/admin/ashow.rb
similarity index 93%
rename from lib/aethyr/core/commands/ashow.rb
rename to lib/aethyr/core/commands/admin/ashow.rb
index 994ed18dccb45a338f1d2ccc00e071fd8492ff58..d3827b447d45d5def35393abba316c024e5a9fb8 100644
--- a/lib/aethyr/core/commands/ashow.rb
+++ b/lib/aethyr/core/commands/admin/ashow.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Ashow
-        class AshowHandler < Aethyr::Extend::CommandHandler
+        class AshowHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["ashow"])
           end
diff --git a/lib/aethyr/core/commands/astatus.rb b/lib/aethyr/core/commands/admin/astatus.rb
similarity index 92%
rename from lib/aethyr/core/commands/astatus.rb
rename to lib/aethyr/core/commands/admin/astatus.rb
index d1ab37bbb38202711cd75440386ea6c31a4c74af..526739a5ac1cf48657b1bb775595777269273f15 100644
--- a/lib/aethyr/core/commands/astatus.rb
+++ b/lib/aethyr/core/commands/admin/astatus.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Astatus
-        class AstatusHandler < Aethyr::Extend::CommandHandler
+        class AstatusHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["astatus"])
           end
diff --git a/lib/aethyr/core/commands/ateach.rb b/lib/aethyr/core/commands/admin/ateach.rb
similarity index 92%
rename from lib/aethyr/core/commands/ateach.rb
rename to lib/aethyr/core/commands/admin/ateach.rb
index 80a68324269548b5405a3abb7e0633cea9bcec9f..067c570377d255a927362d75750af9425d3ed09c 100644
--- a/lib/aethyr/core/commands/ateach.rb
+++ b/lib/aethyr/core/commands/admin/ateach.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Ateach
-        class AteachHandler < Aethyr::Extend::CommandHandler
+        class AteachHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["ateach"])
           end
diff --git a/lib/aethyr/core/commands/awatch.rb b/lib/aethyr/core/commands/admin/awatch.rb
similarity index 96%
rename from lib/aethyr/core/commands/awatch.rb
rename to lib/aethyr/core/commands/admin/awatch.rb
index b0e7da0767b1c15f619f62fc11ad3c797b58ca0b..988f43495fd74e3a72c120834fd107fc0db42a81 100644
--- a/lib/aethyr/core/commands/awatch.rb
+++ b/lib/aethyr/core/commands/admin/awatch.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Awatch
-        class AwatchHandler < Aethyr::Extend::CommandHandler
+        class AwatchHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["awatch"])
           end
diff --git a/lib/aethyr/core/commands/awho.rb b/lib/aethyr/core/commands/admin/awho.rb
similarity index 92%
rename from lib/aethyr/core/commands/awho.rb
rename to lib/aethyr/core/commands/admin/awho.rb
index 536afc803641fa3d46e84793593821ace0dd6850..4ce2ff787549ab49a48b23d0b7cc516f1e61c730 100644
--- a/lib/aethyr/core/commands/awho.rb
+++ b/lib/aethyr/core/commands/admin/awho.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Awho
-        class AwhoHandler < Aethyr::Extend::CommandHandler
+        class AwhoHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["awho"])
           end
diff --git a/lib/aethyr/core/commands/deleteplayer.rb b/lib/aethyr/core/commands/admin/deleteplayer.rb
similarity index 94%
rename from lib/aethyr/core/commands/deleteplayer.rb
rename to lib/aethyr/core/commands/admin/deleteplayer.rb
index d97d5c6e480422efbc4a24de1bcea7ebb94451f3..ddfdb0865c6d12af1fb9e9b57dd914749bb71d99 100644
--- a/lib/aethyr/core/commands/deleteplayer.rb
+++ b/lib/aethyr/core/commands/admin/deleteplayer.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Deleteplayer
-        class DeleteplayerHandler < Aethyr::Extend::CommandHandler
+        class DeleteplayerHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["deleteplayer"])
           end
diff --git a/lib/aethyr/core/commands/restart.rb b/lib/aethyr/core/commands/admin/restart.rb
similarity index 90%
rename from lib/aethyr/core/commands/restart.rb
rename to lib/aethyr/core/commands/admin/restart.rb
index 770a2026bbd47a53aeb6f5d7b3d61481bed7529e..47c4b556f7e5d9753c30442a74a86d8a0a0bc6bc 100644
--- a/lib/aethyr/core/commands/restart.rb
+++ b/lib/aethyr/core/commands/admin/restart.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Restart
-        class RestartHandler < Aethyr::Extend::CommandHandler
+        class RestartHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["restart"])
           end
diff --git a/lib/aethyr/core/commands/terrain.rb b/lib/aethyr/core/commands/admin/terrain.rb
similarity index 96%
rename from lib/aethyr/core/commands/terrain.rb
rename to lib/aethyr/core/commands/admin/terrain.rb
index 06834092dbc1d66f260ab007ec754f491b0284b0..a13f1ab89c2842569c2b7c3fb58c5262dea156ed 100644
--- a/lib/aethyr/core/commands/terrain.rb
+++ b/lib/aethyr/core/commands/admin/terrain.rb
@@ -1,11 +1,11 @@
 require "aethyr/core/registry"
-require "aethyr/core/commands/command_handler"
+require "aethyr/core/commands/admin/admin_handler"
 
 module Aethyr
   module Core
     module Commands
       module Terrain
-        class TerrainHandler < Aethyr::Extend::CommandHandler
+        class TerrainHandler < Aethyr::Extend::AdminHandler
           def initialize(player)
             super(player, ["terrain"])
           end
diff --git a/lib/aethyr/core/commands/emotes/emote_handler.rb b/lib/aethyr/core/commands/emotes/emote_handler.rb
index e3fdfaa693c5d32b7714c5497ef74bdea1dc85fe..d40e8a22fe1cfc52141523a97ff57dc97f732cb6 100644
--- a/lib/aethyr/core/commands/emotes/emote_handler.rb
+++ b/lib/aethyr/core/commands/emotes/emote_handler.rb
@@ -1,4 +1,4 @@
-require 'aethyr/core/commands/help_handler'
+require 'aethyr/core/commands/command_handler'
 
 module Aethyr
   module Extend