Initial Commit as submodule

9 files changed, 0 insertions, 2708 deletions

diff --git a/ctl-binding/CMakeLists.txt b/ctl-binding/CMakeLists.txt
deleted file mode 100644
index d62a1e2..0000000
--- a/ctl-binding/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-# Include LUA only when requested
-if(CONTROL_SUPPORT_LUA)
-   message(STATUS "Notice: LUA Controler Support Selected")
-   set(CTL_LUA_SOURCE ctl-lua.c)
-   ADD_COMPILE_OPTIONS(-DCONTROL_SUPPORT_LUA)
-   ADD_COMPILE_OPTIONS(-DCONTROL_LUA_EVENT="luaevt")
-   ADD_COMPILE_OPTIONS(-DCONTROL_LUA_PATH="${CMAKE_SOURCE_DIR}/conf.d/project/lua.d:${CMAKE_INSTALL_PREFIX}/controller-plugins/ctl-lua.d")
-else(CONTROL_SUPPORT_LUA)
-   message(STATUS "Warning: LUA Without Support ")
-endif(CONTROL_SUPPORT_LUA)
-
-# Add target to project dependency list
-PROJECT_TARGET_ADD(afb-controller)
-
-    # Define project Targets
-    ADD_LIBRARY(${TARGET_NAME} SHARED ctl-binding.c ctl-timer.c ctl-dispatch.c ${CTL_LUA_SOURCE})
-
-    SET_OPENAPI_FILENAME("ctl-apidef")
-    # Binder exposes a unique public entry point
-    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-    PREFIX ""
-        LABELS "BINDINGV2"
-    LINK_FLAGS  ${BINDINGS_LINK_FLAG}
-        OUTPUT_NAME ${TARGET_NAME}
-    )
-
-    TARGET_LINK_LIBRARIES(${TARGET_NAME}
-        afb-utilities
-        ${link_libraries}
-    )
-
-    # Define target includes for this target client
-    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
-        PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-
diff --git a/ctl-binding/ctl-apidef.h b/ctl-binding/ctl-apidef.h
deleted file mode 100644
index c408d5e..0000000
--- a/ctl-binding/ctl-apidef.h
+++ /dev/null
@@ -1,118 +0,0 @@
-
-static const char _afb_description_v2_control[] =
-    "{\"openapi\":\"3.0.0\",\"$schema\":\"http:iot.bzh/download/openapi/schem"
-    "a-3.0/default-schema.json\",\"info\":{\"description\":\"\",\"title\":\"c"
-    "ontroler\",\"version\":\"1.0\",\"x-binding-c-generator\":{\"api\":\"cont"
-    "rol\",\"version\":2,\"prefix\":\"ctlapi_\",\"postfix\":\"\",\"start\":nu"
-    "ll,\"onevent\":\"DispatchOneEvent\",\"init\":\"CtlBindingInit\",\"scope\""
-    ":\"\",\"private\":false}},\"servers\":[{\"url\":\"ws://{host}:{port}/api"
-    "/polctl\",\"description\":\"Unicens2 API.\",\"variables\":{\"host\":{\"d"
-    "efault\":\"localhost\"},\"port\":{\"default\":\"1234\"}},\"x-afb-events\""
-    ":[{\"$ref\":\"#/components/schemas/afb-event\"}]}],\"components\":{\"sch"
-    "emas\":{\"afb-reply\":{\"$ref\":\"#/components/schemas/afb-reply-v2\"},\""
-    "afb-event\":{\"$ref\":\"#/components/schemas/afb-event-v2\"},\"afb-reply"
-    "-v2\":{\"title\":\"Generic response.\",\"type\":\"object\",\"required\":"
-    "[\"jtype\",\"request\"],\"properties\":{\"jtype\":{\"type\":\"string\",\""
-    "const\":\"afb-reply\"},\"request\":{\"type\":\"object\",\"required\":[\""
-    "status\"],\"properties\":{\"status\":{\"type\":\"string\"},\"info\":{\"t"
-    "ype\":\"string\"},\"token\":{\"type\":\"string\"},\"uuid\":{\"type\":\"s"
-    "tring\"},\"reqid\":{\"type\":\"string\"}}},\"response\":{\"type\":\"obje"
-    "ct\"}}},\"afb-event-v2\":{\"type\":\"object\",\"required\":[\"jtype\",\""
-    "event\"],\"properties\":{\"jtype\":{\"type\":\"string\",\"const\":\"afb-"
-    "event\"},\"event\":{\"type\":\"string\"},\"data\":{\"type\":\"object\"}}"
-    "}},\"x-permissions\":{\"control\":{\"permission\":\"urn:AGL:permission:a"
-    "udio:public:control\"},\"dispatch\":{\"permission\":\"urn:AGL:permission"
-    ":audio:public:dispatch\"},\"request\":{\"permission\":\"urn:AGL:permissi"
-    "on:audio:public:request\"},\"debug\":{\"permission\":\"urn:AGL:permissio"
-    "n:audio:public:debug\"}},\"responses\":{\"200\":{\"description\":\"A com"
-    "plex object array response\",\"content\":{\"application/json\":{\"schema"
-    "\":{\"$ref\":\"#/components/schemas/afb-reply\"}}}}}},\"paths\":{\"/ping"
-    "\":{\"description\":\"Ping Binding\",\"get\":{\"x-permissions\":{\"$ref\""
-    ":\"#/components/x-permissions/control\"},\"parameters\":[{\"in\":\"query"
-    "\",\"name\":\"args\",\"required\":false,\"schema\":{\"type\":\"json\"}}]"
-    ",\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"/"
-    "subscribe\":{\"description\":\"Subcribe Audio Agent Policy Control End\""
-    ",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/contr"
-    "ol\"},\"parameters\":[{\"in\":\"query\",\"name\":\"event_patern\",\"requ"
-    "ired\":true,\"schema\":{\"type\":\"string\"}}],\"responses\":{\"200\":{\""
-    "$ref\":\"#/components/responses/200\"}}}},\"/dispatch\":{\"description\""
-    ":\"Request Access to Navigation Audio Channel.\",\"get\":{\"x-permission"
-    "s\":{\"$ref\":\"#/components/x-permissions/dispatch\"},\"parameters\":[{"
-    "\"in\":\"query\",\"name\":\"zone\",\"required\":false,\"schema\":{\"type"
-    "\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/respons"
-    "es/200\"}}}},\"/request\":{\"description\":\"Execute LUA string script.\""
-    ",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/reque"
-    "st\"},\"parameters\":[{\"in\":\"query\",\"name\":\"func\",\"required\":t"
-    "rue,\"schema\":{\"type\":\"string\"}},{\"in\":\"query\",\"name\":\"args\""
-    ",\"required\":false,\"schema\":{\"type\":\"array\"}}],\"responses\":{\"2"
-    "00\":{\"$ref\":\"#/components/responses/200\"}}}},\"/debuglua\":{\"descr"
-    "iption\":\"Execute LUA string script.\",\"get\":{\"x-permissions\":{\"$r"
-    "ef\":\"#/components/x-permissions/debug\"},\"parameters\":[{\"in\":\"que"
-    "ry\",\"name\":\"filename\",\"required\":true,\"schema\":{\"type\":\"stri"
-    "ng\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}"
-    "}}}}}"
-;
-
-static const struct afb_auth _afb_auths_v2_control[] = {
-	{ .type = afb_auth_Permission, .text = "urn:AGL:permission:audio:public:control" },
-	{ .type = afb_auth_Permission, .text = "urn:AGL:permission:audio:public:dispatch" },
-	{ .type = afb_auth_Permission, .text = "urn:AGL:permission:audio:public:request" },
-	{ .type = afb_auth_Permission, .text = "urn:AGL:permission:audio:public:debug" }
-};
-
- void ctlapi_ping(struct afb_req req);
- void ctlapi_subscribe(struct afb_req req);
- void ctlapi_dispatch(struct afb_req req);
- void ctlapi_request(struct afb_req req);
- void ctlapi_debuglua(struct afb_req req);
-
-static const struct afb_verb_v2 _afb_verbs_v2_control[] = {
-    {
-        .verb = "ping",
-        .callback = ctlapi_ping,
-        .auth = &_afb_auths_v2_control[0],
-        .info = NULL,
-        .session = AFB_SESSION_NONE_V2
-    },
-    {
-        .verb = "subscribe",
-        .callback = ctlapi_subscribe,
-        .auth = &_afb_auths_v2_control[0],
-        .info = NULL,
-        .session = AFB_SESSION_NONE_V2
-    },
-    {
-        .verb = "dispatch",
-        .callback = ctlapi_dispatch,
-        .auth = &_afb_auths_v2_control[1],
-        .info = NULL,
-        .session = AFB_SESSION_NONE_V2
-    },
-    {
-        .verb = "request",
-        .callback = ctlapi_request,
-        .auth = &_afb_auths_v2_control[2],
-        .info = NULL,
-        .session = AFB_SESSION_NONE_V2
-    },
-    {
-        .verb = "debuglua",
-        .callback = ctlapi_debuglua,
-        .auth = &_afb_auths_v2_control[3],
-        .info = NULL,
-        .session = AFB_SESSION_NONE_V2
-    },
-    { .verb = NULL }
-};
-
-const struct afb_binding_v2 afbBindingV2 = {
-    .api = "control",
-    .specification = _afb_description_v2_control,
-    .info = NULL,
-    .verbs = _afb_verbs_v2_control,
-    .preinit = NULL,
-    .init = CtlBindingInit,
-    .onevent = DispatchOneEvent,
-    .noconcurrency = 0
-};
-
diff --git a/ctl-binding/ctl-apidef.json b/ctl-binding/ctl-apidef.json
deleted file mode 100644
index a8b433e..0000000
--- a/ctl-binding/ctl-apidef.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-    "openapi": "3.0.0",
-    "$schema": "http:iot.bzh/download/openapi/schema-3.0/default-schema.json",
-    "info": {
-        "description": "",
-        "title": "controler",
-        "version": "1.0",
-        "x-binding-c-generator": {
-            "api": "control",
-            "version": 2,
-            "prefix": "ctlapi_",
-            "postfix": "",
-            "start": null,
-            "onevent": "DispatchOneEvent",
-            "init": "CtlBindingInit",
-            "scope": "",
-            "private": false
-        }
-    },
-    "servers": [
-        {
-            "url": "ws://{host}:{port}/api/polctl",
-            "description": "Unicens2 API.",
-            "variables": {
-                "host": {
-                    "default": "localhost"
-                },
-                "port": {
-                    "default": "1234"
-                }
-            },
-            "x-afb-events": [
-                {
-                    "$ref": "#/components/schemas/afb-event"
-                }
-            ]
-        }
-    ],
-    "components": {
-        "schemas": {
-            "afb-reply": {
-                "$ref": "#/components/schemas/afb-reply-v2"
-            },
-            "afb-event": {
-                "$ref": "#/components/schemas/afb-event-v2"
-            },
-            "afb-reply-v2": {
-                "title": "Generic response.",
-                "type": "object",
-                "required": ["jtype", "request"],
-                "properties": {
-                    "jtype": {
-                        "type": "string",
-                        "const": "afb-reply"
-                    },
-                    "request": {
-                        "type": "object",
-                        "required": ["status"],
-                        "properties": {
-                            "status": {
-                                "type": "string"
-                            },
-                            "info": {
-                                "type": "string"
-                            },
-                            "token": {
-                                "type": "string"
-                            },
-                            "uuid": {
-                                "type": "string"
-                            },
-                            "reqid": {
-                                "type": "string"
-                            }
-                        }
-                    },
-                    "response": {
-                        "type": "object"
-                    }
-                }
-            },
-            "afb-event-v2": {
-                "type": "object",
-                "required": ["jtype", "event"],
-                "properties": {
-                    "jtype": {
-                        "type": "string",
-                        "const": "afb-event"
-                    },
-                    "event": {
-                        "type": "string"
-                    },
-                    "data": {
-                        "type": "object"
-                    }
-                }
-            }
-        },
-        "x-permissions": {
-            "control": {
-                "permission": "urn:AGL:permission:audio:public:control"
-            },
-            "dispatch": {
-                "permission": "urn:AGL:permission:audio:public:dispatch"
-            },
-            "request": {
-                "permission": "urn:AGL:permission:audio:public:request"
-            },
-            "debug": {
-                "permission": "urn:AGL:permission:audio:public:debug"
-            }
-        },
-        "responses": {
-            "200": {
-                "description": "A complex object array response",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "$ref": "#/components/schemas/afb-reply"
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "paths": {
-        "/ping": {
-            "description": "Ping Binding",
-            "get": {
-                "x-permissions": {
-                    "$ref": "#/components/x-permissions/control"
-                },
-                "parameters": [{
-                    "in": "query",
-                    "name": "args",
-                    "required": false,
-                    "schema": {
-                        "type": "json"
-                    }
-                }],
-                "responses": {
-                    "200": {
-                        "$ref": "#/components/responses/200"
-                    }
-                }
-            }
-        },
-            "/subscribe": {
-                "description": "Subcribe Audio Agent Policy Control End",
-                "get": {
-                    "x-permissions": {
-                        "$ref": "#/components/x-permissions/control"
-                    },
-                    "parameters": [
-                        {
-                            "in": "query",
-                            "name": "event_patern",
-                            "required": true,
-                            "schema": {
-                                "type": "string"
-                            }
-                        }
-                    ],
-                    "responses": {
-                        "200": {
-                            "$ref": "#/components/responses/200"
-                        }
-                    }
-                }
-            },
-            "/dispatch": {
-                "description": "Request Access to Navigation Audio Channel.",
-                "get": {
-                    "x-permissions": {
-                        "$ref": "#/components/x-permissions/dispatch"
-                    },
-                    "parameters": [
-                        {
-                            "in": "query",
-                            "name": "zone",
-                            "required": false,
-                            "schema": {
-                                "type": "string"
-                            }
-                        }
-                    ],
-                    "responses": {
-                        "200": {
-                            "$ref": "#/components/responses/200"
-                        }
-                    }
-                }
-            },
-            "/request": {
-                "description": "Execute LUA string script.",
-                "get": {
-                    "x-permissions": {
-                        "$ref": "#/components/x-permissions/request"
-                    },
-                    "parameters": [
-                        {
-                            "in": "query",
-                            "name": "func",
-                            "required": true,
-                            "schema": {
-                                "type": "string"
-                            }
-                        },
-                        {
-                            "in": "query",
-                            "name": "args",
-                            "required": false,
-                            "schema": {
-                                "type": "array"
-                            }
-                        }
-                    ],
-                    "responses": {
-                        "200": {
-                            "$ref": "#/components/responses/200"
-                        }
-                    }
-                }
-            },
-            "/debuglua": {
-                "description": "Execute LUA string script.",
-                "get": {
-                    "x-permissions": {
-                        "$ref": "#/components/x-permissions/debug"
-                    },
-                    "parameters": [
-                        {
-                            "in": "query",
-                            "name": "filename",
-                            "required": true,
-                            "schema": {
-                                "type": "string"
-                            }
-                        }
-                    ],
-                    "responses": {
-                        "200": {
-                            "$ref": "#/components/responses/200"
-                        }
-                    }
-                }
-            }
-        }
-}
diff --git a/ctl-binding/ctl-binding.c b/ctl-binding/ctl-binding.c
deleted file mode 100644
index 6840b5c..0000000
--- a/ctl-binding/ctl-binding.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Fulup Ar Foll <fulup@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include "ctl-binding.h"
-
-// Include Binding Stub generated from Json OpenAPI
-#include "ctl-apidef.h"
-
-PUBLIC void ctlapi_ping (afb_req request) {
-    static int count=0;
-
-    count++;
-    AFB_NOTICE ("Controller:ping count=%d", count);
-    afb_req_success(request,json_object_new_int(count), NULL);
-
-    return;
-}
-
-PUBLIC void ctlapi_subscribe (afb_req request) {
-
-    // subscribe Client to event
-    int err = afb_req_subscribe(request, TimerEvtGet());
-    if (err != 0) {
-        afb_req_fail_f(request, "register-event", "Fail to subscribe binder event");
-        goto OnErrorExit;
-    }
-
-    afb_req_success(request, NULL, NULL);
-
- OnErrorExit:
-    return;
-}
-
-// Create Binding Event at Init
-PUBLIC int CtlBindingInit () {
-
-    int errcount=0;
-
-    errcount += TimerEvtInit();
-    errcount += DispatchInit();
-#ifdef CONTROL_SUPPORT_LUA
-    errcount += LuaLibInit();
-#endif
-
-    const char *profile= getenv("CONTROL_ONLOAD_PROFILE");
-    if (!profile) profile=CONTROL_ONLOAD_PROFILE;
-
-    // now that everything is initialised execute the onload action
-    if (!errcount)
-        errcount += DispatchOnLoad(CONTROL_ONLOAD_PROFILE);
-
-    AFB_DEBUG ("Audio Policy Control Binding Done errcount=%d", errcount);
-    return errcount;
-}
-
diff --git a/ctl-binding/ctl-binding.h b/ctl-binding/ctl-binding.h
deleted file mode 100644
index f159440..0000000
--- a/ctl-binding/ctl-binding.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Fulup Ar Foll <fulup@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef CONTROLLER_BINDING_INCLUDE
-#define CONTROLLER_BINDING_INCLUDE
-
-#define AFB_BINDING_VERSION 2
-#include <afb/afb-binding.h>
-#include <json-c/json.h>
-#include <systemd/sd-event.h>
-#include "filescan-utils.h"
-#include "wrap-json.h"
-
-#ifdef CONTROL_SUPPORT_LUA
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-#endif
-
-#ifndef PUBLIC
-  #define PUBLIC
-#endif
-#define STATIC static
-
-#ifndef UNUSED_ARG
-#define UNUSED_ARG(x) UNUSED_ ## x __attribute__((__unused__))
-#define UNUSED_FUNCTION(x) __attribute__((__unused__)) UNUSED_ ## x
-#endif
-
-// polctl-binding.c
-PUBLIC int CtlBindingInit ();
-
-// ctl-timerevt.c
-// ----------------------
-typedef int (*timerCallbackT)(void *context);
-
-typedef struct TimerHandleS {
-    int count;
-    int delay;
-    const char*label;
-    void *context;
-    timerCallbackT callback;
-    sd_event_source *evtSource;
-} TimerHandleT;
-
-PUBLIC int TimerEvtInit (void);
-PUBLIC afb_event TimerEvtGet(void);
-PUBLIC void TimerEvtStart(TimerHandleT *timerHandle, timerCallbackT callback, void *context);
-PUBLIC void TimerEvtStop(TimerHandleT *timerHandle);
-
-// ctl-policy
-// -----------
-
-typedef enum {
-    CTL_MODE_NONE=0,
-    CTL_MODE_API,
-    CTL_MODE_CB,
-    CTL_MODE_LUA,
-} CtlRequestModeT;
-
-
-typedef enum {
-    CTL_SOURCE_CLOSE=-1,
-    CTL_SOURCE_UNKNOWN=0,
-    CTL_SOURCE_ONLOAD=1,
-    CTL_SOURCE_OPEN=2,
-    CTL_SOURCE_EVENT=3,
-} DispatchSourceT;
-
-typedef struct DispatchActionS{
-    const char *info;
-    const char* label;
-    CtlRequestModeT mode;
-    const char* api;
-    const char* call;
-    json_object *argsJ;
-    int timeout;
-    int (*actionCB)(DispatchSourceT source, const char*label,  json_object *argsJ, json_object *queryJ, void *context);
-} DispatchActionT;
-
-typedef int (*Lua2cFunctionT)(char *funcname, json_object *argsJ, void*context);
-
-PUBLIC int  DispatchInit(void);
-PUBLIC int DispatchOnLoad(const char *onLoadLabel);
-PUBLIC void DispatchOneEvent(const char *evtLabel, json_object *eventJ);
-PUBLIC int DispatchOneL2c(lua_State* luaState, char *funcname, Lua2cFunctionT callback);
-PUBLIC void ctlapi_dispatch (afb_req request);
-
-#ifdef CONTROL_SUPPORT_LUA
-// ctl-lua.c
-typedef int (*Lua2cWrapperT) (lua_State* luaState, char *funcname, Lua2cFunctionT callback);
-
-#define CTLP_LUA2C(FuncName, label,argsJ, context) static int FuncName(char*label,json_object*argsJ, void*context);\
-        int lua2c_ ## FuncName(lua_State* luaState){return((*Lua2cWrap)(luaState, MACRO_STR_VALUE(FuncName), FuncName));};\
-        static int FuncName(char* label, json_object* argsJ, void* context)
-
-typedef enum {
-    LUA_DOCALL,
-    LUA_DOSTRING,
-    LUA_DOSCRIPT,
-} LuaDoActionT;
-
-PUBLIC int LuaLibInit ();
-PUBLIC void LuaL2cNewLib(const char *label, luaL_Reg *l2cFunc, int count);
-PUBLIC int Lua2cWrapper(lua_State* luaState, char *funcname, Lua2cFunctionT callback, void *context);
-PUBLIC int LuaCallFunc (DispatchSourceT source, DispatchActionT *action, json_object *queryJ) ;
-PUBLIC void ctlapi_lua_docall (afb_req request);
-PUBLIC void ctlapi_lua_dostring (afb_req request);
-PUBLIC void ctlapi_lua_doscript (afb_req request);
-
-#else
- typedef void* Lua2cWrapperT;
-#endif // CONTROL_SUPPORT_LUA
-
-
-// sharelib ctl-plugin*
-typedef struct {
-  long  magic;
-  char *label;
-} CtlPluginMagicT;
-
-
-#define MACRO_STR_VALUE(arg) #arg
-#define CTLP_REGISTER(pluglabel) CtlPluginMagicT CtlPluginMagic={.magic=CTL_PLUGIN_MAGIC,.label=pluglabel}; struct afb_binding_data_v2; Lua2cWrapperT Lua2cWrap;
-#define CTLP_ONLOAD(label,version,info) void* CtlPluginOnload(char* label, char* version, char* info)
-#define CTLP_CAPI(funcname,source, label,argsJ, queryJ, context) int funcname(DispatchSourceT source, char* label, json_object* argsJ, json_object* queryJ, void* context)
-
-
-
-#endif // CONTROLLER_BINDING_INCLUDE
diff --git a/ctl-binding/ctl-dispatch.c b/ctl-binding/ctl-dispatch.c
deleted file mode 100644
index da900ec..0000000
--- a/ctl-binding/ctl-dispatch.c
+++ /dev/null
@@ -1,678 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Fulup Ar Foll <fulup@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, something express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Reference:
- *   Json load using json_unpack https://jansson.readthedocs.io/en/2.9/apiref.html#parsing-and-validating-values
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <sys/prctl.h>
-
-#include "ctl-binding.h"
-
-typedef void*(*DispatchPluginInstallCbT)(const char* label, const char*version, const char*info);
-
-
-static afb_req NULL_AFBREQ = {};
-
-
-typedef struct {
-    const char* label;
-    const char *info;
-    DispatchActionT *actions;
-} DispatchHandleT;
-
-typedef struct {
-    const char *label;
-    const char *info;
-    void *context;
-    char *sharelib;
-    void *dlHandle;
-    luaL_Reg *l2cFunc;
-    int l2cCount;
-} DispatchPluginT;
-
-typedef struct {
-    const char* label;
-    const char *info;
-    const char *version;
-    DispatchPluginT *plugin;
-    DispatchHandleT **onloads;
-    DispatchHandleT **events;
-    DispatchHandleT **controls;
-} DispatchConfigT;
-
-// global config handle
-STATIC DispatchConfigT *configHandle = NULL;
-
-STATIC int DispatchControlToIndex(DispatchHandleT **controls, const char* controlLabel) {
-
-    for (int idx = 0; controls[idx]; idx++) {
-        if (!strcasecmp(controlLabel, controls[idx]->label)) return idx;
-    }
-    return -1;
-}
-
-STATIC int DispatchOneControl(DispatchSourceT source, DispatchHandleT **controls, const char* controlLabel, json_object *queryJ, afb_req request) {
-    int err;
-
-    if (!configHandle) {
-        AFB_ERROR("DISPATCH-CTL-API: (Hoops/Bug!!!) No Config Loaded");
-        goto OnErrorExit;
-    }
-
-    if (!configHandle->controls) {
-        AFB_ERROR("DISPATCH-CTL-API: No Control Action in Json config label=%s version=%s", configHandle->label, configHandle->version);
-        goto OnErrorExit;
-    }
-
-    int index = DispatchControlToIndex(controls, controlLabel);
-    if (index < 0 || !controls[index]->actions) {
-        AFB_ERROR("DISPATCH-CTL-API:NotFound/Error label=%s in Json Control Config File", controlLabel);
-        goto OnErrorExit;
-    }
-
-    // Fulup (Bug/Feature) in current version is unique to every onload profile
-    if (configHandle->plugin && configHandle->plugin->l2cCount) {
-        LuaL2cNewLib (configHandle->plugin->label, configHandle->plugin->l2cFunc, configHandle->plugin->l2cCount);
-    }
-
-    // loop on action for this control
-    DispatchActionT *actions = controls[index]->actions;
-    for (int idx = 0; actions[idx].label; idx++) {
-
-        switch (actions[idx].mode) {
-            case CTL_MODE_API:
-            {
-                json_object *returnJ;
-
-                // if query is empty increment usage count and pass args
-                if (!queryJ || json_object_get_type(queryJ) != json_type_object) {
-                    json_object_get(actions[idx].argsJ);
-                    queryJ= actions[idx].argsJ;
-                } else if (actions[idx].argsJ) {
-
-                    // Merge queryJ and argsJ before sending request
-                    if (json_object_get_type(actions[idx].argsJ) ==  json_type_object) {
-                        json_object_object_foreach(actions[idx].argsJ, key, val) {
-                        json_object_object_add(queryJ, key, val);
-                        }
-                    } else {
-                        json_object_object_add(queryJ, "args", actions[idx].argsJ);
-                    }
-                }
-
-                int err = afb_service_call_sync(actions[idx].api, actions[idx].call, queryJ, &returnJ);
-                if (err) {
-                    static const char*format = "DispatchOneControl(Api) api=%s verb=%s args=%s";
-                    if (afb_req_is_valid(request))afb_req_fail_f(request, "DISPATCH-CTL-MODE:API", format, actions[idx].label, actions[idx].api, actions[idx].call);
-                    else AFB_ERROR(format, actions[idx].api, actions[idx].call, actions[idx].label);
-                    goto OnErrorExit;
-                }
-                break;
-            }
-
-#ifdef CONTROL_SUPPORT_LUA
-            case CTL_MODE_LUA:
-                err = LuaCallFunc(source, &actions[idx], queryJ);
-                if (err) {
-                    static const char*format = "DispatchOneControl(Lua) label=%s func=%s args=%s";
-                    if (afb_req_is_valid(request)) afb_req_fail_f(request, "DISPATCH-CTL-MODE:Lua", format, actions[idx].label, actions[idx].call, json_object_get_string(actions[idx].argsJ));
-                    else AFB_ERROR(format, actions[idx].label, actions[idx].call, json_object_get_string(actions[idx].argsJ));
-                    goto OnErrorExit;
-                }
-                break;
-#endif
-
-            case CTL_MODE_CB:
-                err = (*actions[idx].actionCB) (source, actions[idx].label, actions[idx].argsJ, queryJ, configHandle->plugin->context);
-                if (err) {
-                    static const char*format = "DispatchOneControl(Callback) label%s func=%s args=%s";
-                    if (afb_req_is_valid(request)) afb_req_fail_f(request, "DISPATCH-CTL-MODE:Cb", format, actions[idx].label, actions[idx].call, json_object_get_string(actions[idx].argsJ));
-                    else AFB_ERROR(format, actions[idx].label, actions[idx].call, json_object_get_string(actions[idx].argsJ));
-                    goto OnErrorExit;
-                }
-                break;
-
-            default:
-            {
-                static const char*format = "DispatchOneControl(unknown) mode control=%s action=%s";
-                AFB_ERROR(format, controls[index]->label);
-                if (afb_req_is_valid(request))afb_req_fail_f(request, "DISPATCH-CTL-MODE:Unknown", format, controls[index]->label);
-            }
-        }
-    }
-
-    // everything when fine
-    if (afb_req_is_valid(request))afb_req_success(request, NULL, controls[index]->label);
-    return 0;
-
-OnErrorExit:
-    return -1;
-}
-
-
-// Event name is mapped on control label and executed as a standard control
-
-PUBLIC void DispatchOneEvent(const char *evtLabel, json_object *eventJ) {
-    DispatchHandleT **events = configHandle->events;
-
-    (void) DispatchOneControl(CTL_SOURCE_EVENT, events, evtLabel, eventJ, NULL_AFBREQ);
-}
-
-// Event name is mapped on control label and executed as a standard control
-
-PUBLIC int DispatchOnLoad(const char *onLoadLabel) {
-    if (!configHandle) return 1;
-
-    DispatchHandleT **onloads = configHandle->onloads;
-
-    int err = DispatchOneControl(CTL_SOURCE_ONLOAD, onloads, onLoadLabel, NULL, NULL_AFBREQ);
-    return err;
-}
-
-PUBLIC void ctlapi_dispatch(afb_req request) {
-    DispatchHandleT **controls = configHandle->controls;
-    json_object *queryJ, *argsJ=NULL;
-    const char *target;
-    DispatchSourceT source= CTL_SOURCE_UNKNOWN;
-
-    queryJ = afb_req_json(request);
-    int err = wrap_json_unpack(queryJ, "{s:s, s?i s?o !}", "target", &target, "source", &source, "args", &argsJ);
-    if (err) {
-        afb_req_fail_f(request, "CTL-DISPTACH-INVALID", "missing target or args not a valid json object query=%s", json_object_get_string(queryJ));
-        goto OnErrorExit;
-    }
-
-    (void) DispatchOneControl(source, controls, target, argsJ, request);
-
-OnErrorExit:
-    return;
-}
-
-// Wrapper to Lua2c plugin command add context dans delegate to LuaWrapper
-PUBLIC int DispatchOneL2c(lua_State* luaState, char *funcname, Lua2cFunctionT callback) {
-#ifndef CONTROL_SUPPORT_LUA
-    AFB_ERROR("DISPATCH-ONE-L2C: LUA support not selected (cf:CONTROL_SUPPORT_LUA) in config.cmake");
-    return 1;
-#else
-    int err=Lua2cWrapper(luaState, funcname, callback, configHandle->plugin->context);
-    return err;
-#endif
-}
-
-
-// List Avaliable Configuration Files
-
-PUBLIC void ctlapi_config(struct afb_req request) {
-    json_object*tmpJ;
-    char *dirList;
-
-
-    json_object* queryJ = afb_req_json(request);
-    if (queryJ && json_object_object_get_ex(queryJ, "cfgpath", &tmpJ)) {
-        dirList = strdup(json_object_get_string(tmpJ));
-    } else {
-
-        dirList = getenv("CONTROL_CONFIG_PATH");
-        if (!dirList) dirList = strdup(CONTROL_CONFIG_PATH);
-        AFB_NOTICE("CONFIG-MISSING: use default CONTROL_CONFIG_PATH=%s", CONTROL_CONFIG_PATH);
-    }
-
-    // get list of config file
-    struct json_object *responseJ = ScanForConfig(dirList, CTL_SCAN_RECURSIVE, "onload", "json");
-
-    if (json_object_array_length(responseJ) == 0) {
-        afb_req_fail(request, "CONFIGPATH:EMPTY", "No Config Found in CONTROL_CONFIG_PATH");
-    } else {
-        afb_req_success(request, responseJ, NULL);
-    }
-
-    return;
-}
-
-// unpack individual action object
-
-STATIC int DispatchLoadOneAction(DispatchConfigT *controlConfig, json_object *actionJ, DispatchActionT *action) {
-    char *api = NULL, *verb = NULL, *callback = NULL, *lua = NULL;
-    int err, modeCount = 0;
-
-    err = wrap_json_unpack(actionJ, "{ss,s?s,s?s,s?s,s?s,s?s,s?o !}"
-            , "label", &action->label, "info", &action->info, "callback", &callback, "lua", &lua, "api", &api, "verb", &verb, "args", &action->argsJ);
-    if (err) {
-        AFB_ERROR("DISPATCH-LOAD-ACTION Missing something label|info|callback|lua|(api+verb)|args in %s", json_object_get_string(actionJ));
-        goto OnErrorExit;
-    }
-
-    if (lua) {
-        action->mode = CTL_MODE_LUA;
-        action->call = lua;
-        modeCount++;
-    }
-
-    if (api && verb) {
-        action->mode = CTL_MODE_API;
-        action->api = api;
-        action->call = verb;
-        modeCount++;
-    }
-
-    if (callback && controlConfig->plugin) {
-        action->mode = CTL_MODE_CB;
-        action->call = callback;
-        modeCount++;
-
-        action->actionCB = dlsym(controlConfig->plugin->dlHandle, callback);
-        if (!action->actionCB) {
-            AFB_ERROR("DISPATCH-LOAD-ACTION fail to find calbback=%s in %s", callback, controlConfig->plugin->sharelib);
-            goto OnErrorExit;
-        }
-    }
-
-    // make sure at least one mode is selected
-    if (modeCount == 0) {
-        AFB_ERROR("DISPATCH-LOAD-ACTION No Action Selected lua|callback|(api+verb) in %s", json_object_get_string(actionJ));
-        goto OnErrorExit;
-    }
-
-    if (modeCount > 1) {
-        AFB_ERROR("DISPATCH-LOAD-ACTION:ToMany arguments lua|callback|(api+verb) in %s", json_object_get_string(actionJ));
-        goto OnErrorExit;
-    }
-    return 0;
-
-OnErrorExit:
-    return -1;
-};
-
-STATIC DispatchActionT *DispatchLoadActions(DispatchConfigT *controlConfig, json_object *actionsJ) {
-    int err;
-    DispatchActionT *actions;
-
-    // action array is close with a nullvalue;
-    if (json_object_get_type(actionsJ) == json_type_array) {
-        int count = json_object_array_length(actionsJ);
-        actions = calloc(count + 1, sizeof (DispatchActionT));
-
-        for (int idx = 0; idx < count; idx++) {
-            json_object *actionJ = json_object_array_get_idx(actionsJ, idx);
-            err = DispatchLoadOneAction(controlConfig, actionJ, &actions[idx]);
-            if (err) goto OnErrorExit;
-        }
-
-    } else {
-        actions = calloc(2, sizeof (DispatchActionT));
-        err = DispatchLoadOneAction(controlConfig, actionsJ, &actions[0]);
-        if (err) goto OnErrorExit;
-    }
-
-    return actions;
-
-OnErrorExit:
-    return NULL;
-
-}
-
-STATIC DispatchHandleT *DispatchLoadControl(DispatchConfigT *controlConfig, json_object *controlJ) {
-    json_object *actionsJ, *permissionsJ;
-    int err;
-
-    DispatchHandleT *dispatchHandle = calloc(1, sizeof (DispatchHandleT));
-    err = wrap_json_unpack(controlJ, "{ss,s?s,s?o, so !}", "label", &dispatchHandle->label, "info", &dispatchHandle->info
-         , "permissions", &permissionsJ, "actions", &actionsJ);
-    if (err) {
-        AFB_ERROR("DISPATCH-LOAD-CONFIG:CONTROL Missing something label|[info]|actions in %s", json_object_get_string(controlJ));
-        goto OnErrorExit;
-    }
-
-    dispatchHandle->actions = DispatchLoadActions(controlConfig, actionsJ);
-    if (!dispatchHandle->actions) {
-        AFB_ERROR("DISPATCH-LOAD-CONFIG:CONTROL Error when parsing actions %s", dispatchHandle->label);
-        goto OnErrorExit;
-    }
-    return dispatchHandle;
-
-OnErrorExit:
-    return NULL;
-}
-
-STATIC DispatchHandleT *DispatchLoadOnload(DispatchConfigT *controlConfig, json_object *onloadJ) {
-    json_object *actionsJ = NULL, *requireJ = NULL, *pluginJ = NULL;
-    int err;
-
-    DispatchHandleT *dispatchHandle = calloc(1, sizeof (DispatchHandleT));
-    err = wrap_json_unpack(onloadJ, "{ss,s?s,s?o,s?o,s?o !}",
-            "label", &dispatchHandle->label, "info", &dispatchHandle->info, "plugin", &pluginJ, "require", &requireJ, "actions", &actionsJ);
-    if (err) {
-        AFB_ERROR("DISPATCH-LOAD-CONFIG:ONLOAD Missing something label|[info]|[plugin]|[actions] in %s", json_object_get_string(onloadJ));
-        goto OnErrorExit;
-    }
-
-    // best effort to initialise everything before starting
-    if (requireJ) {
-
-        void DispatchRequireOneApi(json_object * bindindJ) {
-            const char* requireBinding = json_object_get_string(bindindJ);
-            err = afb_daemon_require_api(requireBinding, 1);
-            if (err) {
-                AFB_WARNING("DISPATCH-LOAD-CONFIG:REQUIRE Fail to get=%s", requireBinding);
-            }
-        }
-
-        if (json_object_get_type(requireJ) == json_type_array) {
-            for (int idx = 0; idx < json_object_array_length(requireJ); idx++) {
-                DispatchRequireOneApi(json_object_array_get_idx(requireJ, idx));
-            }
-        } else {
-            DispatchRequireOneApi(requireJ);
-        }
-    }
-
-    if (pluginJ) {
-        json_object *lua2csJ = NULL;
-        DispatchPluginT *dPlugin= calloc(1, sizeof(DispatchPluginT));
-        controlConfig->plugin = dPlugin;
-        const char*ldSearchPath=NULL;
-
-        err = wrap_json_unpack(pluginJ, "{ss,s?s,s?s,ss,s?o!}",
-                "label", &dPlugin->label, "info", &dPlugin->info, "ldpath", &ldSearchPath, "sharelib", &dPlugin->sharelib, "lua2c", &lua2csJ);
-        if (err) {
-            AFB_ERROR("DISPATCH-LOAD-CONFIG:ONLOAD Plugin missing label|[info]|sharelib|[lua2c] in %s", json_object_get_string(onloadJ));
-            goto OnErrorExit;
-        }
-
-        // if search path not in Json config file, then try default
-        if (!ldSearchPath) ldSearchPath=CONTROL_PLUGIN_PATH;
-
-        // search for default policy config file
-        json_object *pluginPathJ = ScanForConfig(ldSearchPath, CTL_SCAN_RECURSIVE, dPlugin->sharelib, NULL);
-        if (!pluginPathJ || json_object_array_length(pluginPathJ) == 0) {
-            AFB_ERROR("DISPATCH-LOAD-CONFIG:PLUGIN Missing plugin=%s in path=%s", dPlugin->sharelib, ldSearchPath);
-            goto OnErrorExit;
-        }
-
-        char *filename;
-        char*fullpath;
-        err = wrap_json_unpack(json_object_array_get_idx(pluginPathJ, 0), "{s:s, s:s !}", "fullpath", &fullpath, "filename", &filename);
-        if (err) {
-            AFB_ERROR("DISPATCH-LOAD-CONFIG:PLUGIN HOOPs invalid plugin file path = %s", json_object_get_string(pluginPathJ));
-            goto OnErrorExit;
-        }
-
-        if (json_object_array_length(pluginPathJ) > 1) {
-            AFB_WARNING("DISPATCH-LOAD-CONFIG:PLUGIN plugin multiple instances in searchpath will use %s/%s", fullpath, filename);
-        }
-
-        char pluginpath[CONTROL_MAXPATH_LEN];
-        strncpy(pluginpath, fullpath, sizeof (pluginpath));
-        strncat(pluginpath, "/", sizeof (pluginpath)-strlen(pluginpath)-1);
-        strncat(pluginpath, filename, sizeof (pluginpath)-strlen(pluginpath)-1);
-        dPlugin->dlHandle = dlopen(pluginpath, RTLD_NOW);
-        if (!dPlugin->dlHandle) {
-            AFB_ERROR("DISPATCH-LOAD-CONFIG:PLUGIN Fail to load pluginpath=%s err= %s", pluginpath, dlerror());
-            goto OnErrorExit;
-        }
-
-        CtlPluginMagicT *ctlPluginMagic = (CtlPluginMagicT*) dlsym(dPlugin->dlHandle, "CtlPluginMagic");
-        if (!ctlPluginMagic || ctlPluginMagic->magic != CTL_PLUGIN_MAGIC) {
-            AFB_ERROR("DISPATCH-LOAD-CONFIG:Plugin symbol'CtlPluginMagic' missing or !=  CTL_PLUGIN_MAGIC plugin=%s", pluginpath);
-            goto OnErrorExit;
-        } else {
-            AFB_NOTICE("DISPATCH-LOAD-CONFIG:Plugin %s successfully registered", ctlPluginMagic->label);
-        }
-
-        // Jose hack to make verbosity visible from sharelib
-        struct afb_binding_data_v2 *afbHidenData = dlsym(dPlugin->dlHandle, "afbBindingV2data");
-        if (afbHidenData) *afbHidenData = afbBindingV2data;
-
-        // Push lua2cWrapper @ into plugin
-        Lua2cWrapperT *lua2cInPlug = dlsym(dPlugin->dlHandle, "Lua2cWrap");
-#ifndef CONTROL_SUPPORT_LUA
-        if (lua2cInPlug) *lua2cInPlug = NULL;
-#else
-        // Lua2cWrapper is part of binder and not expose to dynamic link
-        if (lua2cInPlug) *lua2cInPlug = DispatchOneL2c;
-
-        {
-            int Lua2cAddOne(luaL_Reg *l2cFunc, const char* l2cName, int index) {
-                char funcName[CONTROL_MAXPATH_LEN];
-                strncpy(funcName, "lua2c_", sizeof(funcName));
-                strncat(funcName, l2cName, sizeof(funcName)-strlen(funcName)-1);
-
-                Lua2cFunctionT l2cFunction= (Lua2cFunctionT)dlsym(dPlugin->dlHandle, funcName);
-                if (!l2cFunction) {
-                    AFB_ERROR("DISPATCH-LOAD-CONFIG:Plugin symbol'%s' missing err=%s", funcName, dlerror());
-                    return 1;
-                }
-                l2cFunc[index].func=(void*)l2cFunction;
-                l2cFunc[index].name=strdup(l2cName);
-
-                return 0;
-            }
-
-            int errCount = 0;
-            luaL_Reg *l2cFunc=NULL;
-            int count=0;
-
-            // look on l2c command and push them to LUA
-            if (json_object_get_type(lua2csJ) == json_type_array) {
-                int length = json_object_array_length(lua2csJ);
-                l2cFunc = calloc(length + 1, sizeof (luaL_Reg));
-                for (count=0; count < length; count++) {
-                    int err;
-                    const char *l2cName = json_object_get_string(json_object_array_get_idx(lua2csJ, count));
-                    err = Lua2cAddOne(l2cFunc, l2cName, count);
-                    if (err) errCount++;
-                }
-            } else {
-                l2cFunc = calloc(2, sizeof (luaL_Reg));
-                const char *l2cName = json_object_get_string(lua2csJ);
-                errCount = Lua2cAddOne(l2cFunc, l2cName, 0);
-                count=1;
-            }
-            if (errCount) {
-                AFB_ERROR("DISPATCH-LOAD-CONFIG:Plugin %d symbols not found in plugin='%s'", errCount, pluginpath);
-                goto OnErrorExit;
-            } else {
-                dPlugin->l2cFunc= l2cFunc;
-                dPlugin->l2cCount= count;
-            }
-        }
-#endif
-        DispatchPluginInstallCbT ctlPluginOnload = dlsym(dPlugin->dlHandle, "CtlPluginOnload");
-        if (ctlPluginOnload) {
-            dPlugin->context = (*ctlPluginOnload) (controlConfig->label, controlConfig->version, controlConfig->info);
-        }
-    }
-
-    dispatchHandle->actions = DispatchLoadActions(controlConfig, actionsJ);
-    if (!dispatchHandle->actions) {
-        AFB_ERROR("DISPATCH-LOAD-CONFIG:ONLOAD Error when parsing actions %s", dispatchHandle->label);
-        goto OnErrorExit;
-    }
-    return dispatchHandle;
-
-OnErrorExit:
-    return NULL;
-}
-
-STATIC DispatchConfigT *DispatchLoadConfig(const char* filepath) {
-    json_object *controlConfigJ, *ignoreJ;
-    int err;
-
-    // Load JSON file
-    controlConfigJ = json_object_from_file(filepath);
-    if (!controlConfigJ) {
-        AFB_ERROR("DISPATCH-LOAD-CONFIG:JsonLoad invalid JSON %s ", filepath);
-        goto OnErrorExit;
-    }
-
-    AFB_INFO("DISPATCH-LOAD-CONFIG: loading config filepath=%s", filepath);
-
-    json_object *metadataJ = NULL, *onloadsJ = NULL, *controlsJ = NULL, *eventsJ = NULL;
-    err = wrap_json_unpack(controlConfigJ, "{s?s,s?o,s?o,s?o,s?o !}", "$schema", &ignoreJ, "metadata", &metadataJ, "onload", &onloadsJ, "controls", &controlsJ, "events", &eventsJ);
-    if (err) {
-        AFB_ERROR("DISPATCH-LOAD-CONFIG Missing something metadata|[onload]|[controls]|[events] in %s", json_object_get_string(controlConfigJ));
-        goto OnErrorExit;
-    }
-
-
-
-    DispatchConfigT *controlConfig = calloc(1, sizeof (DispatchConfigT));
-    if (metadataJ) {
-        const char*ctlname=NULL;
-        err = wrap_json_unpack(metadataJ, "{ss,s?s,s?s,ss !}", "label", &controlConfig->label, "version", &controlConfig->version, "name", &ctlname, "info", &controlConfig->info);
-        if (err) {
-            AFB_ERROR("DISPATCH-LOAD-CONFIG:METADATA Missing something label|version|[label] in %s", json_object_get_string(metadataJ));
-            goto OnErrorExit;
-        }
-
-        // if ctlname is provided change process name now
-        if (ctlname) {
-            err= prctl(PR_SET_NAME, ctlname,NULL,NULL,NULL);
-            if (err) AFB_WARNING("Fail to set Process Name to:%s",ctlname);
-        }
-
-    }
-
-    if (onloadsJ) {
-        DispatchHandleT *dispatchHandle;
-
-        if (json_object_get_type(onloadsJ) != json_type_array) {
-            controlConfig->onloads = (DispatchHandleT**) calloc(2, sizeof (void*));
-            dispatchHandle = DispatchLoadOnload(controlConfig, onloadsJ);
-            controlConfig->onloads[0] = dispatchHandle;
-        } else {
-            int length = json_object_array_length(onloadsJ);
-            controlConfig->onloads = (DispatchHandleT**) calloc(length + 1, sizeof (void*));
-
-            for (int jdx = 0; jdx < length; jdx++) {
-                json_object *onloadJ = json_object_array_get_idx(onloadsJ, jdx);
-                dispatchHandle = DispatchLoadOnload(controlConfig, onloadJ);
-                controlConfig->onloads[jdx] = dispatchHandle;
-            }
-        }
-    }
-
-    if (controlsJ) {
-        DispatchHandleT *dispatchHandle;
-
-        if (json_object_get_type(controlsJ) != json_type_array) {
-            controlConfig->controls = (DispatchHandleT**) calloc(2, sizeof (void*));
-            dispatchHandle = DispatchLoadControl(controlConfig, controlsJ);
-            controlConfig->controls[0] = dispatchHandle;
-        } else {
-            int length = json_object_array_length(controlsJ);
-            controlConfig->controls = (DispatchHandleT**) calloc(length + 1, sizeof (void*));
-
-            for (int jdx = 0; jdx < length; jdx++) {
-                json_object *controlJ = json_object_array_get_idx(controlsJ, jdx);
-                dispatchHandle = DispatchLoadControl(controlConfig, controlJ);
-                controlConfig->controls[jdx] = dispatchHandle;
-            }
-        }
-    }
-
-    if (eventsJ) {
-        DispatchHandleT *dispatchHandle;
-
-        if (json_object_get_type(eventsJ) != json_type_array) {
-            controlConfig->events = (DispatchHandleT**) calloc(2, sizeof (void*));
-            dispatchHandle = DispatchLoadControl(controlConfig, eventsJ);
-            controlConfig->events[0] = dispatchHandle;
-        } else {
-            int length = json_object_array_length(eventsJ);
-            controlConfig->events = (DispatchHandleT**) calloc(length + 1, sizeof (void*));
-
-            for (int jdx = 0; jdx < length; jdx++) {
-                json_object *eventJ = json_object_array_get_idx(eventsJ, jdx);
-                dispatchHandle = DispatchLoadControl(controlConfig, eventJ);
-                controlConfig->events[jdx] = dispatchHandle;
-            }
-        }
-    }
-
-    return controlConfig;
-
-OnErrorExit:
-    return NULL;
-}
-
-
-// Load default config file at init
-
-PUBLIC int DispatchInit() {
-    int index, err, luaLoaded = 0;
-    char controlFile [CONTROL_MAXPATH_LEN];
-
-    const char *dirList= getenv("CONTROL_CONFIG_PATH");
-    if (!dirList) dirList=CONTROL_CONFIG_PATH;
-
-    strncpy(controlFile, CONTROL_CONFIG_PRE "-", CONTROL_MAXPATH_LEN);
-    strncat(controlFile, GetBinderName(), CONTROL_MAXPATH_LEN-strlen(controlFile)-1);
-
-    // search for default dispatch config file
-    json_object* responseJ = ScanForConfig(dirList, CTL_SCAN_RECURSIVE, controlFile, "json");
-
-    // We load 1st file others are just warnings
-    for (index = 0; index < json_object_array_length(responseJ); index++) {
-        json_object *entryJ = json_object_array_get_idx(responseJ, index);
-
-        char *filename;
-        char*fullpath;
-        err = wrap_json_unpack(entryJ, "{s:s, s:s !}", "fullpath", &fullpath, "filename", &filename);
-        if (err) {
-            AFB_ERROR("DISPATCH-INIT HOOPs invalid JSON entry= %s", json_object_get_string(entryJ));
-            goto OnErrorExit;
-        }
-
-        if (index == 0) {
-            if (strcasestr(filename, controlFile)) {
-                char filepath[CONTROL_MAXPATH_LEN];
-                strncpy(filepath, fullpath, sizeof (filepath));
-                strncat(filepath, "/", sizeof (filepath)-strlen(filepath)-1);
-                strncat(filepath, filename, sizeof (filepath)-strlen(filepath)-1);
-                configHandle = DispatchLoadConfig(filepath);
-                if (!configHandle) {
-                    AFB_ERROR("DISPATCH-INIT:ERROR Fail loading [%s]", filepath);
-                    goto OnErrorExit;
-                }
-                luaLoaded = 1;
-                break;
-            }
-        } else {
-            AFB_WARNING("DISPATCH-INIT:WARNING Secondary Control Config Ignored %s/%s", fullpath, filename);
-        }
-    }
-
-    // no dispatch config found remove control API from binder
-    if (!luaLoaded) {
-        AFB_WARNING("DISPATCH-INIT:WARNING (setenv CONTROL_CONFIG_PATH) No Config '%s-*.json' in '%s'", controlFile, dirList);
-    }
-
-    AFB_NOTICE("DISPATCH-INIT:SUCCES: Control Dispatch Init");
-    return 0;
-
-OnErrorExit:
-    AFB_NOTICE("DISPATCH-INIT:ERROR: Control Dispatch Init");
-    return 1;
-}
-
-
-
diff --git a/ctl-binding/ctl-lua.c b/ctl-binding/ctl-lua.c
deleted file mode 100644
index 2c80205..0000000
--- a/ctl-binding/ctl-lua.c
+++ /dev/null
@@ -1,1068 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Fulup Ar Foll <fulup@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ref:
- *  (manual) https://www.lua.org/manual/5.3/manual.html
- *  (lua->C) http://www.troubleshooters.com/codecorn/lua/lua_c_calls_lua.htm#_Anatomy_of_a_Lua_Call
- *  (lua/C Var) http://acamara.es/blog/2012/08/passing-variables-from-lua-5-2-to-c-and-vice-versa/
- *  (Lua/C Lib)https://john.nachtimwald.com/2014/07/12/wrapping-a-c-library-in-lua/
- *  (Lua/C Table) https://gist.github.com/SONIC3D/10388137
- *  (Lua/C Nested table) https://stackoverflow.com/questions/45699144/lua-nested-table-from-lua-to-c
- *  (Lua/C Wrapper) https://stackoverflow.com/questions/45699950/lua-passing-handle-to-function-created-with-newlib
- *
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-
-
-#include "ctl-binding.h"
-#include "wrap-json.h"
-
-#define LUA_FIST_ARG 2  // when using luaL_newlib calllback receive libtable as 1st arg
-#define LUA_MSG_MAX_LENGTH 512
-#define JSON_ERROR (json_object*)-1
-static afb_req NULL_AFBREQ = {};
-
-
-static  lua_State* luaState;
-
-#define CTX_MAGIC 123456789
-#define CTX_TOKEN "AFB_ctx"
-
-typedef struct {
-    char *name;
-    int  count;
-    afb_event event;
-} LuaAfbEvent;
-static LuaAfbEvent *luaDefaultEvt;
-
-typedef struct {
-    int ctxMagic;
-    afb_req request;
-    void *handle;
-    char *info;
-} LuaAfbContextT;
-
-typedef struct {
-  const char *callback;
-  json_object *context;
-  void *handle;
-} LuaCallServiceT;
-
-typedef enum {
-    AFB_MSG_INFO,
-    AFB_MSG_WARNING,
-    AFB_MSG_NOTICE,
-    AFB_MSG_DEBUG,
-    AFB_MSG_ERROR,
-} LuaAfbMessageT;
-
-/*
- * Note(Fulup): I fail to use luaL_setmetatable and replaced it with a simple opaque
- * handle while waiting for someone smarter than me to find a better solution
- *  https://stackoverflow.com/questions/45596493/lua-using-lua-newuserdata-from-lua-pcall
- */
-
-STATIC LuaAfbContextT *LuaCtxCheck (lua_State *luaState, int index) {
-  LuaAfbContextT *afbContext;
-  //luaL_checktype(luaState, index, LUA_TUSERDATA);
-  //afbContext = (LuaAfbContextT *)luaL_checkudata(luaState, index, CTX_TOKEN);
-  luaL_checktype(luaState, index, LUA_TLIGHTUSERDATA);
-  afbContext = (LuaAfbContextT *) lua_touserdata(luaState, index);
-  if (afbContext == NULL && afbContext->ctxMagic != CTX_MAGIC) {
-      luaL_error(luaState, "Fail to retrieve user data context=%s", CTX_TOKEN);
-      AFB_ERROR ("afbContextCheck error retrieving afbContext");
-      return NULL;
-  }
-  return afbContext;
-}
-
-STATIC LuaAfbContextT *LuaCtxPush (lua_State *luaState, afb_req request, void *handle, const char* info) {
-  // LuaAfbContextT *afbContext = (LuaAfbContextT *)lua_newuserdata(luaState, sizeof(LuaAfbContextT));
-  // luaL_setmetatable(luaState, CTX_TOKEN);
-  LuaAfbContextT *afbContext = (LuaAfbContextT *)calloc(1, sizeof(LuaAfbContextT));
-  lua_pushlightuserdata(luaState, afbContext);
-  if (!afbContext) {
-      AFB_ERROR ("LuaCtxPush fail to allocate user data context");
-      return NULL;
-  }
-  afbContext->ctxMagic=CTX_MAGIC;
-  afbContext->info=strdup(info);
-  afbContext->request= request;
-  afbContext->handle= handle;
-  return afbContext;
-}
-
-STATIC void LuaCtxFree (LuaAfbContextT *afbContext) {
-    free(afbContext->info);
-    free(afbContext);
-}
-
-// Push a json structure on the stack as a LUA table
-STATIC int LuaPushArgument (json_object *argsJ) {
-
-    //AFB_NOTICE("LuaPushArgument argsJ=%s", json_object_get_string(argsJ));
-
-    json_type jtype= json_object_get_type(argsJ);
-    switch (jtype) {
-        case json_type_object: {
-            lua_newtable (luaState);
-            json_object_object_foreach (argsJ, key, val) {
-                int done = LuaPushArgument (val);
-                if (done) {
-                    lua_setfield(luaState,-2, key);
-                }
-            }
-            break;
-        }
-        case json_type_array: {
-            int length= json_object_array_length(argsJ);
-            lua_newtable (luaState);
-            for (int idx=0; idx < length; idx ++) {
-                json_object *val=json_object_array_get_idx(argsJ, idx);
-                LuaPushArgument (val);
-                lua_seti (luaState,-2, idx);
-            }
-            break;
-        }
-        case json_type_int:
-            lua_pushinteger(luaState, json_object_get_int(argsJ));
-            break;
-        case json_type_string:
-            lua_pushstring(luaState, json_object_get_string(argsJ));
-            break;
-        case json_type_boolean:
-            lua_pushboolean(luaState, json_object_get_boolean(argsJ));
-            break;
-        case json_type_double:
-            lua_pushnumber(luaState, json_object_get_double(argsJ));
-            break;
-        case json_type_null:
-            AFB_WARNING("LuaPushArgument: NULL object type %s", json_object_get_string(argsJ));
-            return 0;
-            break;
-
-        default:
-            AFB_ERROR("LuaPushArgument: unsupported Json object type %s", json_object_get_string(argsJ));
-            return 0;
-    }
-    return 1;
-}
-
-STATIC  json_object *LuaPopOneArg (lua_State* luaState, int idx);
-
-// Move a table from Internal Lua representation to Json one
-// Numeric table are transformed in json array, string one in object
-// Mix numeric/string key are not supported
-STATIC json_object *LuaTableToJson (lua_State* luaState, int index) {
-    #define LUA_KEY_INDEX -2
-    #define LUA_VALUE_INDEX -1
-
-    int idx;
-    int tableType;
-    json_object *tableJ= NULL;
-
-    lua_pushnil(luaState); // 1st key
-    if (index < 0) index--;
-    for (idx=1; lua_next(luaState, index) != 0; idx++) {
-
-        // uses 'key' (at index -2) and 'value' (at index -1)
-        if (lua_type(luaState,LUA_KEY_INDEX) == LUA_TSTRING) {
-
-            if (!tableJ) {
-                tableJ= json_object_new_object();
-                tableType=LUA_TSTRING;
-            } else if (tableType != LUA_TSTRING){
-                AFB_ERROR("MIX Lua Table with key string/numeric not supported");
-                return NULL;
-            }
-
-            const char *key= lua_tostring(luaState, LUA_KEY_INDEX);
-            json_object *argJ= LuaPopOneArg(luaState, LUA_VALUE_INDEX);
-            json_object_object_add(tableJ, key, argJ);
-
-        } else {
-            if (!tableJ) {
-                tableJ= json_object_new_array();
-                tableType=LUA_TNUMBER;
-            } else if(tableType != LUA_TNUMBER) {
-                AFB_ERROR("MIX Lua Table with key numeric/string not supported");
-                return NULL;
-            }
-
-            json_object *argJ= LuaPopOneArg(luaState, LUA_VALUE_INDEX);
-            json_object_array_add(tableJ, argJ);
-        }
-
-
-        lua_pop(luaState, 1); // removes 'value'; keeps 'key' for next iteration
-    }
-
-    // Query is empty free empty json object
-    if (idx == 1) {
-        json_object_put(tableJ);
-        return NULL;
-    }
-    return tableJ;
-}
-
-STATIC  json_object *LuaPopOneArg (lua_State* luaState, int idx) {
-    json_object *value=NULL;
-
-    int luaType = lua_type(luaState, idx);
-    switch(luaType)  {
-        case LUA_TNUMBER: {
-            lua_Number number= lua_tonumber(luaState, idx);;
-            int nombre = (int)number; // evil trick to determine wether n fits in an integer. (stolen from ltcl.c)
-            if (number == nombre) {
-                value= json_object_new_int((int)number);
-            } else {
-                value= json_object_new_double(number);
-            }
-            break;
-        }
-        case LUA_TBOOLEAN:
-            value=  json_object_new_boolean(lua_toboolean(luaState, idx));
-            break;
-        case LUA_TSTRING:
-           value=  json_object_new_string(lua_tostring(luaState, idx));
-            break;
-        case LUA_TTABLE:
-            value= LuaTableToJson(luaState, idx);
-            break;
-        case LUA_TNIL:
-            value=json_object_new_string("nil") ;
-            break;
-        case LUA_TUSERDATA:
-            value=json_object_new_int64((int64_t)lua_touserdata(luaState, idx)); // store userdata as int !!!
-            break;
-
-        default:
-            AFB_NOTICE ("LuaPopOneArg: script returned Unknown/Unsupported idx=%d type:%d/%s", idx, luaType, lua_typename(luaState, luaType));
-            value=NULL;
-    }
-
-    return value;
-}
-
-static json_object *LuaPopArgs (lua_State* luaState, int start) {
-    json_object *responseJ;
-
-    int stop = lua_gettop(luaState);
-    if(stop-start <0) return NULL;
-
-    // start at 2 because we are using a function array lib
-    if (start == stop) {
-        responseJ=LuaPopOneArg (luaState, start);
-    } else {
-        // loop on remaining return arguments
-        responseJ= json_object_new_array();
-        for (int idx=start; idx <= stop; idx++) {
-            json_object *argJ=LuaPopOneArg (luaState, idx);
-            if (!argJ) goto OnErrorExit;
-            json_object_array_add(responseJ, argJ);
-       }
-    }
-
-    return responseJ;
-
-  OnErrorExit:
-    return NULL;
-}
-
-
-STATIC int LuaFormatMessage(lua_State* luaState, LuaAfbMessageT action) {
-    char *message;
-
-    json_object *responseJ= LuaPopArgs(luaState, LUA_FIST_ARG);
-
-    if (!responseJ) {
-        luaL_error(luaState,"LuaFormatMessage empty message");
-        goto OnErrorExit;
-    }
-
-    // if we have only on argument just return the value.
-    if (json_object_get_type(responseJ)!=json_type_array || json_object_array_length(responseJ) <2) {
-        message= (char*)json_object_get_string(responseJ);
-        goto PrintMessage;
-    }
-
-    // extract format and push all other parameter on the stack
-    message = alloca (LUA_MSG_MAX_LENGTH);
-    const char *format = json_object_get_string(json_object_array_get_idx(responseJ, 0));
-
-    int arrayIdx=1;
-    int targetIdx=0;
-
-    for (int idx=0; format[idx] !='\0'; idx++) {
-
-        if (format[idx]=='%' && format[idx] !='\0') {
-            json_object *slotJ= json_object_array_get_idx(responseJ, arrayIdx);
-            //if (slotJ) AFB_NOTICE("**** idx=%d slotJ=%s", arrayIdx, json_object_get_string(slotJ));
-
-
-            switch (format[++idx]) {
-                case 'd':
-                    if (slotJ) targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"%d", json_object_get_int(slotJ));
-                    else  targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"nil");
-                    arrayIdx++;
-                    break;
-                case 'f':
-                    if (slotJ) targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"%f", json_object_get_double(slotJ));
-                    else  targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"nil");
-                    arrayIdx++;
-                    break;
-
-                case'%':
-                    message[targetIdx]='%';
-                    targetIdx++;
-                    break;
-
-                case 's':
-                default:
-                    if (slotJ) targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"%s", json_object_get_string(slotJ));
-                    else  targetIdx += snprintf (&message[targetIdx], LUA_MSG_MAX_LENGTH-targetIdx,"nil");
-                    arrayIdx++;
-                }
-
-        } else {
-            if (targetIdx >= LUA_MSG_MAX_LENGTH) {
-                AFB_WARNING ("LuaFormatMessage: message[%s] owerverflow LUA_MSG_MAX_LENGTH=%d", format, LUA_MSG_MAX_LENGTH);
-                targetIdx --; // move backward for EOL
-                break;
-            } else {
-                message[targetIdx++] = format[idx];
-            }
-        }
-    }
-    message[targetIdx]='\0';
-
-PrintMessage:
-    switch (action) {
-        case  AFB_MSG_WARNING:
-            AFB_WARNING ("%s", message);
-            break;
-        case AFB_MSG_NOTICE:
-            AFB_NOTICE ("%s", message);
-            break;
-        case AFB_MSG_DEBUG:
-            AFB_DEBUG ("%s", message);
-            break;
-        case AFB_MSG_INFO:
-            AFB_INFO ("%s", message);
-            break;
-        case AFB_MSG_ERROR:
-        default:
-            AFB_ERROR ("%s", message);
-    }
-    return 0;  // nothing return to lua
-
-  OnErrorExit: // on argument to return (the error message)
-    return 1;
-}
-
-STATIC int LuaPrintInfo(lua_State* luaState) {
-    int err=LuaFormatMessage (luaState, AFB_MSG_INFO);
-    return err;
-}
-
-STATIC int LuaPrintError(lua_State* luaState) {
-    int err=LuaFormatMessage (luaState, AFB_MSG_ERROR);
-    return err; // no value return
-}
-
-STATIC int LuaPrintWarning(lua_State* luaState) {
-    int err=LuaFormatMessage (luaState, AFB_MSG_WARNING);
-    return err;
-}
-
-STATIC int LuaPrintNotice(lua_State* luaState) {
-    int err=LuaFormatMessage (luaState, AFB_MSG_NOTICE);
-    return err;
-}
-
-STATIC int LuaPrintDebug(lua_State* luaState) {
-    int err=LuaFormatMessage (luaState, AFB_MSG_DEBUG);
-    return err;
-}
-
-STATIC int LuaAfbSuccess(lua_State* luaState) {
-    LuaAfbContextT *afbContext= LuaCtxCheck(luaState, LUA_FIST_ARG);
-    if (!afbContext) goto OnErrorExit;
-
-    // ignore context argument
-    json_object *responseJ= LuaPopArgs(luaState, LUA_FIST_ARG+1);
-    if (responseJ == JSON_ERROR) return 1;
-
-    afb_req_success(afbContext->request, responseJ, NULL);
-
-    LuaCtxFree(afbContext);
-    return 0;
-
- OnErrorExit:
-        lua_error(luaState);
-        return 1;
-}
-
-STATIC int LuaAfbFail(lua_State* luaState) {
-    LuaAfbContextT *afbContext= LuaCtxCheck(luaState, LUA_FIST_ARG);
-    if (!afbContext) goto OnErrorExit;
-
-    json_object *responseJ= LuaPopArgs(luaState, LUA_FIST_ARG+1);
-    if (responseJ == JSON_ERROR) return 1;
-
-    afb_req_fail(afbContext->request, afbContext->info, json_object_get_string(responseJ));
-
-    LuaCtxFree(afbContext);
-    return 0;
-
- OnErrorExit:
-        lua_error(luaState);
-        return 1;
-}
-
-STATIC void LuaAfbServiceCB(void *handle, int iserror, struct json_object *responseJ) {
-    LuaCallServiceT *contextCB= (LuaCallServiceT*)handle;
-    int count=1;
-
-    lua_getglobal(luaState, contextCB->callback);
-
-    // push error status & response
-    lua_pushboolean(luaState, iserror);
-    count+= LuaPushArgument(responseJ);
-    count+= LuaPushArgument(contextCB->context);
-
-    int err=lua_pcall(luaState, count, LUA_MULTRET, 0);
-    if (err) {
-        AFB_ERROR ("LUA-SERICE-CB:FAIL response=%s err=%s", json_object_get_string(responseJ), lua_tostring(luaState,-1) );
-    }
-
-    free (contextCB);
-}
-
-
-STATIC int LuaAfbService(lua_State* luaState) {
-    int count = lua_gettop(luaState);
-
-    // note: argument start at 2 because of AFB: table
-    if (count <5 || !lua_isstring(luaState, 2) || !lua_isstring(luaState, 3) || !lua_istable(luaState, 4) || !lua_isstring(luaState, 5)) {
-        lua_pushliteral (luaState, "ERROR: syntax AFB:service(api, verb, {[Lua Table]})");
-        goto OnErrorExit;
-    }
-
-    // get api/verb+query
-    const char *api = lua_tostring(luaState,2);
-    const char *verb= lua_tostring(luaState,3);
-    json_object *queryJ= LuaTableToJson(luaState, 4);
-    if (queryJ == JSON_ERROR) return 1;
-
-    LuaCallServiceT *contextCB = calloc (1, sizeof(LuaCallServiceT));
-    contextCB->callback= lua_tostring(luaState, 5);
-    contextCB->context =  LuaPopArgs(luaState, 6);
-
-    afb_service_call(api, verb, queryJ, LuaAfbServiceCB, contextCB);
-
-    return 0; // no value return
-
-  OnErrorExit:
-        lua_error(luaState);
-        return 1;
-}
-
-STATIC int LuaAfbServiceSync(lua_State* luaState) {
-    int count = lua_gettop(luaState);
-    json_object *responseJ;
-
-    // note: argument start at 2 because of AFB: table
-    if (count <3 || !lua_isstring(luaState, 2) || !lua_isstring(luaState, 3) || !lua_istable(luaState, 4)) {
-        lua_pushliteral (luaState, "ERROR: syntax AFB:servsync(api, verb, {[Lua Table]})");
-        goto OnErrorExit;
-    }
-
-    // get api/verb+query
-    const char *api = lua_tostring(luaState,2);
-    const char *verb= lua_tostring(luaState,3);
-    json_object *queryJ= LuaTableToJson(luaState, 4);
-
-    int iserror=afb_service_call_sync (api, verb, queryJ, &responseJ);
-
-    // push error status & response
-    count=1; lua_pushboolean(luaState, iserror);
-    count+= LuaPushArgument(responseJ);
-
-    return count; // return count values
-
-  OnErrorExit:
-        lua_error(luaState);
-        return 1;
-}
-
-STATIC int LuaAfbEventPush(lua_State* luaState) {
-    LuaAfbEvent *afbevt;
-    int index;
-
-    // if no private event handle then use default binding event
-    if (lua_islightuserdata(luaState, LUA_FIST_ARG)) {
-        afbevt = (LuaAfbEvent*) lua_touserdata(luaState, LUA_FIST_ARG);
-        index=LUA_FIST_ARG+1;
-    } else {
-        index=LUA_FIST_ARG;
-        afbevt=luaDefaultEvt;
-    }
-
-    if (!afb_event_is_valid(afbevt->event)) {
-        lua_pushliteral (luaState, "LuaAfbMakePush-Fail invalid event");
-        goto OnErrorExit;
-    }
-
-    json_object *ctlEventJ= LuaTableToJson(luaState, index);
-    if (!ctlEventJ) {
-        lua_pushliteral (luaState, "LuaAfbEventPush-Syntax is AFB:signal ([evtHandle], {lua table})");
-        goto OnErrorExit;
-    }
-
-    int done = afb_event_push(afbevt->event, ctlEventJ);
-    if (!done) {
-        lua_pushliteral (luaState, "LuaAfbEventPush-Fail No Subscriber to event");
-        AFB_ERROR ("LuaAfbEventPush-Fail name subscriber event=%s count=%d", afbevt->name, afbevt->count);
-        goto OnErrorExit;
-    }
-    afbevt->count++;
-    return 0;
-
-  OnErrorExit:
-        lua_error(luaState);
-        return 1;
-}
-
-STATIC int LuaAfbEventSubscribe(lua_State* luaState) {
-    LuaAfbEvent *afbevt;
-
-    LuaAfbContextT *afbContext= LuaCtxCheck(luaState, LUA_FIST_ARG);
-    if (!afbContext) {
-        lua_pushliteral (luaState, "LuaAfbEventSubscribe-Fail Invalid request handle");
-        goto OnErrorExit;
-    }
-
-    // if no private event handle then use default binding event
-    if (lua_islightuserdata(luaState, LUA_FIST_ARG+1)) {
-        afbevt = (LuaAfbEvent*) lua_touserdata(luaState, LUA_FIST_ARG+1);
-    } else {
-        afbevt=luaDefaultEvt;
-    }
-
-    if (!afb_event_is_valid(afbevt->event)) {
-        lua_pushliteral (luaState, "LuaAfbMakePush-Fail invalid event handle");
-        goto OnErrorExit;
-    }
-
-    int err = afb_req_subscribe(afbContext->request, afbevt->event);
-    if (err) {
-        lua_pushliteral (luaState, "LuaAfbEventSubscribe-Fail No Subscriber to event");
-        AFB_ERROR ("LuaAfbEventPush-Fail name subscriber event=%s count=%d", afbevt->name, afbevt->count);
-        goto OnErrorExit;
-    }
-    afbevt->count++;
-    return 0;
-
-  OnErrorExit:
-        lua_error(luaState);
-        return 1;
-}
-
-STATIC int LuaAfbEventMake(lua_State* luaState) {
-    int count = lua_gettop(luaState);
-    LuaAfbEvent *afbevt=calloc(1,sizeof(LuaAfbEvent));
-
-    if (count != LUA_FIST_ARG || !lua_isstring(luaState, LUA_FIST_ARG)) {
-        lua_pushliteral (luaState, "LuaAfbEventMake-Syntax is evtHandle= AFB:event ('myEventName')");
-        goto OnErrorExit;
-    }
-
-    // event name should be the only argument
-    afbevt->name= strdup (lua_tostring(luaState,LUA_FIST_ARG));
-
-    // create a new binder event
-    afbevt->event = afb_daemon_make_event(afbevt->name);
-    if (!afb_event_is_valid(afbevt->event)) {
-        lua_pushliteral (luaState, "LuaAfbEventMake-Fail to Create Binder event");
-        goto OnErrorExit;
-    }
-
-    // push event handler as a LUA opaque handle
-    lua_pushlightuserdata(luaState, afbevt);
-    return 1;
-
-  OnErrorExit:
-        lua_error(luaState);
-        return 1;
-}
-
-// Function call from LUA when lua2c plugin L2C is used
-PUBLIC int Lua2cWrapper(lua_State* luaState, char *funcname, Lua2cFunctionT callback, void *context) {
-
-    json_object *argsJ= LuaPopArgs(luaState, LUA_FIST_ARG+1);
-    int response = (*callback) (funcname, argsJ, context);
-
-    // push response to LUA
-    lua_pushinteger(luaState, response);
-    return 1;
-}
-
-// Generated some fake event based on watchdog/counter
-PUBLIC int LuaCallFunc (DispatchSourceT source, DispatchActionT *action, json_object *queryJ) {
-
-    int err, count;
-
-    json_object* argsJ  = action->argsJ;
-    const char*  func   = action->call;
-
-    // load function (should exist in CONTROL_PATH_LUA
-    lua_getglobal(luaState, func);
-
-    // push source on the stack
-    count=1;
-    lua_pushinteger(luaState, source);
-
-    // push argsJ on the stack
-    if (!argsJ) {
-        lua_pushnil(luaState);
-        count++;
-    } else {
-        count+= LuaPushArgument (argsJ);
-    }
-
-    // push queryJ on the stack
-    if (!queryJ) {
-        lua_pushnil(luaState);
-        count++;
-    } else {
-        count+= LuaPushArgument (queryJ);
-    }
-
-    // effectively exec LUA script code
-    err=lua_pcall(luaState, count, 1, 0);
-    if (err)  {
-        AFB_ERROR("LuaCallFunc Fail calling %s error=%s", func, lua_tostring(luaState,-1));
-        goto OnErrorExit;
-    }
-
-    // return LUA script value
-    int rc= (int)lua_tointeger(luaState, -1);
-    return rc;
-
-  OnErrorExit:
-    return -1;
-}
-
-
-// Execute LUA code from received API request
-STATIC void LuaDoAction (LuaDoActionT action, afb_req request) {
-
-    int err, count=0;
-
-    json_object* queryJ = afb_req_json(request);
-
-    switch (action) {
-
-        case LUA_DOSTRING: {
-            const char *script = json_object_get_string(queryJ);
-            err=luaL_loadstring(luaState, script);
-            if (err) {
-                AFB_ERROR ("LUA-DO-COMPILE:FAIL String=%s err=%s", script, lua_tostring(luaState,-1) );
-                goto OnErrorExit;
-            }
-            // Push AFB client context on the stack
-            LuaAfbContextT *afbContext= LuaCtxPush(luaState, request,NULL,script);
-            if (!afbContext) goto OnErrorExit;
-
-            break;
-        }
-
-        case LUA_DOCALL: {
-            const char *func;
-            json_object *argsJ=NULL;
-
-            err= wrap_json_unpack (queryJ, "{s:s, s?o !}", "target", &func, "args", &argsJ);
-            if (err) {
-                AFB_ERROR ("LUA-DOCALL-SYNTAX missing target|args query=%s", json_object_get_string(queryJ));
-                goto OnErrorExit;
-            }
-
-            // load function (should exist in CONTROL_PATH_LUA
-            lua_getglobal(luaState, func);
-
-            // Push AFB client context on the stack
-            LuaAfbContextT *afbContext= LuaCtxPush(luaState, request, NULL, func);
-            if (!afbContext) goto OnErrorExit;
-
-            // push query on the stack
-            if (!argsJ) {
-                lua_pushnil(luaState);
-                count++;
-            } else {
-                count+= LuaPushArgument (argsJ);
-            }
-
-            break;
-        }
-
-        case LUA_DOSCRIPT: {   // Fulup need to fix argument passing
-            char *filename; char*fullpath;
-            char luaScriptPath[CONTROL_MAXPATH_LEN];
-            int index;
-
-            // scan luascript search path once
-            static json_object *luaScriptPathJ =NULL;
-
-            // extract value from query
-            const char *target=NULL,*func=NULL;
-            json_object *argsJ=NULL;
-            err= wrap_json_unpack (queryJ, "{s:s,s?s,s?s,s?o !}","target", &target,"path",&luaScriptPathJ,"function",&func,"args",&argsJ);
-            if (err) {
-                AFB_ERROR ("LUA-DOSCRIPT-SYNTAX:missing target|[path]|[function]|[args] query=%s", json_object_get_string(queryJ));
-                goto OnErrorExit;
-            }
-
-            // search for filename=script in CONTROL_LUA_PATH
-            if (!luaScriptPathJ)  {
-                strncpy(luaScriptPath,CONTROL_DOSCRIPT_PRE, sizeof(luaScriptPath));
-                strncat(luaScriptPath,"-", sizeof(luaScriptPath)-strlen(luaScriptPath)-1);
-                strncat(luaScriptPath,target, sizeof(luaScriptPath)-strlen(luaScriptPath)-1);
-                luaScriptPathJ= ScanForConfig(CONTROL_LUA_PATH , CTL_SCAN_RECURSIVE,luaScriptPath,".lua");
-            }
-            for (index=0; index < json_object_array_length(luaScriptPathJ); index++) {
-                json_object *entryJ=json_object_array_get_idx(luaScriptPathJ, index);
-
-                err= wrap_json_unpack (entryJ, "{s:s, s:s !}", "fullpath",  &fullpath,"filename", &filename);
-                if (err) {
-                    AFB_ERROR ("LUA-DOSCRIPT-SCAN:HOOPs invalid config file path = %s", json_object_get_string(entryJ));
-                    goto OnErrorExit;
-                }
-
-                if (index > 0) AFB_WARNING("LUA-DOSCRIPT-SCAN:Ignore second script=%s path=%s", filename, fullpath);
-                else {
-                    strncpy (luaScriptPath, fullpath, sizeof(luaScriptPath));
-                    strncat (luaScriptPath, "/", sizeof(luaScriptPath)-strlen(luaScriptPath)-1);
-                    strncat (luaScriptPath, filename, sizeof(luaScriptPath)-strlen(luaScriptPath)-1);
-                }
-            }
-
-            err= luaL_loadfile(luaState, luaScriptPath);
-            if (err) {
-                AFB_ERROR ("LUA-DOSCRIPT HOOPs Error in LUA loading scripts=%s err=%s", luaScriptPath, lua_tostring(luaState,-1));
-                goto OnErrorExit;
-            }
-
-            // script was loaded we need to parse to make it executable
-            err=lua_pcall(luaState, 0, 0, 0);
-            if (err) {
-                AFB_ERROR ("LUA-DOSCRIPT:FAIL to load %s", luaScriptPath);
-                goto OnErrorExit;
-            }
-
-            // if no func name given try to deduct from filename
-            if (!func && (func=(char*)GetMidleName(filename))!=NULL) {
-                strncpy(luaScriptPath,"_", sizeof(luaScriptPath));
-                strncat(luaScriptPath,func, sizeof(luaScriptPath)-strlen(luaScriptPath)-1);
-                func=luaScriptPath;
-            }
-            if (!func) {
-                AFB_ERROR ("LUA-DOSCRIPT:FAIL to deduct funcname from %s", filename);
-                goto OnErrorExit;
-            }
-
-            // load function (should exist in CONTROL_PATH_LUA
-            lua_getglobal(luaState, func);
-
-            // Push AFB client context on the stack
-            LuaAfbContextT *afbContext= LuaCtxPush(luaState, request, NULL, func);
-            if (!afbContext) goto OnErrorExit;
-
-            // push function arguments
-            if (!argsJ) {
-                lua_pushnil(luaState);
-                count++;
-            } else {
-                count+= LuaPushArgument(argsJ);
-            }
-
-            break;
-        }
-
-        default:
-            AFB_ERROR ("LUA-DOSCRIPT-ACTION unknown query=%s", json_object_get_string(queryJ));
-            goto OnErrorExit;
-    }
-
-    // effectively exec LUA code (afb_reply/fail done later from callback)
-    err=lua_pcall(luaState, count+1, 0, 0);
-    if (err) {
-        AFB_ERROR ("LUA-DO-EXEC:FAIL query=%s err=%s", json_object_get_string(queryJ), lua_tostring(luaState,-1));
-        goto OnErrorExit;
-    }
-    return;
-
- OnErrorExit:
-    afb_req_fail(request,"LUA:ERROR", lua_tostring(luaState,-1));
-    return;
-}
-
-PUBLIC void ctlapi_execlua (afb_req request) {
-    LuaDoAction (LUA_DOSTRING, request);
-}
-
-PUBLIC void ctlapi_request (afb_req request) {
-    LuaDoAction (LUA_DOCALL, request);
-}
-
-PUBLIC void ctlapi_debuglua (afb_req request) {
-    LuaDoAction (LUA_DOSCRIPT, request);
-}
-
-STATIC int LuaTimerClear (lua_State* luaState) {
-
-    // Get Timer Handle
-    LuaAfbContextT *afbContext= LuaCtxCheck(luaState, LUA_FIST_ARG);
-    if (!afbContext) goto OnErrorExit;
-
-    // retrieve useful information opaque handle
-    TimerHandleT *timerHandle = (TimerHandleT*)afbContext->handle;
-
-    AFB_NOTICE ("LuaTimerClear timer=%s", timerHandle->label);
-    TimerEvtStop(timerHandle);
-
-    return 0; //happy end
-
-OnErrorExit:
-    return 1;
-}
-STATIC int LuaTimerGet (lua_State* luaState) {
-
-    // Get Timer Handle
-    LuaAfbContextT *afbContext= LuaCtxCheck(luaState, LUA_FIST_ARG);
-    if (!afbContext) goto OnErrorExit;
-
-    // retrieve useful information opaque handle
-    TimerHandleT *timerHandle = (TimerHandleT*)afbContext->handle;
-
-    // create response as a JSON object
-    json_object *responseJ= json_object_new_object();
-    json_object_object_add(responseJ,"label", json_object_new_string(timerHandle->label));
-    json_object_object_add(responseJ,"delay", json_object_new_int(timerHandle->delay));
-    json_object_object_add(responseJ,"count", json_object_new_int(timerHandle->count));
-
-    // return JSON object as Lua table
-    int count=LuaPushArgument(responseJ);
-
-    // free json object
-    json_object_put(responseJ);
-
-    return count; // return argument
-
-OnErrorExit:
-    return 0;
-}
-
-// Timer Callback
-
-// Set timer
-STATIC int LuaTimerSetCB (void *handle) {
-    LuaCallServiceT *contextCB =(LuaCallServiceT*) handle;
-    TimerHandleT *timerHandle = (TimerHandleT*) contextCB->handle;
-    int count;
-
-    // push timer handle and user context on Lua stack
-    lua_getglobal(luaState, contextCB->callback);
-
-    // Push timer handle
-    LuaAfbContextT *afbContext= LuaCtxPush(luaState, NULL_AFBREQ, contextCB->handle, timerHandle->label);
-    if (!afbContext) goto OnErrorExit;
-    count=1;
-
-    // Push user Context
-    count+= LuaPushArgument(contextCB->context);
-
-    int err=lua_pcall(luaState, count, LUA_MULTRET, 0);
-    if (err) {
-        AFB_ERROR ("LUA-TIMER-CB:FAIL response=%s err=%s", json_object_get_string(contextCB->context), lua_tostring(luaState,-1));
-        goto OnErrorExit;
-    }
-
-    // get return parameter
-    if (!lua_isboolean(luaState, -1)) {
-        return (lua_toboolean(luaState, -1));
-    }
-
-    // timer last run free context resource
-    if (timerHandle->count == 1) {
-        LuaCtxFree(afbContext);
-    }
-    return 0;  // By default we are happy
-
- OnErrorExit:
-    return 1;  // stop timer
-}
-
-STATIC int LuaTimerSet(lua_State* luaState) {
-    const char *label=NULL, *info=NULL;
-    int delay=0, count=0;
-
-    json_object *timerJ = LuaPopOneArg(luaState, LUA_FIST_ARG);
-    const char *callback = lua_tostring(luaState, LUA_FIST_ARG + 1);
-    json_object *contextJ = LuaPopOneArg(luaState, LUA_FIST_ARG + 2);
-
-    if (lua_gettop(luaState) != LUA_FIST_ARG+2 || !timerJ || !callback || !contextJ) {
-        lua_pushliteral(luaState, "LuaTimerSet-Syntax timerset (timerT, 'callback', contextT)");
-        goto OnErrorExit;
-    }
-
-    int err = wrap_json_unpack(timerJ, "{ss, s?s si, si !}", "label", &label, "info", &info, "delay", &delay, "count", &count);
-    if (err) {
-        lua_pushliteral(luaState, "LuaTimerSet-Syntax timerT={label:xxx delay:ms, count:xx}");
-        goto OnErrorExit;
-    }
-
-    // everything look fine create timer structure
-    TimerHandleT *timerHandle = malloc (sizeof (TimerHandleT));
-    timerHandle->delay=delay;
-    timerHandle->count=count;
-    timerHandle->label=label;
-
-    // Allocate handle to store context and callback
-    LuaCallServiceT *contextCB = calloc (1, sizeof(LuaCallServiceT));
-    contextCB->callback= callback;
-    contextCB->context = contextJ;
-    contextCB->handle  = timerHandle;
-
-    // fire timer
-    TimerEvtStart (timerHandle, LuaTimerSetCB, contextCB);
-
-    return 0;  // Happy No Return Function
-
-OnErrorExit:
-    lua_error(luaState);
-    return 1; // return error code
-}
-
-// Register a new L2c list of LUA user plugin commands
-PUBLIC void LuaL2cNewLib(const char *label, luaL_Reg *l2cFunc, int count) {
-    // luaL_newlib(luaState, l2cFunc); macro does not work with pointer :(
-    luaL_checkversion(luaState);
-    lua_createtable(luaState, 0, count+1);
-    luaL_setfuncs(luaState,l2cFunc,0);
-    lua_setglobal(luaState, label);
-}
-
-static const luaL_Reg afbFunction[] = {
-    {"timerclear", LuaTimerClear},
-    {"timerget"  , LuaTimerGet},
-    {"timerset"  , LuaTimerSet},
-    {"notice"    , LuaPrintNotice},
-    {"info"      , LuaPrintInfo},
-    {"warning"   , LuaPrintWarning},
-    {"debug"     , LuaPrintDebug},
-    {"error"     , LuaPrintError},
-    {"servsync"  , LuaAfbServiceSync},
-    {"service"   , LuaAfbService},
-    {"success"   , LuaAfbSuccess},
-    {"fail"      , LuaAfbFail},
-    {"subscribe" , LuaAfbEventSubscribe},
-    {"evtmake"   , LuaAfbEventMake},
-    {"evtpush"   , LuaAfbEventPush},
-
-    {NULL, NULL}  /* sentinel */
-};
-
-// Create Binding Event at Init
-PUBLIC int LuaLibInit () {
-    int err, index;
-
-    // search for default policy config file
-    char fullprefix[CONTROL_MAXPATH_LEN];
-    strncpy (fullprefix, CONTROL_CONFIG_PRE "-", sizeof(fullprefix));
-    strncat (fullprefix, GetBinderName(), sizeof(fullprefix)-strlen(fullprefix)-1);
-    strncat (fullprefix, "-", sizeof(fullprefix)-strlen(fullprefix)-1);
-
-    const char *dirList= getenv("CONTROL_LUA_PATH");
-    if (!dirList) dirList=CONTROL_LUA_PATH;
-
-    json_object *luaScriptPathJ = ScanForConfig(dirList , CTL_SCAN_RECURSIVE, fullprefix, "lua");
-
-    // open a new LUA interpretor
-    luaState = luaL_newstate();
-    if (!luaState)  {
-        AFB_ERROR ("LUA_INIT: Fail to open lua interpretor");
-        goto OnErrorExit;
-    }
-
-    // load auxiliary libraries
-    luaL_openlibs(luaState);
-
-    // redirect print to AFB_NOTICE
-    luaL_newlib(luaState, afbFunction);
-    lua_setglobal(luaState, "AFB");
-
-    // create default lua event to send test pause/resume
-    luaDefaultEvt=calloc(1,sizeof(LuaAfbEvent));
-    luaDefaultEvt->name=CONTROL_LUA_EVENT;
-    luaDefaultEvt->event = afb_daemon_make_event(CONTROL_LUA_EVENT);
-    if (!afb_event_is_valid(luaDefaultEvt->event)) {
-        AFB_ERROR ("POLCTL_INIT: Cannot register lua-events=%s ", CONTROL_LUA_EVENT);
-        goto OnErrorExit;;
-    }
-
-    // load+exec any file found in LUA search path
-    for (index=0; index < json_object_array_length(luaScriptPathJ); index++) {
-        json_object *entryJ=json_object_array_get_idx(luaScriptPathJ, index);
-
-        char *filename; char*fullpath;
-        err= wrap_json_unpack (entryJ, "{s:s, s:s !}", "fullpath",  &fullpath,"filename", &filename);
-        if (err) {
-            AFB_ERROR ("LUA-INIT HOOPs invalid config file path = %s", json_object_get_string(entryJ));
-            goto OnErrorExit;
-        }
-
-        char filepath[CONTROL_MAXPATH_LEN];
-        strncpy(filepath, fullpath, sizeof(filepath));
-        strncat(filepath, "/", sizeof(filepath)-strlen(filepath)-1);
-        strncat(filepath, filename, sizeof(filepath)-strlen(filepath)-1);
-        err= luaL_loadfile(luaState, filepath);
-        if (err) {
-            AFB_ERROR ("LUA-LOAD HOOPs Error in LUA loading scripts=%s err=%s", filepath, lua_tostring(luaState,-1));
-            goto OnErrorExit;
-        }
-
-        // exec/compil script
-        err = lua_pcall(luaState, 0, 0, 0);
-        if (err) {
-            AFB_ERROR ("LUA-LOAD HOOPs Error in LUA exec scripts=%s err=%s", filepath, lua_tostring(luaState,-1));
-            goto OnErrorExit;
-        }
-    }
-
-    // no policy config found remove control API from binder
-    if (index == 0)  {
-        AFB_WARNING ("POLICY-INIT:WARNING (setenv CONTROL_LUA_PATH) No LUA '%s*.lua' in '%s'", fullprefix, dirList);
-    }
-
-    AFB_DEBUG ("Audio control-LUA Init Done");
-    return 0;
-
- OnErrorExit:
-    return 1;
-}
diff --git a/ctl-binding/ctl-policy.c b/ctl-binding/ctl-policy.c
deleted file mode 100644
index 9fe220c..0000000
--- a/ctl-binding/ctl-policy.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Fulup Ar Foll <fulup@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, something express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <json-c/json_object.h>
-
-#include "wrap-json.h"
-#include "ctl-binding.h"
-
-STATIC PolicyCtlConfigT *ctlHandle = NULL;
-
-// List Avaliable Configuration Files
-STATIC json_object* ScanForConfig (char* searchPath) {
-    json_object *responseJ;
-    DIR  *dirHandle;
-    char *dirPath;
-    char* dirList= strdup(searchPath);
-
-    responseJ = json_object_new_array();
-    for (dirPath= strtok(dirList, ":"); dirPath && *dirPath; dirPath=strtok(NULL,":")) {
-         struct dirent *dirEnt;
-
-        dirHandle = opendir (dirPath);
-        if (!dirHandle) {
-            AFB_NOTICE ("CONFIG-SCANNING dir=%s not readable", dirPath);
-            continue;
-        }
-
-        AFB_NOTICE ("CONFIG-SCANNING:ctl_listconfig scanning: %s", dirPath);
-        while ((dirEnt = readdir(dirHandle)) != NULL) {
-            // Unknown type is accepted to support dump filesystems
-            if (dirEnt->d_type == DT_REG || dirEnt->d_type == DT_UNKNOWN) {
-                struct json_object *pathJ = json_object_new_object();
-                json_object_object_add(pathJ, "dirpath", json_object_new_string(dirPath));
-                json_object_object_add(pathJ, "filename", json_object_new_string(dirEnt->d_name));
-                json_object_array_add(responseJ, pathJ);
-            }
-        }
-    }
-
-    free (dirList);
-    return (responseJ);
-}
-
-PUBLIC void ctlapi_authorize (PolicyCtlEnumT control, afb_req request) {
-    json_object*tmpJ;
-
-    json_object* queryJ= afb_req_json(request);
-    int done=json_object_object_get_ex(queryJ, "closing", &tmpJ);
-    if (done) return;
-
-}
-
-
-// List Avaliable Configuration Files
-PUBLIC void ctlapi_config (struct afb_req request) {
-    json_object*tmpJ;
-    char *dirList;
-
-    json_object* queryJ = afb_req_json(request);
-    if (queryJ && json_object_object_get_ex (queryJ, "cfgpath" , &tmpJ)) {
-        dirList = strdup (json_object_get_string(tmpJ));
-    } else {
-        dirList = strdup (CONTROL_CONFIG_PATH);
-        AFB_NOTICE ("CONFIG-MISSING: use default CONTROL_CONFIG_PATH=%s", CONTROL_CONFIG_PATH);
-    }
-
-    // get list of config file
-    struct json_object *responseJ = ScanForConfig(dirList);
-
-    if (json_object_array_length(responseJ) == 0) {
-       afb_req_fail(request, "CONFIGPATH:EMPTY", "No Config Found in CONTROL_CONFIG_PATH");
-    } else {
-        afb_req_success(request, responseJ, NULL);
-    }
-
-    return;
-}
-
-STATIC PolicyActionT **PolicyLoadActions (json_object *actionsJ) {
-    int err;
-    PolicyActionT ** actions;
-
-    // unpack individual action object
-    int actionUnpack (json_object *actionJ,  PolicyActionT *action) {
-
-        err= wrap_json_unpack(actionJ, "{ss,s?s,s?s,s?s,s?s,s?s !}"
-            , "label",&action->label, "info",&action->info, "callback",&action->callback, "query",&queryJ, "api",&action->api, "verb", &action->verb);
-        if (err) {
-            AFB_ERROR ("POLICY-LOAD-ACTION Missing something label|info|callback|api|verb|query in %s", json_object_get_string(actionJ));
-            return -1;
-        }
-        if (!action->callback || !(action->api && action->verb)) {
-            AFB_ERROR ("POLICY-LOAD-ACTION Missing something callback|(api+verb) in %s", json_object_get_string(actionJ));
-            return -1;
-        }
-        return 0;
-    };
-
-    // action array is close with a nullvalue;
-    if (json_object_get_type(actionsJ) == json_type_array) {
-        int count = json_object_array_length(actionsJ);
-        actions = calloc (count+1, sizeof(PolicyActionT));
-
-        for (int idx=0; idx < count; idx++) {
-            json_object *actionJ = json_object_array_get_idx(actionsJ, idx);
-            err = actionUnpack (actionJ, &actions[idx]);
-            if (err) goto OnErrorExit;
-        }
-
-    } else {
-        actions = calloc (2, sizeof(PolicyActionT));
-        err = actionUnpack (actionsJ, &actions[0]);
-        if (err) goto OnErrorExit;
-    }
-
-    return actions;
-
- OnErrorExit:
-    return NULL;
-
-}
-
-// load control policy from file using json_unpack https://jansson.readthedocs.io/en/2.9/apiref.html#parsing-and-validating-values
-STATIC PolicyCtlConfigT *PolicyLoadConfig (const char* filepath) {
-    json_object *policyConfigJ, *ignoreJ, *actionsJ;
-    PolicyCtlConfigT *policyConfig = calloc (1, sizeof(PolicyCtlConfigT));
-    int err;
-
-    // Load JSON file
-    policyConfigJ= json_object_from_file(filepath);
-    if (!policyConfigJ) goto OnErrorExit;
-
-    json_object *metadataJ, *onloadJ, *controlsJ, *eventsJ;
-    err= wrap_json_unpack(policyConfigJ, "{s?o,so,s?o,so,so !}", "$schema", &ignoreJ, "metadata",&metadataJ, "onload",&onloadJ, "controls",&controlsJ, "events",&eventsJ);
-    if (err) {
-        AFB_ERROR ("POLICY-LOAD-ERRROR Missing something metadata|onload|controls|events in %s", json_object_get_string(policyConfigJ));
-        goto OnErrorExit;
-    }
-
-    PolicyHandleT *policyHandle = calloc (1, sizeof(PolicyHandleT));
-    err= wrap_json_unpack(metadataJ, "{so,s?s,s?s !}", "label", &policyHandle->label, "info",&policyHandle->info, "version",&policyHandle->version);
-    if (err) {
-        AFB_ERROR ("POLICY-LOAD-CONFIG Missing something label|info|version in %s", json_object_get_string(metadataJ));
-        goto OnErrorExit;
-    }
-
-    if (onloadJ) {
-        err= wrap_json_unpack(onloadJ, "{s?o,s?s,s?s !}", "info",&ignoreJ, "label",&ignoreJ, "actions",&actionsJ);
-        if (err) {
-            AFB_ERROR ("POLICY-LOAD-CONFIG Missing something label|info|plugin|actions in %s", json_object_get_string(metadataJ));
-            goto OnErrorExit;
-        }
-        policyConfig->onload = PolicyLoadActions (actionsJ);
-    }
-
-    return policyControl;
-
-OnErrorExit:
-    return NULL;
-}
-
-// Load default config file at init
-PUBLIC int PolicyInit () {
-    int index, err;
-
-
-    // search for default policy config file
-    json_object* responseJ = ScanForConfig(CONTROL_CONFIG_PATH);
-
-    for (index=0; index < json_object_array_length(responseJ); index++) {
-        json_object *entryJ=json_object_array_get_idx(responseJ, index);
-
-        char *filename; char*dirpath;
-        err= wrap_json_unpack (entryJ, "{s:s, s:s !}", "dirpath",  &dirpath,"filename", &filename);
-        if (err) {
-            AFB_ERROR ("POLICY-INIT HOOPs invalid config file path = %s", json_object_get_string(entryJ));
-            goto OnErrorExit;
-        }
-
-        if (strcasestr(filename, CONTROL_CONFIG_FILE)) {
-            char filepath[255];
-            strncpy(filepath, dirpath, sizeof(filepath));
-            strncat(filepath, "/", sizeof(filepath));
-            strncat(filepath, filename, sizeof(filepath));
-            ctlHandle = PolicyLoadConfig (filepath);
-            if (!ctlHandle) goto OnErrorExit;
-            break;
-        }
-    }
-
-    // no policy config found remove control API from binder
-    if (index == 0)  goto OnErrorExit;
-
-    AFB_NOTICE ("SUCCES: Audio Control Policy Init");
-    return 0;
-
-OnErrorExit:
-    AFB_NOTICE ("ERROR: Audio Control Policy Init");
-    return 1;
-}
-
-
-
diff --git a/ctl-binding/ctl-timer.c b/ctl-binding/ctl-timer.c
deleted file mode 100644
index 50e181b..0000000
--- a/ctl-binding/ctl-timer.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Fulup Ar Foll <fulup@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <systemd/sd-event.h>
-
-#include "ctl-binding.h"
-
-#define DEFAULT_PAUSE_DELAY 3000
-#define DEFAULT_TEST_COUNT 1
-typedef struct {
-    int value;
-    const char *label;
-} AutoTestCtxT;
-
-static afb_event afbevt;
-
-STATIC int TimerNext (sd_event_source* source, uint64_t timer, void* handle) {
-    TimerHandleT *timerHandle = (TimerHandleT*) handle;
-    int done;
-    uint64_t usec;
-
-    // Rearm timer if needed
-    timerHandle->count --;
-    if (timerHandle->count == 0) {
-        sd_event_source_unref(source);
-        free (handle);
-        return 0;
-    }
-    else {
-        // otherwise validate timer for a new run
-        sd_event_now(afb_daemon_get_event_loop(), CLOCK_MONOTONIC, &usec);
-        sd_event_source_set_enabled(source, SD_EVENT_ONESHOT);
-        sd_event_source_set_time(source, usec + timerHandle->delay*1000);
-    }
-
-    done= timerHandle->callback(timerHandle->context);
-    if (!done) goto OnErrorExit;
-
-    return 0;
-
-OnErrorExit:
-    AFB_WARNING("TimerNext Callback Fail Tag=%s", timerHandle->label);
-    return -1;
-}
-
-PUBLIC void TimerEvtStop(TimerHandleT *timerHandle) {
-
-    sd_event_source_unref(timerHandle->evtSource);
-    free (timerHandle);
-}
-
-
-PUBLIC void TimerEvtStart(TimerHandleT *timerHandle, timerCallbackT callback, void *context) {
-    uint64_t usec;
-
-    // populate CB handle
-    timerHandle->callback=callback;
-    timerHandle->context=context;
-
-    // set a timer with ~250us accuracy
-    sd_event_now(afb_daemon_get_event_loop(), CLOCK_MONOTONIC, &usec);
-    sd_event_add_time(afb_daemon_get_event_loop(), &timerHandle->evtSource, CLOCK_MONOTONIC, usec+timerHandle->delay*1000, 250, TimerNext, timerHandle);
-}
-
-PUBLIC afb_event TimerEvtGet(void) {
-    return afbevt;
-}
-
-
-// Create Binding Event at Init
-PUBLIC int TimerEvtInit () {
-
-    // create binder event to send test pause/resume
-    afbevt = afb_daemon_make_event("control");
-    if (!afb_event_is_valid(afbevt)) {
-        AFB_ERROR ("POLCTL_INIT: Cannot register ctl-events");
-        return 1;
-    }
-
-    AFB_DEBUG ("Audio Control-Events Init Done");
-    return 0;
-}
-