diff --git a/modpol_minetest/chatcommands/chatcommands.lua b/modpol_minetest/chatcommands/chatcommands.lua
index ef6c7b5..ff93f7d 100644
--- a/modpol_minetest/chatcommands/chatcommands.lua
+++ b/modpol_minetest/chatcommands/chatcommands.lua
@@ -34,7 +34,7 @@ regchat(
    "reset", {
       privs = {},
       func = function(user)
-         modpol.reset_orgs();
+         modpol.orgs.reset();
          return true, "Reset orgs"
       end,
 })
@@ -51,7 +51,7 @@ regchat(
    "addorg", {
       privs        = {} ,
       func         = function (user, param)
-         local success, message = modpol.add_org (param, { user })
+         local success, message = modpol.instance:add_org (param)
          return true, message
       end        
 })
@@ -67,7 +67,7 @@ regchat(
    "listorg", {
       privs = {} ,
       func  = function (user, param)
-          return true, "Orgs:\n" .. modpol.list_orgs()
+          return true, "Orgs:\n" .. modpol.orgs.list_all()
       end
 })
 
@@ -88,8 +88,8 @@ regchat(
    "joinorg", {
       privs = {},
       func = function(user, param)
-         local org_id = modpol.get_org_id_by_name(param)
-         local success, result = modpol.add_member(org_id, user)
+         local org = modpol.orgs.get_org(param)
+         local success, result = org:add_member(user)
          return true, result
       end,
 })