Move commands into %admin, add some admin commands