diff --git a/plugins/dynamic-security/CMakeLists.txt b/plugins/dynamic-security/CMakeLists.txt
index 35fcc208..0ece1296 100644
--- a/plugins/dynamic-security/CMakeLists.txt
+++ b/plugins/dynamic-security/CMakeLists.txt
@@ -24,6 +24,8 @@ if(CJSON_FOUND AND WITH_TLS)
 		clientlist.c
 		config.c
 		config_init.c
+		control.c
+		default_acl.c
 		dynamic_security.h
 		groups.c
 		grouplist.c
diff --git a/plugins/dynamic-security/Makefile b/plugins/dynamic-security/Makefile
index ccba9143..020ec145 100644
--- a/plugins/dynamic-security/Makefile
+++ b/plugins/dynamic-security/Makefile
@@ -16,6 +16,8 @@ OBJS=	\
 		clientlist.o \
 		config.o \
 		config_init.o \
+		control.o \
+		default_acl.o \
 		groups.o \
 		grouplist.o \
 		hash.o \
@@ -63,6 +65,12 @@ config.o : config.c dynamic_security.h
 config_init.o : config_init.c dynamic_security.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@
 
+control.o : control.c dynamic_security.h
+	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@
+
+default_acl.o : default_acl.c dynamic_security.h
+	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@
+
 groups.o : groups.c dynamic_security.h
 	${CROSS_COMPILE}${CC} $(LOCAL_CPPFLAGS) $(PLUGIN_CPPFLAGS) $(PLUGIN_CFLAGS) -c $< -o $@
 
diff --git a/plugins/dynamic-security/control.c b/plugins/dynamic-security/control.c
new file mode 100644
index 00000000..fd473354
--- /dev/null
+++ b/plugins/dynamic-security/control.c
@@ -0,0 +1,238 @@
+/*
+Copyright (c) 2020-2021 Roger Light <roger@atchoo.org>
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License 2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   https://www.eclipse.org/legal/epl-2.0/
+and the Eclipse Distribution License is available at
+  http://www.eclipse.org/org/documents/edl-v10.php.
+
+SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+Contributors:
+   Roger Light - initial implementation and documentation.
+*/
+
+#include "config.h"
+
+#include <cjson/cJSON.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include "json_help.h"
+#include "mosquitto.h"
+#include "mosquitto_broker.h"
+#include "mosquitto_plugin.h"
+#include "mqtt_protocol.h"
+
+#include "dynamic_security.h"
+
+void dynsec__command_reply(cJSON *j_responses, struct mosquitto *context, const char *command, const char *error, const char *correlation_data)
+{
+	cJSON *j_response;
+
+	UNUSED(context);
+
+	j_response = cJSON_CreateObject();
+	if(j_response == NULL) return;
+
+	if(cJSON_AddStringToObject(j_response, "command", command) == NULL
+			|| (error && cJSON_AddStringToObject(j_response, "error", error) == NULL)
+			|| (correlation_data && cJSON_AddStringToObject(j_response, "correlationData", correlation_data) == NULL)
+			){
+
+		cJSON_Delete(j_response);
+		return;
+	}
+
+	cJSON_AddItemToArray(j_responses, j_response);
+}
+
+
+static void send_response(cJSON *tree)
+{
+	char *payload;
+	size_t payload_len;
+
+	payload = cJSON_PrintUnformatted(tree);
+	cJSON_Delete(tree);
+	if(payload == NULL) return;
+
+	payload_len = strlen(payload);
+	if(payload_len > MQTT_MAX_PAYLOAD){
+		free(payload);
+		return;
+	}
+	mosquitto_broker_publish(NULL, "$CONTROL/dynamic-security/v1/response",
+			(int)payload_len, payload, 0, 0, NULL);
+}
+
+
+int dynsec_control_callback(int event, void *event_data, void *userdata)
+{
+	struct mosquitto_evt_control *ed = event_data;
+	cJSON *tree, *commands;
+	cJSON *j_response_tree, *j_responses;
+
+	UNUSED(event);
+	UNUSED(userdata);
+
+	/* Create object for responses */
+	j_response_tree = cJSON_CreateObject();
+	if(j_response_tree == NULL){
+		return MOSQ_ERR_NOMEM;
+	}
+	j_responses = cJSON_CreateArray();
+	if(j_responses == NULL){
+		cJSON_Delete(j_response_tree);
+		return MOSQ_ERR_NOMEM;
+	}
+	cJSON_AddItemToObject(j_response_tree, "responses", j_responses);
+
+
+	/* Parse cJSON tree.
+	 * Using cJSON_ParseWithLength() is the best choice here, but Mosquitto
+	 * always adds an extra 0 to the end of the payload memory, so using
+	 * cJSON_Parse() on its own will still not overrun. */
+#if CJSON_VERSION_FULL < 1007013
+	tree = cJSON_Parse(ed->payload);
+#else
+	tree = cJSON_ParseWithLength(ed->payload, ed->payloadlen);
+#endif
+	if(tree == NULL){
+		dynsec__command_reply(j_responses, ed->client, "Unknown command", "Payload not valid JSON", NULL);
+		send_response(j_response_tree);
+		return MOSQ_ERR_SUCCESS;
+	}
+	commands = cJSON_GetObjectItem(tree, "commands");
+	if(commands == NULL || !cJSON_IsArray(commands)){
+		cJSON_Delete(tree);
+		dynsec__command_reply(j_responses, ed->client, "Unknown command", "Invalid/missing commands", NULL);
+		send_response(j_response_tree);
+		return MOSQ_ERR_SUCCESS;
+	}
+
+	/* Handle commands */
+	dynsec__handle_control(j_responses, ed->client, commands);
+	cJSON_Delete(tree);
+
+	send_response(j_response_tree);
+
+	return MOSQ_ERR_SUCCESS;
+}
+
+
+/* ################################################################
+ * #
+ * # $CONTROL/dynamic-security/v1 handler
+ * #
+ * ################################################################ */
+
+int dynsec__handle_control(cJSON *j_responses, struct mosquitto *context, cJSON *commands)
+{
+	int rc = MOSQ_ERR_SUCCESS;
+	cJSON *aiter;
+	char *command;
+	char *correlation_data = NULL;
+
+	cJSON_ArrayForEach(aiter, commands){
+		if(cJSON_IsObject(aiter)){
+			if(json_get_string(aiter, "command", &command, false) == MOSQ_ERR_SUCCESS){
+				if(json_get_string(aiter, "correlationData", &correlation_data, true) != MOSQ_ERR_SUCCESS){
+					dynsec__command_reply(j_responses, context, command, "Invalid correlationData data type.", NULL);
+					return MOSQ_ERR_INVAL;
+				}
+
+				/* Plugin */
+				if(!strcasecmp(command, "setDefaultACLAccess")){
+					rc = dynsec__process_set_default_acl_access(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "getDefaultACLAccess")){
+					rc = dynsec__process_get_default_acl_access(j_responses, context, aiter, correlation_data);
+
+				/* Clients */
+				}else if(!strcasecmp(command, "createClient")){
+					rc = dynsec_clients__process_create(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "deleteClient")){
+					rc = dynsec_clients__process_delete(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "getClient")){
+					rc = dynsec_clients__process_get(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "listClients")){
+					rc = dynsec_clients__process_list(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "modifyClient")){
+					rc = dynsec_clients__process_modify(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "setClientPassword")){
+					rc = dynsec_clients__process_set_password(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "setClientId")){
+					rc = dynsec_clients__process_set_id(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "addClientRole")){
+					rc = dynsec_clients__process_add_role(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "removeClientRole")){
+					rc = dynsec_clients__process_remove_role(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "enableClient")){
+					rc = dynsec_clients__process_enable(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "disableClient")){
+					rc = dynsec_clients__process_disable(j_responses, context, aiter, correlation_data);
+
+				/* Groups */
+				}else if(!strcasecmp(command, "addGroupClient")){
+					rc = dynsec_groups__process_add_client(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "createGroup")){
+					rc = dynsec_groups__process_create(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "deleteGroup")){
+					rc = dynsec_groups__process_delete(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "getGroup")){
+					rc = dynsec_groups__process_get(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "listGroups")){
+					rc = dynsec_groups__process_list(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "modifyGroup")){
+					rc = dynsec_groups__process_modify(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "removeGroupClient")){
+					rc = dynsec_groups__process_remove_client(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "addGroupRole")){
+					rc = dynsec_groups__process_add_role(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "removeGroupRole")){
+					rc = dynsec_groups__process_remove_role(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "setAnonymousGroup")){
+					rc = dynsec_groups__process_set_anonymous_group(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "getAnonymousGroup")){
+					rc = dynsec_groups__process_get_anonymous_group(j_responses, context, aiter, correlation_data);
+
+				/* Roles */
+				}else if(!strcasecmp(command, "createRole")){
+					rc = dynsec_roles__process_create(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "getRole")){
+					rc = dynsec_roles__process_get(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "listRoles")){
+					rc = dynsec_roles__process_list(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "modifyRole")){
+					rc = dynsec_roles__process_modify(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "deleteRole")){
+					rc = dynsec_roles__process_delete(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "addRoleACL")){
+					rc = dynsec_roles__process_add_acl(j_responses, context, aiter, correlation_data);
+				}else if(!strcasecmp(command, "removeRoleACL")){
+					rc = dynsec_roles__process_remove_acl(j_responses, context, aiter, correlation_data);
+
+				/* Unknown */
+				}else{
+					dynsec__command_reply(j_responses, context, command, "Unknown command", correlation_data);
+					rc = MOSQ_ERR_INVAL;
+				}
+			}else{
+				dynsec__command_reply(j_responses, context, "Unknown command", "Missing command", correlation_data);
+				rc = MOSQ_ERR_INVAL;
+			}
+		}else{
+			dynsec__command_reply(j_responses, context, "Unknown command", "Command not an object", correlation_data);
+			rc = MOSQ_ERR_INVAL;
+		}
+	}
+
+	return rc;
+}
diff --git a/plugins/dynamic-security/default_acl.c b/plugins/dynamic-security/default_acl.c
new file mode 100644
index 00000000..befc490a
--- /dev/null
+++ b/plugins/dynamic-security/default_acl.c
@@ -0,0 +1,178 @@
+/*
+Copyright (c) 2020-2021 Roger Light <roger@atchoo.org>
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License 2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+   https://www.eclipse.org/legal/epl-2.0/
+and the Eclipse Distribution License is available at
+  http://www.eclipse.org/org/documents/edl-v10.php.
+
+SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+
+Contributors:
+   Roger Light - initial implementation and documentation.
+*/
+
+#include "config.h"
+
+#include <cjson/cJSON.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include "json_help.h"
+#include "mosquitto.h"
+#include "mosquitto_broker.h"
+#include "mosquitto_plugin.h"
+#include "mqtt_protocol.h"
+
+#include "dynamic_security.h"
+
+struct dynsec__acl_default_access default_access = {false, false, false, false};
+
+int dynsec__process_set_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data)
+{
+	cJSON *j_actions, *j_action, *j_acltype, *j_allow;
+	bool allow;
+	const char *admin_clientid, *admin_username;
+
+	j_actions = cJSON_GetObjectItem(command, "acls");
+	if(j_actions == NULL || !cJSON_IsArray(j_actions)){
+		dynsec__command_reply(j_responses, context, "setDefaultACLAccess", "Missing/invalid actions array", correlation_data);
+		return MOSQ_ERR_INVAL;
+	}
+
+	admin_clientid = mosquitto_client_id(context);
+	admin_username = mosquitto_client_username(context);
+
+	cJSON_ArrayForEach(j_action, j_actions){
+		j_acltype = cJSON_GetObjectItem(j_action, "acltype");
+		j_allow = cJSON_GetObjectItem(j_action, "allow");
+		if(j_acltype && cJSON_IsString(j_acltype)
+					&& j_allow && cJSON_IsBool(j_allow)){
+
+			allow = cJSON_IsTrue(j_allow);
+
+			if(!strcasecmp(j_acltype->valuestring, ACL_TYPE_PUB_C_SEND)){
+				default_access.publish_c_send = allow;
+			}else if(!strcasecmp(j_acltype->valuestring, ACL_TYPE_PUB_C_RECV)){
+				default_access.publish_c_recv = allow;
+			}else if(!strcasecmp(j_acltype->valuestring, ACL_TYPE_SUB_GENERIC)){
+				default_access.subscribe = allow;
+			}else if(!strcasecmp(j_acltype->valuestring, ACL_TYPE_UNSUB_GENERIC)){
+				default_access.unsubscribe = allow;
+			}
+			mosquitto_log_printf(MOSQ_LOG_INFO, "dynsec: %s/%s | setDefaultACLAccess | acltype=%s | allow=%s",
+					admin_clientid, admin_username, j_acltype->valuestring, allow?"true":"false");
+		}
+	}
+
+	dynsec__config_save();
+	dynsec__command_reply(j_responses, context, "setDefaultACLAccess", NULL, correlation_data);
+	return MOSQ_ERR_SUCCESS;
+}
+
+
+int dynsec__process_get_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data)
+{
+	cJSON *tree, *jtmp, *j_data, *j_acls, *j_acl;
+	const char *admin_clientid, *admin_username;
+
+	UNUSED(command);
+
+	tree = cJSON_CreateObject();
+	if(tree == NULL){
+		dynsec__command_reply(j_responses, context, "getDefaultACLAccess", "Internal error", correlation_data);
+		return MOSQ_ERR_NOMEM;
+	}
+
+	admin_clientid = mosquitto_client_id(context);
+	admin_username = mosquitto_client_username(context);
+	mosquitto_log_printf(MOSQ_LOG_INFO, "dynsec: %s/%s | getDefaultACLAccess",
+			admin_clientid, admin_username);
+
+	if(cJSON_AddStringToObject(tree, "command", "getDefaultACLAccess") == NULL
+		|| ((j_data = cJSON_AddObjectToObject(tree, "data")) == NULL)
+
+			){
+		goto internal_error;
+	}
+
+	j_acls = cJSON_AddArrayToObject(j_data, "acls");
+	if(j_acls == NULL){
+		goto internal_error;
+	}
+
+	/* publishClientSend */
+	j_acl = cJSON_CreateObject();
+	if(j_acl == NULL){
+		goto internal_error;
+	}
+	cJSON_AddItemToArray(j_acls, j_acl);
+	if(cJSON_AddStringToObject(j_acl, "acltype", ACL_TYPE_PUB_C_SEND) == NULL
+			|| cJSON_AddBoolToObject(j_acl, "allow", default_access.publish_c_send) == NULL
+			){
+
+		goto internal_error;
+	}
+
+	/* publishClientReceive */
+	j_acl = cJSON_CreateObject();
+	if(j_acl == NULL){
+		goto internal_error;
+	}
+	cJSON_AddItemToArray(j_acls, j_acl);
+	if(cJSON_AddStringToObject(j_acl, "acltype", ACL_TYPE_PUB_C_RECV) == NULL
+			|| cJSON_AddBoolToObject(j_acl, "allow", default_access.publish_c_recv) == NULL
+			){
+
+		goto internal_error;
+	}
+
+	/* subscribe */
+	j_acl = cJSON_CreateObject();
+	if(j_acl == NULL){
+		goto internal_error;
+	}
+	cJSON_AddItemToArray(j_acls, j_acl);
+	if(cJSON_AddStringToObject(j_acl, "acltype", ACL_TYPE_SUB_GENERIC) == NULL
+			|| cJSON_AddBoolToObject(j_acl, "allow", default_access.subscribe) == NULL
+			){
+
+		goto internal_error;
+	}
+
+	/* unsubscribe */
+	j_acl = cJSON_CreateObject();
+	if(j_acl == NULL){
+		goto internal_error;
+	}
+	cJSON_AddItemToArray(j_acls, j_acl);
+	if(cJSON_AddStringToObject(j_acl, "acltype", ACL_TYPE_UNSUB_GENERIC) == NULL
+			|| cJSON_AddBoolToObject(j_acl, "allow", default_access.unsubscribe) == NULL
+			){
+
+		goto internal_error;
+	}
+
+	cJSON_AddItemToArray(j_responses, tree);
+
+	if(correlation_data){
+		jtmp = cJSON_AddStringToObject(tree, "correlationData", correlation_data);
+		if(jtmp == NULL){
+			goto internal_error;
+		}
+	}
+
+	return MOSQ_ERR_SUCCESS;
+
+internal_error:
+	cJSON_Delete(tree);
+	dynsec__command_reply(j_responses, context, "getDefaultACLAccess", "Internal error", correlation_data);
+	return MOSQ_ERR_NOMEM;
+}
diff --git a/plugins/dynamic-security/dynamic_security.h b/plugins/dynamic-security/dynamic_security.h
index 13bd653e..adef7a35 100644
--- a/plugins/dynamic-security/dynamic_security.h
+++ b/plugins/dynamic-security/dynamic_security.h
@@ -145,6 +145,7 @@ void dynsec__config_save(void);
 int dynsec__config_load(void);
 int dynsec__handle_control(cJSON *j_responses, struct mosquitto *context, cJSON *commands);
 void dynsec__command_reply(cJSON *j_responses, struct mosquitto *context, const char *command, const char *error, const char *correlation_data);
+int dynsec_control_callback(int event, void *event_data, void *userdata);
 
 
 /* ################################################################
@@ -154,6 +155,8 @@ void dynsec__command_reply(cJSON *j_responses, struct mosquitto *context, const
  * ################################################################ */
 
 int dynsec__acl_check_callback(int event, void *event_data, void *userdata);
+int dynsec__process_set_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data);
+int dynsec__process_get_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data);
 
 
 /* ################################################################
diff --git a/plugins/dynamic-security/plugin.c b/plugins/dynamic-security/plugin.c
index 645bea57..419f051b 100644
--- a/plugins/dynamic-security/plugin.c
+++ b/plugins/dynamic-security/plugin.c
@@ -18,14 +18,12 @@ Contributors:
 
 #include "config.h"
 
-#include <cjson/cJSON.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 
-#include "json_help.h"
 #include "mosquitto.h"
 #include "mosquitto_broker.h"
 #include "mosquitto_plugin.h"
@@ -37,244 +35,6 @@ MOSQUITTO_PLUGIN_DECLARE_VERSION(5);
 
 static mosquitto_plugin_id_t *plg_id = NULL;
 char *g_config_file = NULL;
-struct dynsec__acl_default_access default_access = {false, false, false, false};
-
-void dynsec__command_reply(cJSON *j_responses, struct mosquitto *context, const char *command, const char *error, const char *correlation_data)
-{
-	cJSON *j_response;
-
-	UNUSED(context);
-
-	j_response = cJSON_CreateObject();
-	if(j_response == NULL) return;
-
-	if(cJSON_AddStringToObject(j_response, "command", command) == NULL
-			|| (error && cJSON_AddStringToObject(j_response, "error", error) == NULL)
-			|| (correlation_data && cJSON_AddStringToObject(j_response, "correlationData", correlation_data) == NULL)
-			){
-
-		cJSON_Delete(j_response);
-		return;
-	}
-
-	cJSON_AddItemToArray(j_responses, j_response);
-}
-
-
-static void send_response(cJSON *tree)
-{
-	char *payload;
-	size_t payload_len;
-
-	payload = cJSON_PrintUnformatted(tree);
-	cJSON_Delete(tree);
-	if(payload == NULL) return;
-
-	payload_len = strlen(payload);
-	if(payload_len > MQTT_MAX_PAYLOAD){
-		free(payload);
-		return;
-	}
-	mosquitto_broker_publish(NULL, "$CONTROL/dynamic-security/v1/response",
-			(int)payload_len, payload, 0, 0, NULL);
-}
-
-
-static int dynsec_control_callback(int event, void *event_data, void *userdata)
-{
-	struct mosquitto_evt_control *ed = event_data;
-	cJSON *tree, *commands;
-	cJSON *j_response_tree, *j_responses;
-
-	UNUSED(event);
-	UNUSED(userdata);
-
-	/* Create object for responses */
-	j_response_tree = cJSON_CreateObject();
-	if(j_response_tree == NULL){
-		return MOSQ_ERR_NOMEM;
-	}
-	j_responses = cJSON_CreateArray();
-	if(j_responses == NULL){
-		cJSON_Delete(j_response_tree);
-		return MOSQ_ERR_NOMEM;
-	}
-	cJSON_AddItemToObject(j_response_tree, "responses", j_responses);
-
-
-	/* Parse cJSON tree.
-	 * Using cJSON_ParseWithLength() is the best choice here, but Mosquitto
-	 * always adds an extra 0 to the end of the payload memory, so using
-	 * cJSON_Parse() on its own will still not overrun. */
-#if CJSON_VERSION_FULL < 1007013
-	tree = cJSON_Parse(ed->payload);
-#else
-	tree = cJSON_ParseWithLength(ed->payload, ed->payloadlen);
-#endif
-	if(tree == NULL){
-		dynsec__command_reply(j_responses, ed->client, "Unknown command", "Payload not valid JSON", NULL);
-		send_response(j_response_tree);
-		return MOSQ_ERR_SUCCESS;
-	}
-	commands = cJSON_GetObjectItem(tree, "commands");
-	if(commands == NULL || !cJSON_IsArray(commands)){
-		cJSON_Delete(tree);
-		dynsec__command_reply(j_responses, ed->client, "Unknown command", "Invalid/missing commands", NULL);
-		send_response(j_response_tree);
-		return MOSQ_ERR_SUCCESS;
-	}
-
-	/* Handle commands */
-	dynsec__handle_control(j_responses, ed->client, commands);
-	cJSON_Delete(tree);
-
-	send_response(j_response_tree);
-
-	return MOSQ_ERR_SUCCESS;
-}
-
-static int dynsec__process_set_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data)
-{
-	cJSON *j_actions, *j_action, *j_acltype, *j_allow;
-	bool allow;
-	const char *admin_clientid, *admin_username;
-
-	j_actions = cJSON_GetObjectItem(command, "acls");
-	if(j_actions == NULL || !cJSON_IsArray(j_actions)){
-		dynsec__command_reply(j_responses, context, "setDefaultACLAccess", "Missing/invalid actions array", correlation_data);
-		return MOSQ_ERR_INVAL;
-	}
-
-	admin_clientid = mosquitto_client_id(context);
-	admin_username = mosquitto_client_username(context);
-
-	cJSON_ArrayForEach(j_action, j_actions){
-		j_acltype = cJSON_GetObjectItem(j_action, "acltype");
-		j_allow = cJSON_GetObjectItem(j_action, "allow");
-		if(j_acltype && cJSON_IsString(j_acltype)
-					&& j_allow && cJSON_IsBool(j_allow)){
-
-			allow = cJSON_IsTrue(j_allow);
-
-			if(!strcasecmp(j_acltype->valuestring, ACL_TYPE_PUB_C_SEND)){
-				default_access.publish_c_send = allow;
-			}else if(!strcasecmp(j_acltype->valuestring, ACL_TYPE_PUB_C_RECV)){
-				default_access.publish_c_recv = allow;
-			}else if(!strcasecmp(j_acltype->valuestring, ACL_TYPE_SUB_GENERIC)){
-				default_access.subscribe = allow;
-			}else if(!strcasecmp(j_acltype->valuestring, ACL_TYPE_UNSUB_GENERIC)){
-				default_access.unsubscribe = allow;
-			}
-			mosquitto_log_printf(MOSQ_LOG_INFO, "dynsec: %s/%s | setDefaultACLAccess | acltype=%s | allow=%s",
-					admin_clientid, admin_username, j_acltype->valuestring, allow?"true":"false");
-		}
-	}
-
-	dynsec__config_save();
-	dynsec__command_reply(j_responses, context, "setDefaultACLAccess", NULL, correlation_data);
-	return MOSQ_ERR_SUCCESS;
-}
-
-
-static int dynsec__process_get_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data)
-{
-	cJSON *tree, *jtmp, *j_data, *j_acls, *j_acl;
-	const char *admin_clientid, *admin_username;
-
-	UNUSED(command);
-
-	tree = cJSON_CreateObject();
-	if(tree == NULL){
-		dynsec__command_reply(j_responses, context, "getDefaultACLAccess", "Internal error", correlation_data);
-		return MOSQ_ERR_NOMEM;
-	}
-
-	admin_clientid = mosquitto_client_id(context);
-	admin_username = mosquitto_client_username(context);
-	mosquitto_log_printf(MOSQ_LOG_INFO, "dynsec: %s/%s | getDefaultACLAccess",
-			admin_clientid, admin_username);
-
-	if(cJSON_AddStringToObject(tree, "command", "getDefaultACLAccess") == NULL
-		|| ((j_data = cJSON_AddObjectToObject(tree, "data")) == NULL)
-
-			){
-		goto internal_error;
-	}
-
-	j_acls = cJSON_AddArrayToObject(j_data, "acls");
-	if(j_acls == NULL){
-		goto internal_error;
-	}
-
-	/* publishClientSend */
-	j_acl = cJSON_CreateObject();
-	if(j_acl == NULL){
-		goto internal_error;
-	}
-	cJSON_AddItemToArray(j_acls, j_acl);
-	if(cJSON_AddStringToObject(j_acl, "acltype", ACL_TYPE_PUB_C_SEND) == NULL
-			|| cJSON_AddBoolToObject(j_acl, "allow", default_access.publish_c_send) == NULL
-			){
-
-		goto internal_error;
-	}
-
-	/* publishClientReceive */
-	j_acl = cJSON_CreateObject();
-	if(j_acl == NULL){
-		goto internal_error;
-	}
-	cJSON_AddItemToArray(j_acls, j_acl);
-	if(cJSON_AddStringToObject(j_acl, "acltype", ACL_TYPE_PUB_C_RECV) == NULL
-			|| cJSON_AddBoolToObject(j_acl, "allow", default_access.publish_c_recv) == NULL
-			){
-
-		goto internal_error;
-	}
-
-	/* subscribe */
-	j_acl = cJSON_CreateObject();
-	if(j_acl == NULL){
-		goto internal_error;
-	}
-	cJSON_AddItemToArray(j_acls, j_acl);
-	if(cJSON_AddStringToObject(j_acl, "acltype", ACL_TYPE_SUB_GENERIC) == NULL
-			|| cJSON_AddBoolToObject(j_acl, "allow", default_access.subscribe) == NULL
-			){
-
-		goto internal_error;
-	}
-
-	/* unsubscribe */
-	j_acl = cJSON_CreateObject();
-	if(j_acl == NULL){
-		goto internal_error;
-	}
-	cJSON_AddItemToArray(j_acls, j_acl);
-	if(cJSON_AddStringToObject(j_acl, "acltype", ACL_TYPE_UNSUB_GENERIC) == NULL
-			|| cJSON_AddBoolToObject(j_acl, "allow", default_access.unsubscribe) == NULL
-			){
-
-		goto internal_error;
-	}
-
-	cJSON_AddItemToArray(j_responses, tree);
-
-	if(correlation_data){
-		jtmp = cJSON_AddStringToObject(tree, "correlationData", correlation_data);
-		if(jtmp == NULL){
-			goto internal_error;
-		}
-	}
-
-	return MOSQ_ERR_SUCCESS;
-
-internal_error:
-	cJSON_Delete(tree);
-	dynsec__command_reply(j_responses, context, "getDefaultACLAccess", "Internal error", correlation_data);
-	return MOSQ_ERR_NOMEM;
-}
-
 
 int mosquitto_plugin_init(mosquitto_plugin_id_t *identifier, void **user_data, struct mosquitto_opt *options, int option_count)
 {
@@ -321,112 +81,3 @@ int mosquitto_plugin_cleanup(void *user_data, struct mosquitto_opt *options, int
 	g_config_file = NULL;
 	return MOSQ_ERR_SUCCESS;
 }
-
-/* ################################################################
- * #
- * # $CONTROL/dynamic-security/v1 handler
- * #
- * ################################################################ */
-
-int dynsec__handle_control(cJSON *j_responses, struct mosquitto *context, cJSON *commands)
-{
-	int rc = MOSQ_ERR_SUCCESS;
-	cJSON *aiter;
-	char *command;
-	char *correlation_data = NULL;
-
-	cJSON_ArrayForEach(aiter, commands){
-		if(cJSON_IsObject(aiter)){
-			if(json_get_string(aiter, "command", &command, false) == MOSQ_ERR_SUCCESS){
-				if(json_get_string(aiter, "correlationData", &correlation_data, true) != MOSQ_ERR_SUCCESS){
-					dynsec__command_reply(j_responses, context, command, "Invalid correlationData data type.", NULL);
-					return MOSQ_ERR_INVAL;
-				}
-
-				/* Plugin */
-				if(!strcasecmp(command, "setDefaultACLAccess")){
-					rc = dynsec__process_set_default_acl_access(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "getDefaultACLAccess")){
-					rc = dynsec__process_get_default_acl_access(j_responses, context, aiter, correlation_data);
-
-				/* Clients */
-				}else if(!strcasecmp(command, "createClient")){
-					rc = dynsec_clients__process_create(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "deleteClient")){
-					rc = dynsec_clients__process_delete(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "getClient")){
-					rc = dynsec_clients__process_get(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "listClients")){
-					rc = dynsec_clients__process_list(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "modifyClient")){
-					rc = dynsec_clients__process_modify(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "setClientPassword")){
-					rc = dynsec_clients__process_set_password(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "setClientId")){
-					rc = dynsec_clients__process_set_id(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "addClientRole")){
-					rc = dynsec_clients__process_add_role(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "removeClientRole")){
-					rc = dynsec_clients__process_remove_role(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "enableClient")){
-					rc = dynsec_clients__process_enable(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "disableClient")){
-					rc = dynsec_clients__process_disable(j_responses, context, aiter, correlation_data);
-
-				/* Groups */
-				}else if(!strcasecmp(command, "addGroupClient")){
-					rc = dynsec_groups__process_add_client(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "createGroup")){
-					rc = dynsec_groups__process_create(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "deleteGroup")){
-					rc = dynsec_groups__process_delete(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "getGroup")){
-					rc = dynsec_groups__process_get(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "listGroups")){
-					rc = dynsec_groups__process_list(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "modifyGroup")){
-					rc = dynsec_groups__process_modify(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "removeGroupClient")){
-					rc = dynsec_groups__process_remove_client(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "addGroupRole")){
-					rc = dynsec_groups__process_add_role(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "removeGroupRole")){
-					rc = dynsec_groups__process_remove_role(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "setAnonymousGroup")){
-					rc = dynsec_groups__process_set_anonymous_group(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "getAnonymousGroup")){
-					rc = dynsec_groups__process_get_anonymous_group(j_responses, context, aiter, correlation_data);
-
-				/* Roles */
-				}else if(!strcasecmp(command, "createRole")){
-					rc = dynsec_roles__process_create(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "getRole")){
-					rc = dynsec_roles__process_get(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "listRoles")){
-					rc = dynsec_roles__process_list(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "modifyRole")){
-					rc = dynsec_roles__process_modify(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "deleteRole")){
-					rc = dynsec_roles__process_delete(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "addRoleACL")){
-					rc = dynsec_roles__process_add_acl(j_responses, context, aiter, correlation_data);
-				}else if(!strcasecmp(command, "removeRoleACL")){
-					rc = dynsec_roles__process_remove_acl(j_responses, context, aiter, correlation_data);
-
-				/* Unknown */
-				}else{
-					dynsec__command_reply(j_responses, context, command, "Unknown command", correlation_data);
-					rc = MOSQ_ERR_INVAL;
-				}
-			}else{
-				dynsec__command_reply(j_responses, context, "Unknown command", "Missing command", correlation_data);
-				rc = MOSQ_ERR_INVAL;
-			}
-		}else{
-			dynsec__command_reply(j_responses, context, "Unknown command", "Command not an object", correlation_data);
-			rc = MOSQ_ERR_INVAL;
-		}
-	}
-
-	return rc;
-}